module AP_MODULE_DECLARE_DATA auth_gssapi_module;
+APR_DECLARE_OPTIONAL_FN(int, ssl_is_https, (conn_rec *));
+
struct mag_config {
bool ssl_only;
bool map_to_local;
return apr_psprintf(req->pool, "%s: [%s (%s)]", msg, msg_maj, msg_min);
}
+static APR_OPTIONAL_FN_TYPE(ssl_is_https) *mag_is_https = NULL;
+
+static int mag_post_config(apr_pool_t *cfg, apr_pool_t *log,
+ apr_pool_t *temp, server_rec *s)
+{
+ /* FIXME: create mutex to deal with connections and contexts ? */
+ mag_is_https = APR_RETRIEVE_OPTIONAL_FN(ssl_is_https);
+
+ return OK;
+}
+
+
struct mag_conn {
+ apr_pool_t *parent;
gss_ctx_id_t ctx;
bool established;
char *user_name;
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);
return OK;
}
+static apr_status_t mag_conn_destroy(void *ptr)
+{
+ struct mag_conn *mc = (struct mag_conn *)ptr;
+ uint32_t min;
+
+ if (mc->ctx) {
+ (void)gss_delete_sec_context(&min, &mc->ctx, GSS_C_NO_BUFFER);
+ mc->established = false;
+ }
+ return APR_SUCCESS;
+}
+
+static bool mag_conn_is_https(conn_rec *c)
+{
+ if (mag_is_https) {
+ if (mag_is_https(c)) return true;
+ }
+
+ return false;
+}
+
static int mag_auth(request_rec *req)
{
const char *type;
char *auth_header_value;
int ret = HTTP_UNAUTHORIZED;
gss_ctx_id_t ctx = GSS_C_NO_CONTEXT;
+ gss_ctx_id_t *pctx;
gss_buffer_desc input = GSS_C_EMPTY_BUFFER;
gss_buffer_desc output = GSS_C_EMPTY_BUFFER;
gss_buffer_desc name = GSS_C_EMPTY_BUFFER;
cfg = ap_get_module_config(req->per_dir_config, &auth_gssapi_module);
if (cfg->ssl_only) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req,
- "FIXME: check for ssl!");
+ if (!mag_conn_is_https(req->connection)) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req,
+ "Not a TLS connection, refusing to authenticate!");
+ goto done;
+ }
}
if (cfg->gss_conn_ctx) {
req->user = apr_pstrdup(req->pool, mc->user_name);
ret = OK;
goto done;
- } else {
- ctx = mc->ctx;
}
+ pctx = &mc->ctx;
+ } else {
+ pctx = &ctx;
}
auth_header = apr_table_get(req->headers_in, "Authorization");
if (!input.value) goto done;
input.length = apr_base64_decode(input.value, auth_header_value);
- maj = gss_accept_sec_context(&min, &ctx, GSS_C_NO_CREDENTIAL,
+ maj = gss_accept_sec_context(&min, pctx, GSS_C_NO_CREDENTIAL,
&input, GSS_C_NO_CHANNEL_BINDINGS,
&client, &mech_type, &output, &flags, NULL,
&delegated_cred);
goto done;
}
- if (mc) {
- mc->ctx = ctx;
- ctx = GSS_C_NO_CONTEXT;
- }
+ /* register the context in the connection pool, so it can be freed
+ * when the connection is terminated */
+ apr_pool_userdata_set(mc, "mag_conn_ptr", mag_conn_destroy, mc->parent);
- if (maj == GSS_S_CONTINUE_NEEDED) goto done;
+ if (maj == GSS_S_CONTINUE_NEEDED) {
+ if (!cfg->gss_conn_ctx) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req,
+ "Mechanism needs continuation but "
+ "GssapiConnectionBound is off.");
+ gss_delete_sec_context(&min, pctx, GSS_C_NO_BUFFER);
+ gss_release_buffer(&min, &output);
+ output.length = 0;
+ }
+ goto done;
+ }
#ifdef HAVE_GSS_STORE_CRED_INTO
if (cfg->cred_store && delegated_cred != GSS_C_NO_CREDENTIAL) {
gss_key_value_set_desc store = {0, NULL};
- /* FIXME: run substtutions */
+ /* FIXME: run substitutions */
maj = gss_store_cred_into(&min, delegated_cred, GSS_C_INITIATE,
GSS_C_NULL_OID, 1, 1, &store, NULL, NULL);
}
if (mc) {
- mc->user_name = apr_pstrdup(req->connection->pool, req->user);
- mc->gss_name = apr_pstrdup(req->connection->pool, clientname);
+ mc->user_name = apr_pstrdup(mc->parent, req->user);
+ mc->gss_name = apr_pstrdup(mc->parent, clientname);
mc->established = true;
}
if (reply) {
memcpy(reply, "Negotiate ", 10);
apr_base64_encode(&reply[10], output.value, output.length);
- reply[replen] = '\0';
apr_table_add(req->err_headers_out,
"WWW-Authenticate", reply);
}
gss_release_buffer(&min, &output);
gss_release_name(&min, &client);
gss_release_buffer(&min, &name);
- gss_delete_sec_context(&min, &ctx, GSS_C_NO_BUFFER);
gss_release_buffer(&min, &lname);
return ret;
}
p = strchr(w, ':');
if (!p) {
ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server,
- "%s [%s]", "Invalid syntax for GSSCredStore option", w);
+ "%s [%s]", "Invalid syntax for GssapiCredStore option", w);
return NULL;
}
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 GSSCredStore option");
+ "%s", "OOM handling GssapiCredStore option");
return NULL;
}
elements = apr_palloc(parms->pool, size);
if (!elements) {
ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server,
- "%s", "OOM handling GSSCredStore option");
+ "%s", "OOM handling GssapiCredStore option");
return NULL;
}
}
static const command_rec mag_commands[] = {
- AP_INIT_FLAG("GSSSSLOnly", mag_ssl_only, NULL, OR_AUTHCFG,
+ AP_INIT_FLAG("GssapiSSLonly", mag_ssl_only, NULL, OR_AUTHCFG,
"Work only if connection is SSL Secured"),
- AP_INIT_FLAG("GSSLocalName", mag_map_to_local, NULL, OR_AUTHCFG,
+ AP_INIT_FLAG("GssapiLocalName", mag_map_to_local, NULL, OR_AUTHCFG,
"Work only if connection is SSL Secured"),
- AP_INIT_FLAG("GSSConnectionContext", mag_conn_ctx, NULL, OR_AUTHCFG,
- "Authentication is valid for the life of the connection"),
- AP_INIT_ITERATE("GSSCredStore", mag_cred_store, NULL, OR_AUTHCFG,
+ AP_INIT_FLAG("GssapiConnectionBound", mag_conn_ctx, NULL, OR_AUTHCFG,
+ "Authentication is bound to the TCP connection"),
+ AP_INIT_ITERATE("GssapiCredStore", mag_cred_store, NULL, OR_AUTHCFG,
"Credential Store"),
{ NULL }
};
mag_register_hooks(apr_pool_t *p)
{
ap_hook_check_user_id(mag_auth, NULL, NULL, APR_HOOK_MIDDLE);
+ ap_hook_post_config(mag_post_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_pre_connection(mag_pre_connection, NULL, NULL, APR_HOOK_MIDDLE);
}
projects / mod_auth_gssapi.git / blobdiff