X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mod_auth_gssapi.git;a=blobdiff_plain;f=src%2Fmod_auth_gssapi.c;h=763b625cef106923afca753e4c3e192df24bb49e;hp=9d9fbc53261f082f927ffc17fb3440a74730ff97;hb=4e7967e797e5c8912a67c0de8f172bb95b5172ff;hpb=f20a3525f62bdc154e4a93d7e2eb6310067999b3 diff --git a/src/mod_auth_gssapi.c b/src/mod_auth_gssapi.c index 9d9fbc5..763b625 100644 --- a/src/mod_auth_gssapi.c +++ b/src/mod_auth_gssapi.c @@ -292,12 +292,12 @@ static bool parse_auth_header(apr_pool_t *pool, const char **auth_header, return true; } -static bool is_mech_allowed(struct mag_config *cfg, gss_const_OID mech) +static bool is_mech_allowed(gss_OID_set allowed_mechs, gss_const_OID mech) { - if (cfg->allowed_mechs == GSS_C_NO_OID_SET) return true; + if (allowed_mechs == GSS_C_NO_OID_SET) return true; - for (int i = 0; i < cfg->allowed_mechs->count; i++) { - if (gss_oid_equal(&cfg->allowed_mechs->elements[i], mech)) { + for (int i = 0; i < allowed_mechs->count; i++) { + if (gss_oid_equal(&allowed_mechs->elements[i], mech)) { return true; } } @@ -349,6 +349,8 @@ gss_OID_set mag_filter_unwanted_mechs(gss_OID_set src) uint32_t maj, min; int present = 0; + if (src == GSS_C_NO_OID_SET) return GSS_C_NO_OID_SET; + for (int i = 0; unwanted_mechs[i] != GSS_C_NO_OID; i++) { maj = gss_test_oid_set_member(&min, discard_const(unwanted_mechs[i]), @@ -405,7 +407,6 @@ static bool mag_auth_basic(request_rec *req, gss_cred_id_t acquired_cred = GSS_C_NO_CREDENTIAL; gss_buffer_desc input = GSS_C_EMPTY_BUFFER; gss_buffer_desc output = GSS_C_EMPTY_BUFFER; - gss_OID_set indicated_mechs = GSS_C_NO_OID_SET; gss_OID_set allowed_mechs; gss_OID_set filtered_mechs; gss_OID_set actual_mechs = GSS_C_NO_OID_SET; @@ -428,24 +429,19 @@ static bool mag_auth_basic(request_rec *req, } else if (cfg->allowed_mechs) { allowed_mechs = cfg->allowed_mechs; } else { + struct mag_server_config *scfg; /* Try to fetch the default set if not explicitly configured, * We need to do this because gss_acquire_cred_with_password() * is currently limited to acquire creds for a single "default" * mechanism if no desired mechanisms are passed in. This causes * authentication to fail for secondary mechanisms as no user * credentials are generated for those. */ - maj = gss_indicate_mechs(&min, &indicated_mechs); - if (maj != GSS_S_COMPLETE) { - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, req, "%s", - mag_error(req, "gss_indicate_mechs() failed", - maj, min)); - /* if indicated _mechs failed, set GSS_C_NO_OID_SET. This - * generally causes only the krb5 mechanism to be tried due - * to implementation constraints, but may change in future. */ - allowed_mechs = GSS_C_NO_OID_SET; - } else { - allowed_mechs = indicated_mechs; - } + scfg = ap_get_module_config(req->server->module_config, + &auth_gssapi_module); + /* In the worst case scenario default_mechs equals to GSS_C_NO_OID_SET. + * This generally causes only the krb5 mechanism to be tried due + * to implementation constraints, but may change in future. */ + allowed_mechs = scfg->default_mechs; } /* Remove Spnego if present, or we'd repeat failed authentiations @@ -459,18 +455,14 @@ static bool mag_auth_basic(request_rec *req, * multiple times uselessly. */ filtered_mechs = mag_filter_unwanted_mechs(allowed_mechs); - if (filtered_mechs == GSS_C_NO_OID_SET) { + if (filtered_mechs == allowed_mechs) { + /* in case filtered_mechs was not allocated here don't free it */ + filtered_mechs = GSS_C_NO_OID_SET; + } else if (filtered_mechs == GSS_C_NO_OID_SET) { ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, req, "Fatal " "failure while filtering mechs, aborting"); goto done; - } else if (filtered_mechs != allowed_mechs) { - /* if indicated_mechs where sourced then free them here before - * reusing the pointer */ - gss_release_oid_set(&min, &indicated_mechs); - - /* mark the list of mechs needs to be freed */ - indicated_mechs = filtered_mechs; - + } else { /* use the filtered list */ allowed_mechs = filtered_mechs; } @@ -526,7 +518,7 @@ static bool mag_auth_basic(request_rec *req, /* must acquire creds based on the actual mechs we want to try */ if (!mag_acquire_creds(req, cfg, actual_mechs, - GSS_C_BOTH, &acquired_cred, NULL)) { + cred_usage, &acquired_cred, NULL)) { goto done; } @@ -549,12 +541,6 @@ static bool mag_auth_basic(request_rec *req, for (int i = 0; i < actual_mechs->count; i++) { - /* skip spnego if present */ - if (gss_oid_equal(&actual_mechs->elements[i], - &gss_mech_spnego)) { - continue; - } - /* free these if looping */ gss_release_buffer(&min, &output); gss_release_buffer(&min, &input); @@ -614,7 +600,7 @@ done: gss_release_cred(&min, &user_cred); gss_delete_sec_context(&min, &user_ctx, GSS_C_NO_BUFFER); gss_release_oid_set(&min, &actual_mechs); - gss_release_oid_set(&min, &indicated_mechs); + gss_release_oid_set(&min, &filtered_mechs); #ifdef HAVE_GSS_KRB5_CCACHE_NAME if (user_ccache != NULL) { maj = gss_krb5_ccache_name(&min, orig_ccache, NULL); @@ -656,7 +642,6 @@ static int mag_auth(request_rec *req) char *clientname; gss_OID mech_type = GSS_C_NO_OID; gss_OID_set desired_mechs = GSS_C_NO_OID_SET; - gss_OID_set indicated_mechs = GSS_C_NO_OID_SET; gss_buffer_desc lname = GSS_C_EMPTY_BUFFER; struct mag_conn *mc = NULL; time_t expiration; @@ -672,14 +657,11 @@ static int mag_auth(request_rec *req) if (cfg->allowed_mechs) { desired_mechs = cfg->allowed_mechs; } else { + struct mag_server_config *scfg; /* Try to fetch the default set if not explicitly configured */ - maj = gss_indicate_mechs(&min, &indicated_mechs); - if (maj != GSS_S_COMPLETE) { - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, req, "%s", - mag_error(req, "gss_indicate_mechs() failed", - maj, min)); - } - desired_mechs = indicated_mechs; + scfg = ap_get_module_config(req->server->module_config, + &auth_gssapi_module); + desired_mechs = scfg->default_mechs; } /* implicit auth for subrequests if main auth already happened */ @@ -803,7 +785,7 @@ static int mag_auth(request_rec *req) break; case AUTH_TYPE_RAW_NTLM: - if (!is_mech_allowed(cfg, &gss_mech_ntlmssp)) { + if (!is_mech_allowed(desired_mechs, &gss_mech_ntlmssp)) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, req, "NTLM Authentication is not allowed!"); goto done; @@ -963,7 +945,7 @@ done: } } else if (ret == HTTP_UNAUTHORIZED) { apr_table_add(req->err_headers_out, "WWW-Authenticate", "Negotiate"); - if (is_mech_allowed(cfg, &gss_mech_ntlmssp)) { + if (is_mech_allowed(desired_mechs, &gss_mech_ntlmssp)) { apr_table_add(req->err_headers_out, "WWW-Authenticate", "NTLM"); } if (cfg->use_basic_auth) { @@ -973,7 +955,7 @@ done: ap_auth_name(req))); } } - gss_release_oid_set(&min, &indicated_mechs); + if (ctx != GSS_C_NO_CONTEXT) gss_delete_sec_context(&min, &ctx, GSS_C_NO_BUFFER); gss_release_cred(&min, &acquired_cred); @@ -1150,48 +1132,79 @@ static const char *mag_use_basic_auth(cmd_parms *parms, void *mconfig, int on) } #endif -#define MAX_ALLOWED_MECHS 10 +static apr_status_t mag_oid_set_destroy(void *ptr) +{ + uint32_t min; + gss_OID_set set = (gss_OID_set)ptr; + (void)gss_release_oid_set(&min, &set); + return APR_SUCCESS; +} -static void mag_list_of_mechs(cmd_parms *parms, gss_OID_set *oidset, +static bool mag_list_of_mechs(cmd_parms *parms, gss_OID_set *oidset, bool add_spnego, const char *w) { - gss_const_OID oid; + gss_buffer_desc buf = { 0 }; + uint32_t maj, min; gss_OID_set set; - size_t size; + gss_OID oid; + bool release_oid = false; if (NULL == *oidset) { - set = apr_pcalloc(parms->pool, sizeof(gss_OID_set_desc)); - size = sizeof(gss_OID) * MAX_ALLOWED_MECHS; - set->elements = apr_palloc(parms->pool, size); + maj = gss_create_empty_oid_set(&min, &set); + if (maj != GSS_S_COMPLETE) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, parms->server, + "gss_create_empty_oid_set() failed."); + *oidset = GSS_C_NO_OID_SET; + return false; + } if (add_spnego) { - set->elements[0] = gss_mech_spnego; - set->count++; + oid = discard_const(&gss_mech_spnego); + maj = gss_add_oid_set_member(&min, oid, &set); + if (maj != GSS_S_COMPLETE) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, parms->server, + "gss_add_oid_set_member() failed."); + (void)gss_release_oid_set(&min, &set); + *oidset = GSS_C_NO_OID_SET; + return false; + } } + /* register in the pool so it can be released once the server + * winds down */ + apr_pool_cleanup_register(parms->pool, (void *)set, + mag_oid_set_destroy, + apr_pool_cleanup_null); *oidset = set; } else { set = *oidset; } if (strcmp(w, "krb5") == 0) { - oid = gss_mech_krb5; + oid = discard_const(gss_mech_krb5); } else if (strcmp(w, "iakerb") == 0) { - oid = gss_mech_iakerb; + oid = discard_const(gss_mech_iakerb); } else if (strcmp(w, "ntlmssp") == 0) { - oid = &gss_mech_ntlmssp; + oid = discard_const(&gss_mech_ntlmssp); } else { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, parms->server, - "Unrecognized GSSAPI Mechanism: %s", w); - return; + buf.value = discard_const(w); + buf.length = strlen(w); + maj = gss_str_to_oid(&min, &buf, &oid); + if (maj != GSS_S_COMPLETE) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, parms->server, + "Unrecognized GSSAPI Mechanism: [%s]", w); + return false; + } + release_oid = true; } - - if (set->count >= MAX_ALLOWED_MECHS) { + maj = gss_add_oid_set_member(&min, oid, &set); + if (maj != GSS_S_COMPLETE) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, parms->server, - "Too many GssapiAllowedMech options (MAX: %d)", - MAX_ALLOWED_MECHS); - return; + "gss_add_oid_set_member() failed for [%s].", w); + } + if (release_oid) { + (void)gss_release_oid(&min, &oid); } - set->elements[set->count] = *oid; - set->count++; + + return true; } static const char *mag_allow_mech(cmd_parms *parms, void *mconfig, @@ -1199,7 +1212,8 @@ static const char *mag_allow_mech(cmd_parms *parms, void *mconfig, { struct mag_config *cfg = (struct mag_config *)mconfig; - mag_list_of_mechs(parms, &cfg->allowed_mechs, true, w); + if (!mag_list_of_mechs(parms, &cfg->allowed_mechs, true, w)) + return "Failed to apply GssapiAllowedMech directive"; return NULL; } @@ -1210,12 +1224,33 @@ static const char *mag_basic_auth_mechs(cmd_parms *parms, void *mconfig, { struct mag_config *cfg = (struct mag_config *)mconfig; - mag_list_of_mechs(parms, &cfg->basic_mechs, false, w); + if (!mag_list_of_mechs(parms, &cfg->basic_mechs, false, w)) + return "Failed to apply GssapiBasicAuthMech directive"; return NULL; } #endif +static void *mag_create_server_config(apr_pool_t *p, server_rec *s) +{ + struct mag_server_config *scfg; + uint32_t maj, min; + + scfg = apr_pcalloc(p, sizeof(struct mag_server_config)); + + maj = gss_indicate_mechs(&min, &scfg->default_mechs); + if (maj != GSS_S_COMPLETE) { + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, + "gss_indicate_mechs() failed"); + } else { + /* Register the set in pool */ + apr_pool_cleanup_register(p, (void *)scfg->default_mechs, + mag_oid_set_destroy, apr_pool_cleanup_null); + } + + return scfg; +} + static const command_rec mag_commands[] = { AP_INIT_FLAG("GssapiSSLonly", mag_ssl_only, NULL, OR_AUTHCFG, "Work only if connection is SSL Secured"), @@ -1261,7 +1296,7 @@ module AP_MODULE_DECLARE_DATA auth_gssapi_module = STANDARD20_MODULE_STUFF, mag_create_dir_config, NULL, - NULL, + mag_create_server_config, NULL, mag_commands, mag_register_hooks