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;
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);
char *p;
namecopy = apr_pstrdup(pool, name);
- if (!namecopy) goto done;
p = strchr(namecopy, find);
if (!p) return namecopy;
} else {
escaped = apr_pstrcat(pool, n, replace, NULL);
}
- if (!escaped) goto done;
/* move to next segment */
n = p + 1;
p = strchr(n, find);
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;
}
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;
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)) {
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;
}
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) {
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:
struct mag_config *cfg;
cfg = (struct mag_config *)apr_pcalloc(p, sizeof(struct mag_config));
- if (!cfg) return NULL;
cfg->pool = p;
return cfg;
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;
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;
}
static const char *mag_sess_key(cmd_parms *parms, void *mconfig, const char *w)
{
struct mag_config *cfg = (struct mag_config *)mconfig;
- struct databuf key;
+ struct databuf keys;
unsigned char *val;
apr_status_t rc;
const char *k;
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;
- }
- key.length = (int)apr_base64_decode_binary(val, k);
- key.value = (unsigned char *)val;
+ keys.length = (int)apr_base64_decode_binary(val, k);
+ keys.value = (unsigned char *)val;
- if (key.length < 32) {
+ if (keys.length != 32) {
ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server,
- "Invalid key length, expected >=32 got %d", key.length);
+ "Invalid key length, expected 32 got %d", keys.length);
return NULL;
}
- rc = SEAL_KEY_CREATE(cfg->pool, &cfg->mag_skey, &key);
+ rc = SEAL_KEY_CREATE(cfg->pool, &cfg->mag_skey, &keys);
if (rc != OK) {
ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server,
"Failed to import sealing key!");
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;
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;
}
"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,