{
struct mag_conn *mc;
- mc = apr_pcalloc(c->pool, sizeof(struct mag_conn));
-
- 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;
}
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) {
auth_header = apr_table_get(req->headers_in, "Authorization");
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);
-
if (mc->established && !auth_header) {
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, req,
"Already established context found!");
mag_set_req_data(req, cfg, mc);
+ ret = OK;
+ goto done;
}
pctx = &mc->ctx;
} else {
goto done;
}
+ 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;
+ }
+
+ if (!parse_auth_header(req->pool, &auth_header, &input)) {
+ goto done;
+ }
+
+ desired_mechs = discard_const(&gss_mech_set_ntlmssp);
+ break;
+
+ default:
+ goto done;
+ }
+
+ 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_CRED_STORE
+ if (cfg->use_s4u2proxy) {
+ cred_usage = GSS_C_BOTH;
+ }
+#endif
+ if (!mag_acquire_creds(req, cfg, desired_mechs,
+ cred_usage, &acquired_cred, NULL)) {
+ goto done;
+ }
+
+ if (auth_type == AUTH_TYPE_BASIC) {
maj = gss_import_name(&min, &ba_user, GSS_C_NT_USER_NAME, &client);
if (GSS_ERROR(maj)) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req,
goto done;
}
gss_release_name(&min, &client);
- 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;
- }
-
- if (!parse_auth_header(req->pool, &auth_header, &input)) {
- goto done;
- }
-
- desired_mechs = discard_const(&gss_mech_set_ntlmssp);
- break;
-
- default:
- goto done;
- }
-
- req->ap_auth_type = apr_pstrdup(req->pool, auth_types[auth_type]);
-
-#ifdef HAVE_CRED_STORE
- if (cfg->use_s4u2proxy) {
- cred_usage = GSS_C_BOTH;
- }
-#endif
- if (!mag_acquire_creds(req, cfg, desired_mechs,
- cred_usage, &acquired_cred, NULL)) {
- goto done;
- }
-
- if (auth_type == AUTH_TYPE_BASIC) {
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
}
#endif
- /* 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;
- }
- }
-
- 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, 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,
- &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;
- }
- if (auth_type == AUTH_TYPE_BASIC) {
- while (maj == GSS_S_CONTINUE_NEEDED) {
- gss_release_buffer(&min, &input);
+ 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,
" failed", maj, min));
goto done;
}
+ gss_release_buffer(&min, &input);
+ } while (maj == GSS_S_CONTINUE_NEEDED);
+ gss_release_buffer(&min, &output);
+ goto complete;
+ }
+
+ 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, 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,
+ &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;
} else if (maj == GSS_S_CONTINUE_NEEDED) {
if (!mc) {
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;
}
goto done;
}
+complete:
/* Always set the GSS name in an env var */
maj = gss_display_name(&min, client, &name, NULL);
if (GSS_ERROR(maj)) {
}
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;
}
}
#endif
- gss_delete_sec_context(&min, &user_ctx, &output);
+ if (ctx != GSS_C_NO_CONTEXT)
+ gss_delete_sec_context(&min, &ctx, GSS_C_NO_BUFFER);
+ gss_delete_sec_context(&min, &user_ctx, GSS_C_NO_BUFFER);
gss_release_cred(&min, &user_cred);
gss_release_cred(&min, &acquired_cred);
gss_release_cred(&min, &delegated_cred);