X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mod_auth_gssapi.git;a=blobdiff_plain;f=src%2Fmod_auth_gssapi.c;h=e1ecc36562048282138a11e2bdb7a45e19fc9d3c;hp=9cb53eca0e334329cf703a7fc255d5457e9646ac;hb=6e4513dc0ebe5ff6643223d35b509464d451b230;hpb=983ac18b86eb0059274692690e0cf925549174ac diff --git a/src/mod_auth_gssapi.c b/src/mod_auth_gssapi.c index 9cb53ec..e1ecc36 100644 --- a/src/mod_auth_gssapi.c +++ b/src/mod_auth_gssapi.c @@ -24,14 +24,24 @@ #include "mod_auth_gssapi.h" +const gss_OID_desc gss_mech_spnego = { + 6, "\x2b\x06\x01\x05\x05\x02" +}; + +const gss_OID_desc gss_mech_ntlmssp = { + GSS_NTLMSSP_OID_LENGTH, GSS_NTLMSSP_OID_STRING +}; + +const gss_OID_set_desc gss_mech_set_ntlmssp = { + 1, discard_const(&gss_mech_ntlmssp) +}; + #define MOD_AUTH_GSSAPI_VERSION PACKAGE_NAME "/" PACKAGE_VERSION module AP_MODULE_DECLARE_DATA auth_gssapi_module; APLOG_USE_MODULE(auth_gssapi); -APR_DECLARE_OPTIONAL_FN(int, ssl_is_https, (conn_rec *)); - static char *mag_status(request_rec *req, int type, uint32_t err) { uint32_t maj_ret, min_ret; @@ -90,10 +100,7 @@ static int mag_pre_connection(conn_rec *c, void *csd) { struct mag_conn *mc; - mc = apr_pcalloc(c->pool, sizeof(struct mag_conn)); - if (!mc) return DECLINED; - - mc->parent = c->pool; + mc = mag_new_conn_ctx(c->pool); ap_set_module_config(c->conn_config, &auth_gssapi_module, (void*)mc); return OK; } @@ -105,11 +112,35 @@ static apr_status_t mag_conn_destroy(void *ptr) if (mc->ctx) { (void)gss_delete_sec_context(&min, &mc->ctx, GSS_C_NO_BUFFER); - mc->established = false; } return APR_SUCCESS; } +struct mag_conn *mag_new_conn_ctx(apr_pool_t *pool) +{ + struct mag_conn *mc; + + mc = apr_pcalloc(pool, sizeof(struct mag_conn)); + apr_pool_create(&mc->pool, pool); + /* register the context in the memory pool, so it can be freed + * when the connection/request is terminated */ + apr_pool_cleanup_register(mc->pool, (void *)mc, + mag_conn_destroy, apr_pool_cleanup_null); + + return mc; +} + +static void mag_conn_clear(struct mag_conn *mc) +{ + (void)mag_conn_destroy(mc); + apr_pool_t *temp; + + apr_pool_clear(mc->pool); + temp = mc->pool; + memset(mc, 0, sizeof(struct mag_conn)); + mc->pool = temp; +} + static bool mag_conn_is_https(conn_rec *c) { if (mag_is_https) { @@ -119,6 +150,38 @@ static bool mag_conn_is_https(conn_rec *c) return false; } +static bool mag_acquire_creds(request_rec *req, + struct mag_config *cfg, + gss_OID_set desired_mechs, + gss_cred_usage_t cred_usage, + gss_cred_id_t *creds, + gss_OID_set *actual_mechs) +{ + uint32_t maj, min; +#ifdef HAVE_CRED_STORE + gss_const_key_value_set_t store = cfg->cred_store; + + maj = gss_acquire_cred_from(&min, GSS_C_NO_NAME, GSS_C_INDEFINITE, + desired_mechs, cred_usage, store, creds, + actual_mechs, NULL); +#else + maj = gss_acquire_cred(&min, GSS_C_NO_NAME, GSS_C_INDEFINITE, + desired_mechs, cred_usage, creds, + actual_mechs, NULL); +#endif + + if (GSS_ERROR(maj)) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, "%s", + mag_error(req, "gss_acquire_cred[_from]() " + "failed to get server creds", + maj, min)); + return false; + } + + return true; +} + +#ifdef HAVE_CRED_STORE static char *escape(apr_pool_t *pool, const char *name, char find, const char *replace) { @@ -128,7 +191,6 @@ static char *escape(apr_pool_t *pool, const char *name, char *p; namecopy = apr_pstrdup(pool, name); - if (!namecopy) goto done; p = strchr(namecopy, find); if (!p) return namecopy; @@ -143,7 +205,6 @@ static char *escape(apr_pool_t *pool, const char *name, } else { escaped = apr_pstrcat(pool, n, replace, NULL); } - if (!escaped) goto done; /* move to next segment */ n = p + 1; p = strchr(n, find); @@ -153,93 +214,311 @@ static char *escape(apr_pool_t *pool, const char *name, escaped = apr_pstrcat(pool, escaped, n, NULL); } -done: - if (!escaped) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, NULL, - "OOM escaping name"); - } return escaped; } -static void mag_store_deleg_creds(request_rec *req, - char *dir, char *clientname, - gss_cred_id_t delegated_cred, - char **ccachefile) +static char *mag_gss_name_to_ccache_name(request_rec *req, + char *dir, const char *gss_name) { - gss_key_value_element_desc element; - gss_key_value_set_desc store; - char *value; - uint32_t maj, min; char *escaped; /* We need to escape away '/', we can't have path separators in * a ccache file name */ /* first double escape the esacping char (~) if any */ - escaped = escape(req->pool, clientname, '~', "~~"); - if (!escaped) return; + escaped = escape(req->pool, gss_name, '~', "~~"); /* then escape away the separator (/) if any */ escaped = escape(req->pool, escaped, '/', "~"); - if (!escaped) return; - value = apr_psprintf(req->pool, "FILE:%s/%s", dir, escaped); - if (!value) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, NULL, - "OOM storing delegated credentials"); - return; + return apr_psprintf(req->pool, "%s/%s", dir, escaped); +} + +static void mag_set_KRB5CCANME(request_rec *req, char *ccname) +{ + apr_status_t status; + apr_finfo_t finfo; + char *value; + + status = apr_stat(&finfo, ccname, APR_FINFO_MIN, req->pool); + if (status != APR_SUCCESS && status != APR_INCOMPLETE) { + /* set the file cache anyway, but warn */ + ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, + "KRB5CCNAME file (%s) lookup failed!", ccname); } + value = apr_psprintf(req->pool, "FILE:%s", ccname); + apr_table_set(req->subprocess_env, "KRB5CCNAME", value); +} + +static void mag_store_deleg_creds(request_rec *req, + char *dir, char *clientname, + gss_cred_id_t delegated_cred, + char **ccachefile) +{ + gss_key_value_element_desc element; + gss_key_value_set_desc store; + char *ccname; + uint32_t maj, min; element.key = "ccache"; - element.value = value; store.elements = &element; store.count = 1; + ccname = mag_gss_name_to_ccache_name(req, dir, clientname); + element.value = apr_psprintf(req->pool, "FILE:%s", ccname); + maj = gss_store_cred_into(&min, delegated_cred, GSS_C_INITIATE, GSS_C_NULL_OID, 1, 1, &store, NULL, NULL); if (GSS_ERROR(maj)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, "%s", + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, "%s", mag_error(req, "failed to store delegated creds", maj, min)); } - *ccachefile = value; + *ccachefile = ccname; +} +#endif + +static bool parse_auth_header(apr_pool_t *pool, const char **auth_header, + gss_buffer_t value) +{ + char *auth_header_value; + + auth_header_value = ap_getword_white(pool, auth_header); + if (!auth_header_value) return false; + value->length = apr_base64_decode_len(auth_header_value) + 1; + value->value = apr_pcalloc(pool, value->length); + if (!value->value) return false; + value->length = apr_base64_decode(value->value, auth_header_value); + + return true; +} + +static bool is_mech_allowed(struct mag_config *cfg, gss_const_OID mech) +{ + if (cfg->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)) { + return true; + } + } + return false; +} + +#define AUTH_TYPE_NEGOTIATE 0 +#define AUTH_TYPE_BASIC 1 +#define AUTH_TYPE_RAW_NTLM 2 +const char *auth_types[] = { + "Negotiate", + "Basic", + "NTLM", + NULL +}; + +static void mag_set_req_data(request_rec *req, + struct mag_config *cfg, + struct mag_conn *mc) +{ + apr_table_set(req->subprocess_env, "GSS_NAME", mc->gss_name); + apr_table_set(req->subprocess_env, "GSS_SESSION_EXPIRATION", + apr_psprintf(req->pool, + "%ld", (long)mc->expiration)); + req->ap_auth_type = apr_pstrdup(req->pool, + auth_types[mc->auth_type]); + req->user = apr_pstrdup(req->pool, mc->user_name); + if (cfg->deleg_ccache_dir && mc->delegated) { + char *ccname; + ccname = mag_gss_name_to_ccache_name(req, + cfg->deleg_ccache_dir, + mc->gss_name); + if (ccname) { + mag_set_KRB5CCANME(req, ccname); + } + } +} + +static bool mag_auth_basic(request_rec *req, + struct mag_config *cfg, + gss_buffer_desc ba_user, + gss_buffer_desc ba_pwd, + gss_cred_id_t acquired_cred, + gss_cred_usage_t cred_usage, + gss_name_t *client, + gss_OID *mech_type, + gss_cred_id_t *delegated_cred, + uint32_t *vtime) +{ +#ifdef HAVE_GSS_KRB5_CCACHE_NAME + const char *user_ccache = NULL; + const char *orig_ccache = NULL; + long long unsigned int rndname; + apr_status_t rs; +#endif + gss_name_t user = GSS_C_NO_NAME; + gss_cred_id_t user_cred = GSS_C_NO_CREDENTIAL; + gss_ctx_id_t user_ctx = GSS_C_NO_CONTEXT; + 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_buffer_desc input = GSS_C_EMPTY_BUFFER; + gss_buffer_desc output = GSS_C_EMPTY_BUFFER; + uint32_t init_flags = 0; + uint32_t maj, min; + bool ret = false; + +#ifdef HAVE_GSS_KRB5_CCACHE_NAME + rs = apr_generate_random_bytes((unsigned char *)(&rndname), + sizeof(long long unsigned int)); + if (rs != APR_SUCCESS) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, + "Failed to generate random ccache name"); + goto done; + } + user_ccache = apr_psprintf(req->pool, "MEMORY:user_%qu", rndname); + maj = gss_krb5_ccache_name(&min, user_ccache, &orig_ccache); + if (GSS_ERROR(maj)) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, + "In Basic Auth, %s", + mag_error(req, "gss_krb5_ccache_name() " + "failed", maj, min)); + goto done; + } +#endif + + maj = gss_import_name(&min, &ba_user, GSS_C_NT_USER_NAME, &user); + if (GSS_ERROR(maj)) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, + "In Basic Auth, %s", + mag_error(req, "gss_import_name() failed", + maj, min)); + goto done; + } + + maj = gss_acquire_cred_with_password(&min, user, &ba_pwd, + GSS_C_INDEFINITE, + cfg->allowed_mechs, + GSS_C_INITIATE, + &user_cred, NULL, NULL); + if (GSS_ERROR(maj)) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, + "In Basic Auth, %s", + mag_error(req, "gss_acquire_cred_with_password() " + "failed", maj, min)); + goto done; + } + + if (cred_usage == GSS_C_BOTH) { + /* If GSS_C_BOTH is used then inquire_cred will return the client + * name instead of the SPN of the server credentials. Therefore we + * need to acquire a different set of credential setting + * GSS_C_ACCEPT explicitly */ + if (!mag_acquire_creds(req, cfg, cfg->allowed_mechs, + GSS_C_ACCEPT, &server_cred, NULL)) { + goto done; + } + } else { + server_cred = acquired_cred; + } + maj = gss_inquire_cred(&min, server_cred, &server, + NULL, NULL, NULL); + if (GSS_ERROR(maj)) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, + "%s", mag_error(req, "gss_inquired_cred_() " + "failed", maj, min)); + goto done; + } + +#ifdef HAVE_CRED_STORE + if (cfg->deleg_ccache_dir) { + /* delegate ourselves credentials so we store them as requested */ + init_flags |= GSS_C_DELEG_FLAG; + } +#endif + + do { + /* output and input are inverted here, this is intentional */ + maj = gss_init_sec_context(&min, user_cred, &user_ctx, server, + GSS_C_NO_OID, init_flags, 300, + GSS_C_NO_CHANNEL_BINDINGS, &output, + NULL, &input, NULL, NULL); + if (GSS_ERROR(maj)) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, + "%s", mag_error(req, "gss_init_sec_context() " + "failed", maj, min)); + goto done; + } + gss_release_buffer(&min, &output); + maj = gss_accept_sec_context(&min, &server_ctx, acquired_cred, + &input, GSS_C_NO_CHANNEL_BINDINGS, + client, mech_type, &output, NULL, + vtime, delegated_cred); + if (GSS_ERROR(maj)) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, + "%s", mag_error(req, "gss_accept_sec_context()" + " failed", maj, min)); + goto done; + } + gss_release_buffer(&min, &input); + } while (maj == GSS_S_CONTINUE_NEEDED); + + ret = true; + +done: + gss_release_buffer(&min, &output); + gss_release_buffer(&min, &input); + gss_release_name(&min, &server); + if (server_cred != acquired_cred) { + gss_release_cred(&min, &server_cred); + } + gss_delete_sec_context(&min, &server_ctx, GSS_C_NO_BUFFER); + gss_release_name(&min, &user); + gss_release_cred(&min, &user_cred); + gss_delete_sec_context(&min, &user_ctx, GSS_C_NO_BUFFER); +#ifdef HAVE_GSS_KRB5_CCACHE_NAME + if (user_ccache != NULL) { + maj = gss_krb5_ccache_name(&min, orig_ccache, NULL); + if (maj != GSS_S_COMPLETE) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, + "Failed to restore per-thread ccache, %s", + mag_error(req, "gss_krb5_ccache_name() " + "failed", maj, min)); + } + } +#endif + return ret; } + static int mag_auth(request_rec *req) { const char *type; - const char *auth_type; + int auth_type = -1; struct mag_config *cfg; const char *auth_header; char *auth_header_type; - char *auth_header_value; int ret = HTTP_UNAUTHORIZED; gss_ctx_id_t ctx = GSS_C_NO_CONTEXT; gss_ctx_id_t *pctx; gss_buffer_desc input = GSS_C_EMPTY_BUFFER; gss_buffer_desc output = GSS_C_EMPTY_BUFFER; gss_buffer_desc name = GSS_C_EMPTY_BUFFER; + gss_buffer_desc ba_user; + gss_buffer_desc ba_pwd; gss_name_t client = GSS_C_NO_NAME; - gss_cred_id_t user_cred = GSS_C_NO_CREDENTIAL; gss_cred_id_t acquired_cred = GSS_C_NO_CREDENTIAL; gss_cred_id_t delegated_cred = GSS_C_NO_CREDENTIAL; gss_cred_usage_t cred_usage = GSS_C_ACCEPT; - uint32_t flags; uint32_t vtime; uint32_t maj, min; char *reply; size_t replen; 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; - bool is_basic = false; - gss_ctx_id_t user_ctx = GSS_C_NO_CONTEXT; - gss_name_t server = GSS_C_NO_NAME; -#ifdef HAVE_GSS_KRB5_CCACHE_NAME - const char *user_ccache = NULL; - const char *orig_ccache = NULL; -#endif - uint32_t init_flags = 0; + time_t expiration; + int i; type = ap_auth_type(req); if ((type == NULL) || (strcasecmp(type, "GSSAPI") != 0)) { @@ -248,15 +527,28 @@ static int mag_auth(request_rec *req) cfg = ap_get_module_config(req->per_dir_config, &auth_gssapi_module); + 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; + } + /* implicit auth for subrequests if main auth already happened */ - if (!ap_is_initial_req(req)) { + if (!ap_is_initial_req(req) && req->main != NULL) { type = ap_auth_type(req->main); if ((type != NULL) && (strcasecmp(type, "GSSAPI") == 0)) { /* warn if the subrequest location and the main request * location have different configs */ if (cfg != ap_get_module_config(req->main->per_dir_config, &auth_gssapi_module)) { - ap_log_rerror(APLOG_MARK, APLOG_WARNING||APLOG_NOERRNO, 0, + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, req, "Subrequest authentication bypass on " "location with different configuration!"); } @@ -264,13 +556,13 @@ static int mag_auth(request_rec *req) req->user = apr_pstrdup(req->pool, req->main->user); return OK; } else { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, "The main request is tasked to establish the " "security context, can't proceed!"); return HTTP_UNAUTHORIZED; } } else { - ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, req, + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, req, "Subrequest GSSAPI auth with no auth on the main " "request. This operation may fail if other " "subrequests already established a context or the " @@ -280,7 +572,7 @@ static int mag_auth(request_rec *req) if (cfg->ssl_only) { if (!mag_conn_is_https(req->connection)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, "Not a TLS connection, refusing to authenticate!"); goto done; } @@ -291,7 +583,7 @@ static int mag_auth(request_rec *req) req->connection->conn_config, &auth_gssapi_module); if (!mc) { - ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, req, + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, req, "Failed to retrieve connection context!"); goto done; } @@ -302,18 +594,15 @@ static int mag_auth(request_rec *req) mag_check_session(req, cfg, &mc); } - if (mc) { - /* register the context in the memory pool, so it can be freed - * when the connection/request is terminated */ - apr_pool_userdata_set(mc, "mag_conn_ptr", - mag_conn_destroy, mc->parent); + auth_header = apr_table_get(req->headers_in, "Authorization"); - if (mc->established) { - ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, req, + if (mc) { + if (mc->established && + (auth_header == NULL) && + (mc->auth_type != AUTH_TYPE_BASIC)) { + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, req, "Already established context found!"); - apr_table_set(req->subprocess_env, "GSS_NAME", mc->gss_name); - req->ap_auth_type = apr_pstrdup(req->pool, mc->auth_type); - req->user = apr_pstrdup(req->pool, mc->user_name); + mag_set_req_data(req, cfg, mc); ret = OK; goto done; } @@ -322,28 +611,29 @@ static int mag_auth(request_rec *req) pctx = &ctx; } - auth_header = apr_table_get(req->headers_in, "Authorization"); + /* We can proceed only if we do have an auth header */ if (!auth_header) goto done; auth_header_type = ap_getword_white(req->pool, &auth_header); if (!auth_header_type) goto done; - if (strcasecmp(auth_header_type, "Negotiate") == 0) { - auth_type = "Negotiate"; - - auth_header_value = ap_getword_white(req->pool, &auth_header); - if (!auth_header_value) goto done; - input.length = apr_base64_decode_len(auth_header_value) + 1; - input.value = apr_pcalloc(req->pool, input.length); - if (!input.value) goto done; - input.length = apr_base64_decode(input.value, auth_header_value); - } else if ((strcasecmp(auth_header_type, "Basic") == 0) && - (cfg->use_basic_auth == true)) { - auth_type = "Basic"; - is_basic = true; + for (i = 0; auth_types[i] != NULL; i++) { + if (strcasecmp(auth_header_type, auth_types[i]) == 0) { + auth_type = i; + break; + } + } - gss_buffer_desc ba_user; - gss_buffer_desc ba_pwd; + switch (auth_type) { + case AUTH_TYPE_NEGOTIATE: + if (!parse_auth_header(req->pool, &auth_header, &input)) { + goto done; + } + break; + case AUTH_TYPE_BASIC: + if (!cfg->use_basic_auth) { + goto done; + } ba_pwd.value = ap_pbase64decode(req->pool, auth_header); if (!ba_pwd.value) goto done; @@ -352,162 +642,97 @@ static int mag_auth(request_rec *req) if (!ba_user.value) goto done; if (((char *)ba_user.value)[0] == '\0' || ((char *)ba_pwd.value)[0] == '\0') { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, "Invalid empty user or password for Basic Auth"); goto done; } ba_user.length = strlen(ba_user.value); ba_pwd.length = strlen(ba_pwd.value); - maj = gss_import_name(&min, &ba_user, GSS_C_NT_USER_NAME, &client); - if (GSS_ERROR(maj)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, - "In Basic Auth, %s", - mag_error(req, "gss_import_name() failed", - maj, min)); - goto done; - } -#ifdef HAVE_GSS_KRB5_CCACHE_NAME - /* Set a per-thread ccache in case we are using kerberos, - * it is not elegant but avoids interference between threads */ - long long unsigned int rndname; - apr_status_t rs; - rs = apr_generate_random_bytes((unsigned char *)(&rndname), - sizeof(long long unsigned int)); - if (rs != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, - "Failed to generate random ccache name"); + + if (mc && mc->established && + mag_basic_check(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); + ret = OK; goto done; } - user_ccache = apr_psprintf(req->pool, "MEMORY:user_%qu", rndname); - maj = gss_krb5_ccache_name(&min, user_ccache, &orig_ccache); - if (GSS_ERROR(maj)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, - "In Basic Auth, %s", - mag_error(req, "gss_krb5_ccache_name() " - "failed", maj, min)); + + break; + + case AUTH_TYPE_RAW_NTLM: + if (!is_mech_allowed(cfg, &gss_mech_ntlmssp)) { + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, req, + "NTLM Authentication is not allowed!"); goto done; } -#endif - maj = gss_acquire_cred_with_password(&min, client, &ba_pwd, - GSS_C_INDEFINITE, - GSS_C_NO_OID_SET, - GSS_C_INITIATE, - &user_cred, NULL, NULL); - if (GSS_ERROR(maj)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, - "In Basic Auth, %s", - mag_error(req, "gss_acquire_cred_with_password() " - "failed", maj, min)); + + if (!parse_auth_header(req->pool, &auth_header, &input)) { goto done; } - gss_release_name(&min, &client); - } else { + + desired_mechs = discard_const(&gss_mech_set_ntlmssp); + break; + + default: goto done; } - req->ap_auth_type = apr_pstrdup(req->pool, auth_type); + if (mc && mc->established) { + /* if we are re-authenticating make sure the conn context + * is cleaned up so we do not accidentally reuse an existing + * established context */ + mag_conn_clear(mc); + } + + req->ap_auth_type = apr_pstrdup(req->pool, auth_types[auth_type]); -#ifdef HAVE_GSS_ACQUIRE_CRED_FROM +#ifdef HAVE_CRED_STORE if (cfg->use_s4u2proxy) { cred_usage = GSS_C_BOTH; } - if (cfg->cred_store) { - maj = gss_acquire_cred_from(&min, GSS_C_NO_NAME, GSS_C_INDEFINITE, - GSS_C_NO_OID_SET, cred_usage, - cfg->cred_store, &acquired_cred, - NULL, NULL); - if (GSS_ERROR(maj)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, "%s", - mag_error(req, "gss_acquire_cred_from() failed", - maj, min)); - goto done; - } - } #endif + if (!mag_acquire_creds(req, cfg, desired_mechs, + cred_usage, &acquired_cred, NULL)) { + goto done; + } - if (is_basic) { - if (!acquired_cred) { - /* Try to acquire default creds */ - maj = gss_acquire_cred(&min, GSS_C_NO_NAME, GSS_C_INDEFINITE, - GSS_C_NO_OID_SET, cred_usage, - &acquired_cred, NULL, NULL); - if (GSS_ERROR(maj)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, - "%s", mag_error(req, "gss_acquire_cred_from()" - " failed", maj, min)); - goto done; - } - } - maj = gss_inquire_cred(&min, acquired_cred, &server, - NULL, NULL, NULL); - if (GSS_ERROR(maj)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, - "%s", mag_error(req, "gss_inquired_cred_() " - "failed", maj, min)); - goto done; - } - - if (cfg->deleg_ccache_dir) { - /* delegate ourselves credentials so we store them as requested */ - init_flags |= GSS_C_DELEG_FLAG; + if (auth_type == AUTH_TYPE_BASIC) { + if (mag_auth_basic(req, cfg, ba_user, ba_pwd, + acquired_cred, cred_usage, + &client, &mech_type, + &delegated_cred, &vtime)) { + goto complete; } + goto done; + } - /* output and input are inverted here, this is intentional */ - maj = gss_init_sec_context(&min, user_cred, &user_ctx, server, - GSS_C_NO_OID, init_flags, 300, - GSS_C_NO_CHANNEL_BINDINGS, &output, - NULL, &input, NULL, NULL); + if (auth_type == AUTH_TYPE_NEGOTIATE && + cfg->allowed_mechs != GSS_C_NO_OID_SET) { + maj = gss_set_neg_mechs(&min, acquired_cred, cfg->allowed_mechs); if (GSS_ERROR(maj)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, - "%s", mag_error(req, "gss_init_sec_context() " - "failed", maj, min)); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, "%s", + mag_error(req, "gss_set_neg_mechs() failed", + maj, min)); goto done; } } maj = gss_accept_sec_context(&min, pctx, acquired_cred, &input, GSS_C_NO_CHANNEL_BINDINGS, - &client, &mech_type, &output, &flags, &vtime, + &client, &mech_type, &output, NULL, &vtime, &delegated_cred); if (GSS_ERROR(maj)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, "%s", + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, "%s", mag_error(req, "gss_accept_sec_context() failed", maj, min)); goto done; - } - if (is_basic) { - while (maj == GSS_S_CONTINUE_NEEDED) { - gss_release_buffer(&min, &input); - /* output and input are inverted here, this is intentional */ - maj = gss_init_sec_context(&min, user_cred, &user_ctx, server, - GSS_C_NO_OID, init_flags, 300, - GSS_C_NO_CHANNEL_BINDINGS, &output, - NULL, &input, NULL, NULL); - if (GSS_ERROR(maj)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, - "%s", mag_error(req, "gss_init_sec_context() " - "failed", maj, min)); - goto done; - } - gss_release_buffer(&min, &output); - maj = gss_accept_sec_context(&min, pctx, acquired_cred, - &input, GSS_C_NO_CHANNEL_BINDINGS, - &client, &mech_type, &output, &flags, - &vtime, &delegated_cred); - if (GSS_ERROR(maj)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, - "%s", mag_error(req, "gss_accept_sec_context()" - " failed", maj, min)); - goto done; - } - } } else if (maj == GSS_S_CONTINUE_NEEDED) { if (!mc) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, "Mechanism needs continuation but neither " "GssapiConnectionBound nor " "GssapiUseSessions are available"); - gss_delete_sec_context(&min, pctx, GSS_C_NO_BUFFER); gss_release_buffer(&min, &output); output.length = 0; } @@ -515,18 +740,22 @@ static int mag_auth(request_rec *req) goto done; } +complete: /* Always set the GSS name in an env var */ maj = gss_display_name(&min, client, &name, NULL); if (GSS_ERROR(maj)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, "%s", + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, "%s", mag_error(req, "gss_display_name() failed", maj, min)); goto done; } clientname = apr_pstrndup(req->pool, name.value, name.length); apr_table_set(req->subprocess_env, "GSS_NAME", clientname); + expiration = time(NULL) + vtime; + apr_table_set(req->subprocess_env, "GSS_SESSION_EXPIRATION", + apr_psprintf(req->pool, "%ld", (long)expiration)); -#ifdef HAVE_GSS_STORE_CRED_INTO +#ifdef HAVE_CRED_STORE if (cfg->deleg_ccache_dir && delegated_cred != GSS_C_NO_CREDENTIAL) { char *ccachefile = NULL; @@ -534,7 +763,11 @@ static int mag_auth(request_rec *req) delegated_cred, &ccachefile); if (ccachefile) { - apr_table_set(req->subprocess_env, "KRB5CCNAME", ccachefile); + mag_set_KRB5CCANME(req, ccachefile); + } + + if (mc) { + mc->delegated = true; } } #endif @@ -542,7 +775,7 @@ static int mag_auth(request_rec *req) if (cfg->map_to_local) { maj = gss_localname(&min, client, mech_type, &lname); if (maj != GSS_S_COMPLETE) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, "%s", + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, "%s", mag_error(req, "gss_localname() failed", maj, min)); goto done; } @@ -552,34 +785,45 @@ static int mag_auth(request_rec *req) } if (mc) { - mc->user_name = apr_pstrdup(mc->parent, req->user); - mc->gss_name = apr_pstrdup(mc->parent, clientname); + mc->user_name = apr_pstrdup(mc->pool, req->user); + mc->gss_name = apr_pstrdup(mc->pool, clientname); mc->established = true; if (vtime == GSS_C_INDEFINITE || vtime < MIN_SESS_EXP_TIME) { vtime = MIN_SESS_EXP_TIME; } - mc->expiration = time(NULL) + vtime; + mc->expiration = expiration; + mc->auth_type = auth_type; + if (auth_type == AUTH_TYPE_BASIC) { + mag_basic_cache(cfg, mc, ba_user, ba_pwd); + } if (cfg->use_sessions) { mag_attempt_session(req, cfg, mc); } - mc->auth_type = auth_type; } + if (cfg->send_persist) + apr_table_set(req->headers_out, "Persistent-Auth", + cfg->gss_conn_ctx ? "true" : "false"); + ret = OK; done: - if ((!is_basic) && (output.length != 0)) { + 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; - reply = apr_pcalloc(req->pool, 10 + replen); + reply = apr_pcalloc(req->pool, prefixlen + replen); if (reply) { - memcpy(reply, "Negotiate ", 10); - apr_base64_encode(&reply[10], output.value, output.length); + 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); } } else if (ret == HTTP_UNAUTHORIZED) { - apr_table_add(req->err_headers_out, - "WWW-Authenticate", "Negotiate"); + 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"); + } if (cfg->use_basic_auth) { apr_table_add(req->err_headers_out, "WWW-Authenticate", @@ -587,24 +831,13 @@ done: ap_auth_name(req))); } } -#ifdef HAVE_GSS_KRB5_CCACHE_NAME - if (user_ccache != NULL) { - maj = gss_krb5_ccache_name(&min, orig_ccache, NULL); - if (maj != GSS_S_COMPLETE) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, - "Failed to restore per-thread ccache, %s", - mag_error(req, "gss_krb5_ccache_name() " - "failed", maj, min)); - } - } -#endif - gss_delete_sec_context(&min, &user_ctx, &output); - gss_release_cred(&min, &user_cred); + 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); gss_release_cred(&min, &delegated_cred); gss_release_buffer(&min, &output); gss_release_name(&min, &client); - gss_release_name(&min, &server); gss_release_buffer(&min, &name); gss_release_buffer(&min, &lname); return ret; @@ -616,7 +849,6 @@ static void *mag_create_dir_config(apr_pool_t *p, char *dir) struct mag_config *cfg; cfg = (struct mag_config *)apr_pcalloc(p, sizeof(struct mag_config)); - if (!cfg) return NULL; cfg->pool = p; return cfg; @@ -643,6 +875,13 @@ static const char *mag_conn_ctx(cmd_parms *parms, void *mconfig, int on) return NULL; } +static const char *mag_send_persist(cmd_parms *parms, void *mconfig, int on) +{ + struct mag_config *cfg = (struct mag_config *)mconfig; + cfg->send_persist = on ? true : false; + return NULL; +} + static const char *mag_use_sess(cmd_parms *parms, void *mconfig, int on) { struct mag_config *cfg = (struct mag_config *)mconfig; @@ -650,6 +889,7 @@ static const char *mag_use_sess(cmd_parms *parms, void *mconfig, int on) return NULL; } +#ifdef HAVE_CRED_STORE static const char *mag_use_s4u2p(cmd_parms *parms, void *mconfig, int on) { struct mag_config *cfg = (struct mag_config *)mconfig; @@ -657,25 +897,22 @@ static const char *mag_use_s4u2p(cmd_parms *parms, void *mconfig, int on) if (cfg->deleg_ccache_dir == NULL) { cfg->deleg_ccache_dir = apr_pstrdup(parms->pool, "/tmp"); - if (!cfg->deleg_ccache_dir) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, - parms->server, "%s", "OOM setting deleg_ccache_dir."); - } } return NULL; } +#endif static const char *mag_sess_key(cmd_parms *parms, void *mconfig, const char *w) { struct mag_config *cfg = (struct mag_config *)mconfig; - struct databuf key; + struct databuf keys; unsigned char *val; apr_status_t rc; const char *k; int l; if (strncmp(w, "key:", 4) != 0) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, parms->server, "Invalid key format, expected prefix 'key:'"); return NULL; } @@ -683,29 +920,26 @@ static const char *mag_sess_key(cmd_parms *parms, void *mconfig, const char *w) l = apr_base64_decode_len(k); val = apr_palloc(parms->temp_pool, l); - if (!val) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server, - "Failed to get memory to decode key"); - return NULL; - } - key.length = (int)apr_base64_decode_binary(val, k); - key.value = (unsigned char *)val; + keys.length = (int)apr_base64_decode_binary(val, k); + keys.value = (unsigned char *)val; - if (key.length < 32) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server, - "Invalid key length, expected >=32 got %d", key.length); + if (keys.length != 32) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, parms->server, + "Invalid key length, expected 32 got %d", keys.length); return NULL; } - rc = SEAL_KEY_CREATE(cfg->pool, &cfg->mag_skey, &key); + rc = SEAL_KEY_CREATE(cfg->pool, &cfg->mag_skey, &keys); if (rc != OK) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, parms->server, "Failed to import sealing key!"); } return NULL; } +#ifdef HAVE_CRED_STORE + #define MAX_CRED_OPTIONS 10 static const char *mag_cred_store(cmd_parms *parms, void *mconfig, @@ -721,40 +955,26 @@ static const char *mag_cred_store(cmd_parms *parms, void *mconfig, p = strchr(w, ':'); if (!p) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, parms->server, "%s [%s]", "Invalid syntax for GssapiCredStore option", w); return NULL; } key = apr_pstrndup(parms->pool, w, (p-w)); value = apr_pstrdup(parms->pool, p + 1); - if (!key || !value) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server, - "%s", "OOM handling GssapiCredStore option"); - return NULL; - } if (!cfg->cred_store) { cfg->cred_store = apr_pcalloc(parms->pool, sizeof(gss_key_value_set_desc)); - if (!cfg->cred_store) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server, - "%s", "OOM handling GssapiCredStore option"); - return NULL; - } size = sizeof(gss_key_value_element_desc) * MAX_CRED_OPTIONS; cfg->cred_store->elements = apr_palloc(parms->pool, size); - if (!cfg->cred_store->elements) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server, - "%s", "OOM handling GssapiCredStore option"); - } } elements = cfg->cred_store->elements; count = cfg->cred_store->count; if (count >= MAX_CRED_OPTIONS) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, parms->server, "Too many GssapiCredStore options (MAX: %d)", MAX_CRED_OPTIONS); return NULL; @@ -773,13 +993,10 @@ static const char *mag_deleg_ccache_dir(cmd_parms *parms, void *mconfig, struct mag_config *cfg = (struct mag_config *)mconfig; cfg->deleg_ccache_dir = apr_pstrdup(parms->pool, value); - if (!cfg->deleg_ccache_dir) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server, - "%s", "OOM handling GssapiDelegCcacheDir option"); - } return NULL; } +#endif static const char *mag_use_basic_auth(cmd_parms *parms, void *mconfig, int on) { @@ -789,6 +1006,49 @@ static const char *mag_use_basic_auth(cmd_parms *parms, void *mconfig, int on) return NULL; } +#define MAX_ALLOWED_MECHS 10 + +static const char *mag_allow_mech(cmd_parms *parms, void *mconfig, + const char *w) +{ + struct mag_config *cfg = (struct mag_config *)mconfig; + gss_const_OID oid; + size_t size; + + if (!cfg->allowed_mechs) { + cfg->allowed_mechs = apr_pcalloc(parms->pool, + sizeof(gss_OID_set_desc)); + size = sizeof(gss_OID) * MAX_ALLOWED_MECHS; + cfg->allowed_mechs->elements = apr_palloc(parms->pool, size); + + cfg->allowed_mechs->elements[0] = gss_mech_spnego; + cfg->allowed_mechs->count++; + } + + if (strcmp(w, "krb5") == 0) { + oid = gss_mech_krb5; + } else if (strcmp(w, "iakerb") == 0) { + oid = gss_mech_iakerb; + } else if (strcmp(w, "ntlmssp") == 0) { + oid = &gss_mech_ntlmssp; + } else { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, parms->server, + "Unrecognized GSSAPI Mechanism: %s", w); + return NULL; + } + + if (cfg->allowed_mechs->count >= MAX_ALLOWED_MECHS) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, parms->server, + "Too many GssapiAllowedMech options (MAX: %d)", + MAX_ALLOWED_MECHS); + return NULL; + } + cfg->allowed_mechs->elements[cfg->allowed_mechs->count] = *oid; + cfg->allowed_mechs->count++; + + return NULL; +} + static const command_rec mag_commands[] = { AP_INIT_FLAG("GssapiSSLonly", mag_ssl_only, NULL, OR_AUTHCFG, "Work only if connection is SSL Secured"), @@ -796,15 +1056,15 @@ static const command_rec mag_commands[] = { "Translate principals to local names"), AP_INIT_FLAG("GssapiConnectionBound", mag_conn_ctx, NULL, OR_AUTHCFG, "Authentication is bound to the TCP connection"), + AP_INIT_FLAG("GssapiSignalPersistentAuth", mag_send_persist, NULL, OR_AUTHCFG, + "Send Persitent-Auth header according to connection bound"), AP_INIT_FLAG("GssapiUseSessions", mag_use_sess, NULL, OR_AUTHCFG, "Authentication uses mod_sessions to hold status"), AP_INIT_RAW_ARGS("GssapiSessionKey", mag_sess_key, NULL, OR_AUTHCFG, "Key Used to seal session data."), -#ifdef HAVE_GSS_ACQUIRE_CRED_FROM +#ifdef HAVE_CRED_STORE AP_INIT_FLAG("GssapiUseS4U2Proxy", mag_use_s4u2p, NULL, OR_AUTHCFG, "Initializes credentials for s4u2proxy usage"), -#endif -#ifdef HAVE_GSS_STORE_CRED_INTO AP_INIT_ITERATE("GssapiCredStore", mag_cred_store, NULL, OR_AUTHCFG, "Credential Store"), AP_INIT_RAW_ARGS("GssapiDelegCcacheDir", mag_deleg_ccache_dir, NULL, @@ -814,6 +1074,8 @@ static const command_rec mag_commands[] = { AP_INIT_FLAG("GssapiBasicAuth", mag_use_basic_auth, NULL, OR_AUTHCFG, "Allows use of Basic Auth for authentication"), #endif + AP_INIT_ITERATE("GssapiAllowedMech", mag_allow_mech, NULL, OR_AUTHCFG, + "Allowed Mechanisms"), { NULL } };