Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix handling of krb5_data structs. #21

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/krb5/_creds.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,8 @@ cdef krb5_error_code prompt_callback(
replies.append(reply)

for idx, reply in enumerate(replies):
pykrb5_set_krb5_data(prompts[idx].reply, len(reply), <char *>reply)
if pykrb5_set_krb5_data(prompts[idx].reply, len(reply), <char *>reply) != 0:
raise Exception("[prompter callback] Our reply is too big for the caller's buffer.")
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably better to use a ValueError rather than a generic Exception.


return 0

Expand Down
23 changes: 18 additions & 5 deletions src/krb5/_krb5_types.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,29 @@ from libc.stdint cimport int32_t, uint8_t, uint32_t

cdef extern from "python_krb5.h":
"""
// The structures are different so cannot be explicitly defined in Cython. Use inline C to set the structs elements
// by name.
void pykrb5_set_krb5_data(
// The structures are different so cannot be explicitly defined in Cython; use inline C.
int pykrb5_set_krb5_data(
krb5_data *data,
size_t length,
char *value
)
{
/*
The caller (at least, MIT Kerberos) expects us to return the
data in the buffer referred to by the krb5_data struct as it's
passed to us -- and not, as would also be plausible, to
*update* the krb5_data with our *own* buffer. That, is we must
copy the data from value to data->data, rather than update the
data->data pointer. If we do the latter, the caller simply
ignores the new buffer we return and proceeds to use its own
buffer, which we never updated.
*/
if (data->length < length)
jborean93 marked this conversation as resolved.
Show resolved Hide resolved
return 1;

memcpy(data->data, value, length);
data->length = length;
data->data = value;
return 0;
}
"""

Expand Down Expand Up @@ -92,7 +105,7 @@ cdef extern from "python_krb5.h":
krb5_prompt prompts[],
)

void pykrb5_set_krb5_data(
int pykrb5_set_krb5_data(
krb5_data *data,
size_t length,
char *value,
Expand Down