return false;
}
+static char *escape(apr_pool_t *pool, const char *name,
+ char find, const char *replace)
+{
+ char *escaped = NULL;
+ char *namecopy;
+ char *n;
+ char *p;
+
+ namecopy = apr_pstrdup(pool, name);
+ if (!namecopy) goto done;
+
+ p = strchr(namecopy, find);
+ if (!p) return namecopy;
+
+ /* first segment */
+ n = namecopy;
+ while (p) {
+ /* terminate previous segment */
+ *p = '\0';
+ if (escaped) {
+ escaped = apr_pstrcat(pool, escaped, n, replace, NULL);
+ } else {
+ escaped = apr_pstrcat(pool, n, replace, NULL);
+ }
+ if (!escaped) goto done;
+ /* move to next segment */
+ n = p + 1;
+ p = strchr(n, find);
+ }
+ /* append last segment if any */
+ if (*n) {
+ 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,
gss_key_value_set_desc store;
char *value;
uint32_t maj, min;
-
- value = apr_psprintf(req->pool, "FILE:%s/%s", dir, clientname);
+ 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;
+ /* 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");
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;
type = ap_auth_type(req);
if ((type == NULL) || (strcasecmp(type, "GSSAPI") != 0)) {
return DECLINED;
}
- /* ignore auth for subrequests */
+ cfg = ap_get_module_config(req->per_dir_config, &auth_gssapi_module);
+
+ /* implicit auth for subrequests if main auth already happened */
if (!ap_is_initial_req(req)) {
- return OK;
+ 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,
+ req, "Subrequest authentication bypass on "
+ "location with different configuration!");
+ }
+ if (req->main->user) {
+ req->user = apr_pstrdup(req->pool, req->main->user);
+ return OK;
+ } else {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 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,
+ "Subrequest GSSAPI auth with no auth on the main "
+ "request. This operation may fail if other "
+ "subrequests already established a context or the "
+ "mechanism requires multiple roundtrips.");
+ }
}
- cfg = ap_get_module_config(req->per_dir_config, &auth_gssapi_module);
-
if (cfg->ssl_only) {
if (!mag_conn_is_https(req->connection)) {
ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req,
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) {
+ } else if ((strcasecmp(auth_header_type, "Basic") == 0) &&
+ (cfg->use_basic_auth == true)) {
auth_type = "Basic";
is_basic = true;
gss_buffer_desc ba_user;
gss_buffer_desc ba_pwd;
- switch (cfg->basic_auth) {
- case BA_ON:
- /* handle directly */
- break;
- case BA_FORWARD:
- /* decline to handle ourselves, let other modules do it */
- ret = DECLINED;
- goto done;
- case BA_OFF:
- goto done;
- default:
- goto done;
- }
ba_pwd.value = ap_pbase64decode(req->pool, auth_header);
if (!ba_pwd.value) goto done;
ba_user.value = ap_getword_nulls_nc(req->pool,
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");
+ 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));
+ goto done;
+ }
+#endif
maj = gss_acquire_cred_with_password(&min, client, &ba_pwd,
GSS_C_INDEFINITE,
GSS_C_NO_OID_SET,
"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;
+ }
+
/* output and input are inverted here, this is intentional */
maj = gss_init_sec_context(&min, user_cred, &user_ctx, server,
- GSS_C_NO_OID, 0, 300,
+ GSS_C_NO_OID, init_flags, 300,
GSS_C_NO_CHANNEL_BINDINGS, &output,
NULL, &input, NULL, NULL);
if (GSS_ERROR(maj)) {
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, 0, 300,
+ GSS_C_NO_OID, init_flags, 300,
GSS_C_NO_CHANNEL_BINDINGS, &output,
NULL, &input, NULL, NULL);
if (GSS_ERROR(maj)) {
} else {
apr_table_add(req->err_headers_out,
"WWW-Authenticate", "Negotiate");
- if (cfg->basic_auth != BA_OFF) {
+ if (cfg->use_basic_auth) {
apr_table_add(req->err_headers_out,
"WWW-Authenticate",
apr_psprintf(req->pool, "Basic realm=\"%s\"",
}
}
}
+#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_cred(&min, &acquired_cred);
static const char *mag_sess_key(cmd_parms *parms, void *mconfig, const char *w)
{
struct mag_config *cfg = (struct mag_config *)mconfig;
- struct databuf keys;
+ struct databuf key;
unsigned char *val;
apr_status_t rc;
const char *k;
return NULL;
}
- keys.length = (int)apr_base64_decode_binary(val, k);
- keys.value = (unsigned char *)val;
+ key.length = (int)apr_base64_decode_binary(val, k);
+ key.value = (unsigned char *)val;
- if (keys.length != 32) {
+ if (key.length < 32) {
ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server,
- "Invalid key lenght, expected 32 got %d", keys.length);
+ "Invalid key length, expected >=32 got %d", key.length);
return NULL;
}
- rc = SEAL_KEY_CREATE(cfg->pool, &cfg->mag_skey, &keys);
+ rc = SEAL_KEY_CREATE(cfg->pool, &cfg->mag_skey, &key);
if (rc != OK) {
ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server,
"Failed to import sealing key!");
return NULL;
}
-static const char *mag_use_basic_auth(cmd_parms *parms, void *mconfig,
- const char *value)
+static const char *mag_use_basic_auth(cmd_parms *parms, void *mconfig, int on)
{
struct mag_config *cfg = (struct mag_config *)mconfig;
- if (strcasecmp(value, "on") == 0) {
- cfg->basic_auth = BA_ON;
- } else if (strcasecmp(value, "forward") == 0) {
- cfg->basic_auth = BA_FORWARD;
- } else {
- cfg->basic_auth = BA_OFF;
- }
-
+ cfg->use_basic_auth = on ? true : false;
return NULL;
}
OR_AUTHCFG, "Directory to store delegated credentials"),
#endif
#ifdef HAVE_GSS_ACQUIRE_CRED_WITH_PASSWORD
- AP_INIT_TAKE1("GssapiBasicAuth", mag_use_basic_auth, NULL, OR_AUTHCFG,
+ AP_INIT_FLAG("GssapiBasicAuth", mag_use_basic_auth, NULL, OR_AUTHCFG,
"Allows use of Basic Auth for authentication"),
#endif
{ NULL }