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);
}
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;
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 lenght, 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!");