projects
/
mod_auth_gssapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allocate new keys at server startup.
[mod_auth_gssapi.git]
/
src
/
mod_auth_gssapi.c
diff --git
a/src/mod_auth_gssapi.c
b/src/mod_auth_gssapi.c
index
d4e2682
..
6f185f9
100644
(file)
--- a/
src/mod_auth_gssapi.c
+++ b/
src/mod_auth_gssapi.c
@@
-621,21
+621,30
@@
done:
struct mag_req_cfg *mag_init_cfg(request_rec *req)
{
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));
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);
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 {
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;
}
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";
if (req->proxyreq == PROXYREQ_PROXY) {
req_cfg->req_proto = "Proxy-Authorization";
req_cfg->rep_proto = "Proxy-Authenticate";
@@
-743,7
+752,7
@@
static int mag_auth(request_rec *req)
/* if available, session always supersedes connection bound data */
if (req_cfg->use_sessions) {
/* 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);
}
auth_header = apr_table_get(req->headers_in, req_cfg->req_proto);
@@
-802,7
+811,7
@@
static int mag_auth(request_rec *req)
ba_pwd.length = strlen(ba_pwd.value);
if (mc && mc->established &&
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);
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, req,
"Already established BASIC AUTH context found!");
mag_set_req_data(req, cfg, mc);
@@
-947,10
+956,10
@@
complete:
mc->expiration = expiration;
mc->auth_type = auth_type;
if (auth_type == AUTH_TYPE_BASIC) {
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) {
}
if (req_cfg->use_sessions) {
- mag_attempt_session(req
,
cfg, mc);
+ mag_attempt_session(req
_
cfg, mc);
}
}
}
}
@@
-1265,6
+1274,7
@@
static void *mag_create_server_config(apr_pool_t *p, server_rec *s)
{
struct mag_server_config *scfg;
uint32_t maj, min;
{
struct mag_server_config *scfg;
uint32_t maj, min;
+ apr_status_t rc;
scfg = apr_pcalloc(p, sizeof(struct mag_server_config));
scfg = apr_pcalloc(p, sizeof(struct mag_server_config));
@@
-1278,6
+1288,12
@@
static void *mag_create_server_config(apr_pool_t *p, server_rec *s)
mag_oid_set_destroy, apr_pool_cleanup_null);
}
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;
}
return scfg;
}