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;
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 {
- struct mag_server_config *scfg;
- /* Try to fetch the default set if not explicitly configured */
- scfg = ap_get_module_config(req->server->module_config,
- &auth_gssapi_module);
- desired_mechs = scfg->default_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) {
}
/* 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 &&
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);
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
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;
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");
+ 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, "WWW-Authenticate", "NTLM");
+ 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)));
}
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
{
struct mag_server_config *scfg;
uint32_t maj, min;
+ apr_status_t rc;
scfg = apr_pcalloc(p, sizeof(struct mag_server_config));
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;
}
projects / mod_auth_gssapi.git / blobdiff