Drop OOM handling.

[mod_auth_gssapi.git] / src / mod_auth_gssapi.c

diff --git a/src/mod_auth_gssapi.c b/src/mod_auth_gssapi.c
index db33853..5b69420 100644 (file)
--- a/src/mod_auth_gssapi.c
+++ b/src/mod_auth_gssapi.c
@@ -30,8 +30,6 @@ module AP_MODULE_DECLARE_DATA auth_gssapi_module;
 
 APLOG_USE_MODULE(auth_gssapi);
 
-APR_DECLARE_OPTIONAL_FN(int, ssl_is_https, (conn_rec *));
-
 static char *mag_status(request_rec *req, int type, uint32_t err)
 {
     uint32_t maj_ret, min_ret;
@@ -91,7 +89,6 @@ static int mag_pre_connection(conn_rec *c, void *csd)
     struct mag_conn *mc;
 
     mc = apr_pcalloc(c->pool, sizeof(struct mag_conn));
-    if (!mc) return DECLINED;
 
     mc->parent = c->pool;
     ap_set_module_config(c->conn_config, &auth_gssapi_module, (void*)mc);
@@ -128,7 +125,6 @@ static char *escape(apr_pool_t *pool, const char *name,
     char *p;
 
     namecopy = apr_pstrdup(pool, name);
-    if (!namecopy) goto done;
 
     p = strchr(namecopy, find);
     if (!p) return namecopy;
@@ -143,7 +139,6 @@ static char *escape(apr_pool_t *pool, const char *name,
         } else {
             escaped = apr_pstrcat(pool, n, replace, NULL);
         }
-        if (!escaped) goto done;
         /* move to next segment */
         n = p + 1;
         p = strchr(n, find);
@@ -153,11 +148,6 @@ static char *escape(apr_pool_t *pool, const char *name,
         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;
 }
 
@@ -182,11 +172,6 @@ static void mag_store_deleg_creds(request_rec *req,
     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");
-        return;
-    }
 
     element.key = "ccache";
     element.value = value;
@@ -240,6 +225,7 @@ static int mag_auth(request_rec *req)
     const char *orig_ccache = NULL;
 #endif
     uint32_t init_flags = 0;
+    time_t expiration;
 
     type = ap_auth_type(req);
     if ((type == NULL) || (strcasecmp(type, "GSSAPI") != 0)) {
@@ -312,6 +298,9 @@ static int mag_auth(request_rec *req)
             ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 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, mc->auth_type);
             req->user = apr_pstrdup(req->pool, mc->user_name);
             ret = OK;
@@ -525,6 +514,9 @@ static int mag_auth(request_rec *req)
     }
     clientname = apr_pstrndup(req->pool, name.value, name.length);
     apr_table_set(req->subprocess_env, "GSS_NAME", clientname);
+    expiration = time(NULL) + vtime;
+    apr_table_set(req->subprocess_env, "GSS_SESSION_EXPIRATION",
+                  apr_psprintf(req->pool, "%ld", (long)expiration));
 
 #ifdef HAVE_GSS_STORE_CRED_INTO
     if (cfg->deleg_ccache_dir && delegated_cred != GSS_C_NO_CREDENTIAL) {
@@ -558,13 +550,17 @@ static int mag_auth(request_rec *req)
         if (vtime == GSS_C_INDEFINITE || vtime < MIN_SESS_EXP_TIME) {
             vtime = MIN_SESS_EXP_TIME;
         }
-        mc->expiration = time(NULL) + vtime;
+        mc->expiration = expiration;
         if (cfg->use_sessions) {
             mag_attempt_session(req, cfg, mc);
         }
         mc->auth_type = auth_type;
     }
 
+    if (cfg->send_persist)
+        apr_table_set(req->headers_out, "Persistent-Auth",
+            cfg->gss_conn_ctx ? "true" : "false");
+
     ret = OK;
 
 done:
@@ -616,7 +612,6 @@ static void *mag_create_dir_config(apr_pool_t *p, char *dir)
     struct mag_config *cfg;
 
     cfg = (struct mag_config *)apr_pcalloc(p, sizeof(struct mag_config));
-    if (!cfg) return NULL;
     cfg->pool = p;
 
     return cfg;
@@ -643,6 +638,13 @@ static const char *mag_conn_ctx(cmd_parms *parms, void *mconfig, int on)
     return NULL;
 }
 
+static const char *mag_send_persist(cmd_parms *parms, void *mconfig, int on)
+{
+    struct mag_config *cfg = (struct mag_config *)mconfig;
+    cfg->send_persist = on ? true : false;
+    return NULL;
+}
+
 static const char *mag_use_sess(cmd_parms *parms, void *mconfig, int on)
 {
     struct mag_config *cfg = (struct mag_config *)mconfig;
@@ -657,10 +659,6 @@ static const char *mag_use_s4u2p(cmd_parms *parms, void *mconfig, int on)
 
     if (cfg->deleg_ccache_dir == NULL) {
         cfg->deleg_ccache_dir = apr_pstrdup(parms->pool, "/tmp");
-        if (!cfg->deleg_ccache_dir) {
-            ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0,
-                         parms->server, "%s", "OOM setting deleg_ccache_dir.");
-        }
     }
     return NULL;
 }
@@ -683,11 +681,6 @@ static const char *mag_sess_key(cmd_parms *parms, void *mconfig, const char *w)
 
     l = apr_base64_decode_len(k);
     val = apr_palloc(parms->temp_pool, l);
-    if (!val) {
-        ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server,
-                     "Failed to get memory to decode key");
-        return NULL;
-    }
 
     keys.length = (int)apr_base64_decode_binary(val, k);
     keys.value = (unsigned char *)val;
@@ -728,26 +721,12 @@ static const char *mag_cred_store(cmd_parms *parms, void *mconfig,
 
     key = apr_pstrndup(parms->pool, w, (p-w));
     value = apr_pstrdup(parms->pool, p + 1);
-    if (!key || !value) {
-        ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server,
-                     "%s", "OOM handling GssapiCredStore option");
-        return NULL;
-    }
 
     if (!cfg->cred_store) {
         cfg->cred_store = apr_pcalloc(parms->pool,
                                       sizeof(gss_key_value_set_desc));
-        if (!cfg->cred_store) {
-            ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server,
-                         "%s", "OOM handling GssapiCredStore option");
-            return NULL;
-        }
         size = sizeof(gss_key_value_element_desc) * MAX_CRED_OPTIONS;
         cfg->cred_store->elements = apr_palloc(parms->pool, size);
-        if (!cfg->cred_store->elements) {
-            ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server,
-                         "%s", "OOM handling GssapiCredStore option");
-        }
     }
 
     elements = cfg->cred_store->elements;
@@ -773,10 +752,6 @@ static const char *mag_deleg_ccache_dir(cmd_parms *parms, void *mconfig,
     struct mag_config *cfg = (struct mag_config *)mconfig;
 
     cfg->deleg_ccache_dir = apr_pstrdup(parms->pool, value);
-    if (!cfg->deleg_ccache_dir) {
-        ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server,
-                     "%s", "OOM handling GssapiDelegCcacheDir option");
-    }
 
     return NULL;
 }
@@ -796,6 +771,8 @@ static const command_rec mag_commands[] = {
                   "Translate principals to local names"),
     AP_INIT_FLAG("GssapiConnectionBound", mag_conn_ctx, NULL, OR_AUTHCFG,
                   "Authentication is bound to the TCP connection"),
+    AP_INIT_FLAG("GssapiSignalPersistentAuth", mag_send_persist, NULL, OR_AUTHCFG,
+                  "Send Persitent-Auth header according to connection bound"),
     AP_INIT_FLAG("GssapiUseSessions", mag_use_sess, NULL, OR_AUTHCFG,
                   "Authentication uses mod_sessions to hold status"),
     AP_INIT_RAW_ARGS("GssapiSessionKey", mag_sess_key, NULL, OR_AUTHCFG,