Skip to content

corrected Heimdal compatibility #124

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 31, 2022
Merged

corrected Heimdal compatibility #124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions ngx_http_auth_spnego_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@
#define spnego_log_error(fmt, args...) \
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, fmt, ##args)

#ifndef krb5_realm_length
#define krb5_realm_length(r) ((r).length)
#define krb5_realm_data(r) ((r).data)
#endif

/* Module handler */
static ngx_int_t ngx_http_auth_spnego_handler(ngx_http_request_t *);

Expand Down Expand Up @@ -1195,12 +1200,12 @@ static krb5_error_code ngx_http_auth_spnego_verify_server_credentials(
}

size_t tgs_principal_name_size =
(ngx_strlen(KRB5_TGS_NAME) + (principal->realm.length * 2) + 2) + 1;
(ngx_strlen(KRB5_TGS_NAME) + (krb5_realm_length(principal->realm) * 2) + 2) + 1;
tgs_principal_name = (char *)ngx_pcalloc(r->pool, tgs_principal_name_size);
ngx_snprintf((u_char *)tgs_principal_name, tgs_principal_name_size,
"%s/%*s@%*s", KRB5_TGS_NAME, principal->realm.length,
principal->realm.data, principal->realm.length,
principal->realm.data);
"%s/%*s@%*s", KRB5_TGS_NAME, krb5_realm_length(principal->realm),
krb5_realm_data(principal->realm), krb5_realm_length(principal->realm),
krb5_realm_data(principal->realm));

if ((kerr = krb5_parse_name(kcontext, tgs_principal_name,
&match_creds.server))) {
Expand Down Expand Up @@ -1341,13 +1346,13 @@ static ngx_int_t ngx_http_auth_spnego_obtain_server_credentials(
krb5_get_init_creds_opt_set_forwardable(&gicopts, 1);

size_t tgs_principal_name_size =
(ngx_strlen(KRB5_TGS_NAME) + (principal->realm.length * 2) + 2) + 1;
(ngx_strlen(KRB5_TGS_NAME) + (krb5_realm_length(principal->realm) * 2) + 2) + 1;
tgs_principal_name = (char *)ngx_pcalloc(r->pool, tgs_principal_name_size);

ngx_snprintf((u_char *)tgs_principal_name, tgs_principal_name_size,
"%s/%*s@%*s", KRB5_TGS_NAME, principal->realm.length,
principal->realm.data, principal->realm.length,
principal->realm.data);
"%s/%*s@%*s", KRB5_TGS_NAME, krb5_realm_length(principal->realm),
krb5_realm_data(principal->realm), krb5_realm_length(principal->realm),
krb5_realm_data(principal->realm));

kerr = krb5_get_init_creds_keytab(kcontext, &creds, principal, keytab, 0,
tgs_principal_name, &gicopts);
Expand Down