6, "\x2b\x06\x01\x05\x05\x02"
};
-const gss_OID_desc gss_mech_ntlmssp = {
+#ifdef HAVE_GSSAPI_GSSAPI_NTLMSSP_H
+const gss_OID_desc gss_mech_ntlmssp_desc = {
GSS_NTLMSSP_OID_LENGTH, GSS_NTLMSSP_OID_STRING
};
+gss_const_OID gss_mech_ntlmssp = &gss_mech_ntlmssp_desc;
-const gss_OID_set_desc gss_mech_set_ntlmssp = {
- 1, discard_const(&gss_mech_ntlmssp)
+const gss_OID_set_desc gss_mech_set_ntlmssp_desc = {
+ 1, discard_const(&gss_mech_ntlmssp_desc)
};
+gss_const_OID_set gss_mech_set_ntlmssp = &gss_mech_set_ntlmssp_desc;
+
+#else
+gss_OID gss_mech_ntlmssp = GSS_C_NO_OID;
+gss_OID_set gss_mech_set_ntlmssp = GSS_C_NO_OID_SET;
+#endif
#define MOD_AUTH_GSSAPI_VERSION PACKAGE_NAME "/" PACKAGE_VERSION
return true;
}
-static bool is_mech_allowed(gss_OID_set allowed_mechs, gss_const_OID mech,
+static bool is_mech_allowed(gss_OID_set allowed_mechs, gss_const_OID mech,
bool multi_step_supported)
{
- if (!multi_step_supported && gss_oid_equal(&gss_mech_ntlmssp, mech))
+ if (mech == GSS_C_NO_OID) return false;
+
+ if (!multi_step_supported && gss_oid_equal(gss_mech_ntlmssp, mech))
return false;
if (allowed_mechs == GSS_C_NO_OID_SET) return true;
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 {
- 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);
+ /* 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";
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;
/* if available, session always supersedes connection bound data */
if (req_cfg->use_sessions) {
- mag_check_session(req, cfg, &mc);
+ mag_check_session(req_cfg, &mc);
}
auth_header = apr_table_get(req->headers_in, req_cfg->req_proto);
ba_user.value = ap_getword_nulls_nc(req->pool,
(char **)&ba_pwd.value, ':');
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, 0, req,
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);
break;
case AUTH_TYPE_RAW_NTLM:
- if (!is_mech_allowed(desired_mechs, &gss_mech_ntlmssp,
+ if (!is_mech_allowed(desired_mechs, gss_mech_ntlmssp,
cfg->gss_conn_ctx)) {
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, req,
"NTLM Authentication is not allowed!");
goto done;
}
- desired_mechs = discard_const(&gss_mech_set_ntlmssp);
+ desired_mechs = discard_const(gss_mech_set_ntlmssp);
break;
default:
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 (req_cfg->use_sessions) {
- mag_attempt_session(req, cfg, mc);
+ mag_attempt_session(req_cfg, mc);
}
}
} else if (ret == HTTP_UNAUTHORIZED) {
apr_table_add(req->err_headers_out, req_cfg->rep_proto, "Negotiate");
- if (is_mech_allowed(desired_mechs, &gss_mech_ntlmssp,
+ if (is_mech_allowed(desired_mechs, gss_mech_ntlmssp,
cfg->gss_conn_ctx)) {
apr_table_add(req->err_headers_out, req_cfg->rep_proto, "NTLM");
}
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
} else if (strcmp(w, "iakerb") == 0) {
oid = discard_const(gss_mech_iakerb);
} else if (strcmp(w, "ntlmssp") == 0) {
- oid = discard_const(&gss_mech_ntlmssp);
+ oid = discard_const(gss_mech_ntlmssp);
} else {
buf.value = discard_const(w);
buf.length = strlen(w);
{
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;
}