{
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) {
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);
+ 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)) {
maj, min));
}
- *ccachefile = value;
+ *ccachefile = ccname;
}
#endif
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 int mag_auth(request_rec *req)
{
const char *type;
}
/* 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
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) {
+ if (mc) {
+ if (mc->established && !auth_header) {
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, req,
"Already established context found!");
- 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);
+ mag_set_req_data(req, cfg, mc);
ret = OK;
goto done;
}
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 (mc && mc->established && auth_type != AUTH_TYPE_BASIC) {
+ /* 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);
+ }
+
switch (auth_type) {
case AUTH_TYPE_NEGOTIATE:
if (!parse_auth_header(req->pool, &auth_header, &input)) {
}
ba_user.length = strlen(ba_user.value);
ba_pwd.length = strlen(ba_pwd.value);
+
+ if (mc && mc->established) {
+ if (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;
+ } else {
+ mag_conn_clear(mc);
+ }
+ }
+
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,
"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;
}
delegated_cred, &ccachefile);
if (ccachefile) {
- apr_table_set(req->subprocess_env, "KRB5CCNAME", ccachefile);
+ mag_set_KRB5CCANME(req, ccachefile);
+ }
+
+ if (mc) {
+ mc->delegated = true;
}
}
#endif
}
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 = 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)
}
}
#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);
projects / mod_auth_gssapi.git / blobdiff