X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mod_auth_gssapi.git;a=blobdiff_plain;f=src%2Fmod_auth_gssapi.c;h=b1b16e54c859cf9d5db100a36601c2bd14921c47;hp=a16e1ada262e69f0a761e5a312b40757159cba85;hb=7aed3f2080561c603bc2dc6e44dcce3f6f09a09e;hpb=c18ca3a748d4e963bbfe4a55288c981025b9f076 diff --git a/src/mod_auth_gssapi.c b/src/mod_auth_gssapi.c index a16e1ad..b1b16e5 100644 --- a/src/mod_auth_gssapi.c +++ b/src/mod_auth_gssapi.c @@ -292,12 +292,16 @@ 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, + bool multi_step_supported) { - if (cfg->allowed_mechs == GSS_C_NO_OID_SET) return true; + if (!multi_step_supported && gss_oid_equal(&gss_mech_ntlmssp, mech)) + return false; + + 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 +353,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]), @@ -402,12 +408,11 @@ static bool mag_auth_basic(request_rec *req, gss_name_t server = GSS_C_NO_NAME; gss_cred_id_t server_cred = GSS_C_NO_CREDENTIAL; gss_ctx_id_t server_ctx = GSS_C_NO_CONTEXT; + 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_desc all_mechs_desc; gss_OID_set actual_mechs = GSS_C_NO_OID_SET; uint32_t init_flags = 0; uint32_t maj, min; @@ -428,24 +433,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 +459,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; } @@ -524,6 +520,22 @@ static bool mag_auth_basic(request_rec *req, goto done; } + /* must acquire creds based on the actual mechs we want to try */ + if (!mag_acquire_creds(req, cfg, actual_mechs, + cred_usage, &acquired_cred, NULL)) { + goto done; + } + + if (cred_usage == GSS_C_BOTH) { + /* must acquire with GSS_C_ACCEPT to get the server name */ + if (!mag_acquire_creds(req, cfg, actual_mechs, + GSS_C_ACCEPT, &server_cred, NULL)) { + goto done; + } + } else { + server_cred = acquired_cred; + } + #ifdef HAVE_CRED_STORE if (cfg->deleg_ccache_dir) { /* delegate ourselves credentials so we store them as requested */ @@ -533,45 +545,21 @@ 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); gss_release_name(&min, &server); - gss_release_cred(&min, &server_cred); - - all_mechs_desc.count = 1; - all_mechs_desc.elements = &actual_mechs->elements[i]; - allowed_mechs = &all_mechs_desc; - /* must acquire with GSS_C_ACCEPT to get the server name */ - if (!mag_acquire_creds(req, cfg, allowed_mechs, - GSS_C_ACCEPT, &server_cred, NULL)) { - continue; - } - maj = gss_inquire_cred(&min, server_cred, &server, - NULL, NULL, NULL); + maj = gss_inquire_cred_by_mech(&min, server_cred, + &actual_mechs->elements[i], + &server, NULL, NULL, NULL); if (GSS_ERROR(maj)) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, - "%s", mag_error(req, "gss_inquired_cred_() " + "%s", mag_error(req, "gss_inquired_cred_by_mech() " "failed", maj, min)); continue; } - if (cred_usage == GSS_C_BOTH) { - /* reacquire server creds in order to allow delegation */ - gss_release_cred(&min, &server_cred); - if (!mag_acquire_creds(req, cfg, allowed_mechs, - GSS_C_BOTH, &server_cred, NULL)) { - continue; - } - } - do { /* output and input are inverted here, this is intentional */ maj = gss_init_sec_context(&min, user_cred, &user_ctx, server, @@ -585,7 +573,7 @@ static bool mag_auth_basic(request_rec *req, break; } gss_release_buffer(&min, &output); - maj = gss_accept_sec_context(&min, &server_ctx, server_cred, + maj = gss_accept_sec_context(&min, &server_ctx, acquired_cred, &input, GSS_C_NO_CHANNEL_BINDINGS, client, mech_type, &output, NULL, vtime, delegated_cred); @@ -608,13 +596,15 @@ done: gss_release_buffer(&min, &output); gss_release_buffer(&min, &input); gss_release_name(&min, &server); - gss_release_cred(&min, &server_cred); + if (server_cred != acquired_cred) + gss_release_cred(&min, &server_cred); gss_delete_sec_context(&min, &server_ctx, GSS_C_NO_BUFFER); + gss_release_cred(&min, &acquired_cred); gss_release_name(&min, &user); 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); @@ -629,11 +619,63 @@ done: return ret; } +struct mag_req_cfg *mag_init_cfg(request_rec *req) +{ + struct mag_server_config *scfg; + struct mag_req_cfg *req_cfg = apr_pcalloc(req->pool, + sizeof(struct mag_req_cfg)); + req_cfg->req = req; + req_cfg->cfg = ap_get_module_config(req->per_dir_config, + &auth_gssapi_module); + + scfg = ap_get_module_config(req->server->module_config, + &auth_gssapi_module); + + if (req_cfg->cfg->allowed_mechs) { + req_cfg->desired_mechs = req_cfg->cfg->allowed_mechs; + } else { + /* Use the default set if not explicitly configured */ + req_cfg->desired_mechs = scfg->default_mechs; + } + + if (!req_cfg->cfg->mag_skey) { + req_cfg->mag_skey = req_cfg->cfg->mag_skey; + } else { + /* Use server random key if not explicitly configured */ + req_cfg->mag_skey = scfg->mag_skey; + } + + if (req->proxyreq == PROXYREQ_PROXY) { + req_cfg->req_proto = "Proxy-Authorization"; + req_cfg->rep_proto = "Proxy-Authenticate"; + } else { + req_cfg->req_proto = "Authorization"; + req_cfg->rep_proto = "WWW-Authenticate"; + req_cfg->use_sessions = req_cfg->cfg->use_sessions; + req_cfg->send_persist = req_cfg->cfg->send_persist; + } + + return req_cfg; +} + +static bool use_s4u2proxy(struct mag_req_cfg *req_cfg) { + if (req_cfg->cfg->use_s4u2proxy) { + if (req_cfg->cfg->deleg_ccache_dir != NULL) { + return true; + } else { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req_cfg->req, + "S4U2 Proxy requested but GssapiDelegCcacheDir " + "is not set. Constrained delegation disabled!"); + } + } + return false; +} static int mag_auth(request_rec *req) { const char *type; int auth_type = -1; + struct mag_req_cfg *req_cfg; struct mag_config *cfg; const char *auth_header; char *auth_header_type; @@ -656,7 +698,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; @@ -667,20 +708,11 @@ static int mag_auth(request_rec *req) return DECLINED; } - cfg = ap_get_module_config(req->per_dir_config, &auth_gssapi_module); + req_cfg = mag_init_cfg(req); - if (cfg->allowed_mechs) { - desired_mechs = cfg->allowed_mechs; - } else { - /* 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; - } + cfg = req_cfg->cfg; + + desired_mechs = req_cfg->desired_mechs; /* implicit auth for subrequests if main auth already happened */ if (!ap_is_initial_req(req) && req->main != NULL) { @@ -732,11 +764,11 @@ static int mag_auth(request_rec *req) } /* if available, session always supersedes connection bound data */ - if (cfg->use_sessions) { - mag_check_session(req, cfg, &mc); + if (req_cfg->use_sessions) { + mag_check_session(req_cfg, &mc); } - auth_header = apr_table_get(req->headers_in, "Authorization"); + auth_header = apr_table_get(req->headers_in, req_cfg->req_proto); if (mc) { if (mc->established && @@ -792,7 +824,7 @@ static int mag_auth(request_rec *req) ba_pwd.length = strlen(ba_pwd.value); if (mc && mc->established && - mag_basic_check(cfg, mc, ba_user, ba_pwd)) { + mag_basic_check(req_cfg, mc, ba_user, ba_pwd)) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, req, "Already established BASIC AUTH context found!"); mag_set_req_data(req, cfg, mc); @@ -803,7 +835,8 @@ 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, + cfg->gss_conn_ctx)) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, req, "NTLM Authentication is not allowed!"); goto done; @@ -830,10 +863,11 @@ static int mag_auth(request_rec *req) req->ap_auth_type = apr_pstrdup(req->pool, auth_types[auth_type]); #ifdef HAVE_CRED_STORE - if (cfg->use_s4u2proxy) { + if (use_s4u2proxy(req_cfg)) { cred_usage = GSS_C_BOTH; } #endif + if (auth_type == AUTH_TYPE_BASIC) { if (mag_auth_basic(req, cfg, ba_user, ba_pwd, cred_usage, &client, &mech_type, @@ -935,20 +969,21 @@ complete: mc->expiration = expiration; mc->auth_type = auth_type; if (auth_type == AUTH_TYPE_BASIC) { - mag_basic_cache(cfg, mc, ba_user, ba_pwd); + mag_basic_cache(req_cfg, mc, ba_user, ba_pwd); } - if (cfg->use_sessions) { - mag_attempt_session(req, cfg, mc); + if (req_cfg->use_sessions) { + mag_attempt_session(req_cfg, mc); } } - if (cfg->send_persist) + if (req_cfg->send_persist) apr_table_set(req->headers_out, "Persistent-Auth", cfg->gss_conn_ctx ? "true" : "false"); ret = OK; done: + if ((auth_type != AUTH_TYPE_BASIC) && (output.length != 0)) { int prefixlen = strlen(auth_types[auth_type]) + 1; replen = apr_base64_encode_len(output.length) + 1; @@ -957,22 +992,22 @@ done: memcpy(reply, auth_types[auth_type], prefixlen - 1); reply[prefixlen - 1] = ' '; apr_base64_encode(&reply[prefixlen], output.value, output.length); - apr_table_add(req->err_headers_out, - "WWW-Authenticate", reply); + apr_table_add(req->err_headers_out, req_cfg->rep_proto, reply); } } else if (ret == HTTP_UNAUTHORIZED) { - apr_table_add(req->err_headers_out, "WWW-Authenticate", "Negotiate"); - if (is_mech_allowed(cfg, &gss_mech_ntlmssp)) { - apr_table_add(req->err_headers_out, "WWW-Authenticate", "NTLM"); + apr_table_add(req->err_headers_out, req_cfg->rep_proto, "Negotiate"); + + if (is_mech_allowed(desired_mechs, &gss_mech_ntlmssp, + cfg->gss_conn_ctx)) { + apr_table_add(req->err_headers_out, req_cfg->rep_proto, "NTLM"); } if (cfg->use_basic_auth) { - apr_table_add(req->err_headers_out, - "WWW-Authenticate", + apr_table_add(req->err_headers_out, req_cfg->rep_proto, apr_psprintf(req->pool, "Basic realm=\"%s\"", 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); @@ -1036,9 +1071,6 @@ static const char *mag_use_s4u2p(cmd_parms *parms, void *mconfig, int on) struct mag_config *cfg = (struct mag_config *)mconfig; cfg->use_s4u2proxy = on ? true : false; - if (cfg->deleg_ccache_dir == NULL) { - cfg->deleg_ccache_dir = apr_pstrdup(parms->pool, "/tmp"); - } return NULL; } #endif @@ -1149,48 +1181,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, @@ -1198,7 +1261,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; } @@ -1209,12 +1273,40 @@ 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; + apr_status_t rc; + + 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); + } + + rc = SEAL_KEY_CREATE(p, &scfg->mag_skey, NULL); + if (rc != OK) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, + "Failed to generate random sealing key!"); + } + + 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"), @@ -1260,7 +1352,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