Add GssapiAllowedMech option
[mod_auth_gssapi.git] / src / mod_auth_gssapi.c
index cab15a7..7751361 100644 (file)
 
 #include "mod_auth_gssapi.h"
 
+const gss_OID_desc gss_mech_ntlmssp = {
+    GSS_NTLMSSP_OID_LENGTH, GSS_NTLMSSP_OID_STRING
+};
+
 #define MOD_AUTH_GSSAPI_VERSION PACKAGE_NAME "/" PACKAGE_VERSION
 
 module AP_MODULE_DECLARE_DATA auth_gssapi_module;
@@ -116,6 +120,36 @@ static bool mag_conn_is_https(conn_rec *c)
     return false;
 }
 
+static bool mag_acquire_creds(request_rec *req,
+                              struct mag_config *cfg,
+                              gss_OID_set desired_mechs,
+                              gss_cred_usage_t cred_usage,
+                              gss_cred_id_t *creds)
+{
+    uint32_t maj, min;
+#ifdef HAVE_CRED_STORE
+    gss_const_key_value_set_t store = cfg->cred_store;
+
+    maj = gss_acquire_cred_from(&min, GSS_C_NO_NAME, GSS_C_INDEFINITE,
+                                desired_mechs, cred_usage, store, creds,
+                                NULL, NULL);
+#else
+    maj = gss_acquire_cred(&min, GSS_C_NO_NAME, GSS_C_INDEFINITE,
+                           desired_mechs, cred_usage, creds, NULL, NULL);
+#endif
+
+    if (GSS_ERROR(maj)) {
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, "%s",
+                      mag_error(req, "gss_acquire_cred[_from]() "
+                                "failed to get server creds",
+                                maj, min));
+        return false;
+    }
+
+    return true;
+}
+
+#ifdef HAVE_CRED_STORE
 static char *escape(apr_pool_t *pool, const char *name,
                     char find, const char *replace)
 {
@@ -188,6 +222,7 @@ static void mag_store_deleg_creds(request_rec *req,
 
     *ccachefile = value;
 }
+#endif
 
 static int mag_auth(request_rec *req)
 {
@@ -380,7 +415,7 @@ static int mag_auth(request_rec *req)
 #endif
         maj = gss_acquire_cred_with_password(&min, client, &ba_pwd,
                                              GSS_C_INDEFINITE,
-                                             GSS_C_NO_OID_SET,
+                                             cfg->allowed_mechs,
                                              GSS_C_INITIATE,
                                              &user_cred, NULL, NULL);
         if (GSS_ERROR(maj)) {
@@ -397,62 +432,24 @@ static int mag_auth(request_rec *req)
 
     req->ap_auth_type = apr_pstrdup(req->pool, auth_type);
 
-#ifdef HAVE_GSS_ACQUIRE_CRED_FROM
+#ifdef HAVE_CRED_STORE
     if (cfg->use_s4u2proxy) {
         cred_usage = GSS_C_BOTH;
     }
-    if (cfg->cred_store) {
-        maj = gss_acquire_cred_from(&min, GSS_C_NO_NAME, GSS_C_INDEFINITE,
-                                    GSS_C_NO_OID_SET, cred_usage,
-                                    cfg->cred_store, &acquired_cred,
-                                    NULL, NULL);
-        if (GSS_ERROR(maj)) {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, "%s",
-                          mag_error(req, "gss_acquire_cred_from() failed",
-                                    maj, min));
-            goto done;
-        }
-    }
 #endif
+    if (!mag_acquire_creds(req, cfg, GSS_C_NO_OID_SET,
+                           cred_usage, &acquired_cred)) {
+        goto done;
+    }
 
     if (is_basic) {
-        if (!acquired_cred) {
-            /* Try to acquire default creds */
-            maj = gss_acquire_cred(&min, GSS_C_NO_NAME, GSS_C_INDEFINITE,
-                                   GSS_C_NO_OID_SET, cred_usage,
-                                   &acquired_cred, NULL, NULL);
-            if (GSS_ERROR(maj)) {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req,
-                              "%s", mag_error(req, "gss_acquire_cred()"
-                                              " failed", maj, min));
-                goto done;
-            }
-        }
         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
              * need to acquire a different set of credential setting
              * GSS_C_ACCEPT explicitly */
-#ifdef HAVE_GSS_ACQUIRE_CRED_FROM
-            if (cfg->cred_store) {
-                maj = gss_acquire_cred_from(&min, GSS_C_NO_NAME,
-                                            GSS_C_INDEFINITE, GSS_C_NO_OID_SET,
-                                            GSS_C_ACCEPT, cfg->cred_store,
-                                            &server_cred, NULL, NULL);
-            } else {
-#else
-            {
-#endif
-                /* Try to acquire default creds */
-                maj = gss_acquire_cred(&min, GSS_C_NO_NAME, GSS_C_INDEFINITE,
-                                       GSS_C_NO_OID_SET, GSS_C_ACCEPT,
-                                       &server_cred, NULL, NULL);
-            }
-            if (GSS_ERROR(maj)) {
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req, "%s",
-                              mag_error(req, "gss_acquire_cred[_from]() "
-                                        "failed to get server creds",
-                                        maj, min));
+            if (!mag_acquire_creds(req, cfg, GSS_C_NO_OID_SET,
+                                   GSS_C_ACCEPT, &server_cred)) {
                 goto done;
             }
         } else {
@@ -470,10 +467,12 @@ static int mag_auth(request_rec *req)
             gss_release_cred(&min, &server_cred);
         }
 
+#ifdef HAVE_CRED_STORE
         if (cfg->deleg_ccache_dir) {
             /* delegate ourselves credentials so we store them as requested */
             init_flags |= GSS_C_DELEG_FLAG;
         }
+#endif
 
         /* output and input are inverted here, this is intentional */
         maj = gss_init_sec_context(&min, user_cred, &user_ctx, server,
@@ -488,6 +487,16 @@ static int mag_auth(request_rec *req)
         }
     }
 
+    if (!is_basic && 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,
@@ -552,7 +561,7 @@ static int mag_auth(request_rec *req)
     apr_table_set(req->subprocess_env, "GSS_SESSION_EXPIRATION",
                   apr_psprintf(req->pool, "%ld", (long)expiration));
 
-#ifdef HAVE_GSS_STORE_CRED_INTO
+#ifdef HAVE_CRED_STORE
     if (cfg->deleg_ccache_dir && delegated_cred != GSS_C_NO_CREDENTIAL) {
         char *ccachefile = NULL;
 
@@ -686,6 +695,7 @@ static const char *mag_use_sess(cmd_parms *parms, void *mconfig, int on)
     return NULL;
 }
 
+#ifdef HAVE_CRED_STORE
 static const char *mag_use_s4u2p(cmd_parms *parms, void *mconfig, int on)
 {
     struct mag_config *cfg = (struct mag_config *)mconfig;
@@ -696,6 +706,7 @@ static const char *mag_use_s4u2p(cmd_parms *parms, void *mconfig, int on)
     }
     return NULL;
 }
+#endif
 
 static const char *mag_sess_key(cmd_parms *parms, void *mconfig, const char *w)
 {
@@ -733,6 +744,8 @@ static const char *mag_sess_key(cmd_parms *parms, void *mconfig, const char *w)
     return NULL;
 }
 
+#ifdef HAVE_CRED_STORE
+
 #define MAX_CRED_OPTIONS 10
 
 static const char *mag_cred_store(cmd_parms *parms, void *mconfig,
@@ -789,6 +802,7 @@ static const char *mag_deleg_ccache_dir(cmd_parms *parms, void *mconfig,
 
     return NULL;
 }
+#endif
 
 static const char *mag_use_basic_auth(cmd_parms *parms, void *mconfig, int on)
 {
@@ -798,6 +812,46 @@ static const char *mag_use_basic_auth(cmd_parms *parms, void *mconfig, int on)
     return NULL;
 }
 
+#define MAX_ALLOWED_MECHS 10
+
+static const char *mag_allow_mech(cmd_parms *parms, void *mconfig,
+                                  const char *w)
+{
+    struct mag_config *cfg = (struct mag_config *)mconfig;
+    gss_const_OID oid;
+    size_t size;
+
+    if (!cfg->allowed_mechs) {
+        cfg->allowed_mechs = apr_pcalloc(parms->pool,
+                                         sizeof(gss_OID_set_desc));
+        size = sizeof(gss_OID) * MAX_ALLOWED_MECHS;
+        cfg->allowed_mechs->elements = apr_palloc(parms->pool, size);
+    }
+
+    if (strcmp(w, "krb5") == 0) {
+        oid = gss_mech_krb5;
+    } else if (strcmp(w, "iakerb") == 0) {
+        oid = gss_mech_iakerb;
+    } else if (strcmp(w, "ntlmssp") == 0) {
+        oid = &gss_mech_ntlmssp;
+    } else {
+        ap_log_error(APLOG_MARK, APLOG_ERR, 0, parms->server,
+                     "Unrecognized GSSAPI Mechanism: %s", w);
+        return NULL;
+    }
+
+    if (cfg->allowed_mechs->count >= MAX_ALLOWED_MECHS) {
+        ap_log_error(APLOG_MARK, APLOG_ERR, 0, parms->server,
+                     "Too many GssapiAllowedMech options (MAX: %d)",
+                     MAX_ALLOWED_MECHS);
+        return NULL;
+    }
+    cfg->allowed_mechs->elements[cfg->allowed_mechs->count] = *oid;
+    cfg->allowed_mechs->count++;
+
+    return NULL;
+}
+
 static const command_rec mag_commands[] = {
     AP_INIT_FLAG("GssapiSSLonly", mag_ssl_only, NULL, OR_AUTHCFG,
                   "Work only if connection is SSL Secured"),
@@ -811,11 +865,9 @@ static const command_rec mag_commands[] = {
                   "Authentication uses mod_sessions to hold status"),
     AP_INIT_RAW_ARGS("GssapiSessionKey", mag_sess_key, NULL, OR_AUTHCFG,
                      "Key Used to seal session data."),
-#ifdef HAVE_GSS_ACQUIRE_CRED_FROM
+#ifdef HAVE_CRED_STORE
     AP_INIT_FLAG("GssapiUseS4U2Proxy", mag_use_s4u2p, NULL, OR_AUTHCFG,
                   "Initializes credentials for s4u2proxy usage"),
-#endif
-#ifdef HAVE_GSS_STORE_CRED_INTO
     AP_INIT_ITERATE("GssapiCredStore", mag_cred_store, NULL, OR_AUTHCFG,
                     "Credential Store"),
     AP_INIT_RAW_ARGS("GssapiDelegCcacheDir", mag_deleg_ccache_dir, NULL,
@@ -825,6 +877,8 @@ static const command_rec mag_commands[] = {
     AP_INIT_FLAG("GssapiBasicAuth", mag_use_basic_auth, NULL, OR_AUTHCFG,
                      "Allows use of Basic Auth for authentication"),
 #endif
+    AP_INIT_ITERATE("GssapiAllowedMech", mag_allow_mech, NULL, OR_AUTHCFG,
+                    "Allowed Mechanisms"),
     { NULL }
 };