DEALINGS IN THE SOFTWARE.
*/
-#include <stdbool.h>
-#include <stdint.h>
-#include <gssapi/gssapi.h>
-#include <gssapi/gssapi_ext.h>
-
-#include <httpd.h>
-#include <http_core.h>
-#include <http_connection.h>
-#include <http_log.h>
-#include <http_request.h>
-#include <apr_strings.h>
-#include <apr_base64.h>
+#include "mod_auth_gssapi.h"
+
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;
- bool gss_conn_ctx;
- gss_key_value_set_desc cred_store;
-};
-
static char *mag_status(request_rec *req, int type, uint32_t err)
{
uint32_t maj_ret, min_ret;
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,
+static int mag_post_config(apr_pool_t *cfgpool, 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);
+ mag_post_config_session();
return OK;
}
-
-struct mag_conn {
- apr_pool_t *parent;
- gss_ctx_id_t ctx;
- bool established;
- char *user_name;
- char *gss_name;
-};
-
static int mag_pre_connection(conn_rec *c, void *csd)
{
struct mag_conn *mc;
gss_name_t client = GSS_C_NO_NAME;
gss_cred_id_t delegated_cred = GSS_C_NO_CREDENTIAL;
uint32_t flags;
+ uint32_t vtime;
uint32_t maj, min;
char *reply;
size_t replen;
return DECLINED;
}
+ /* ignore auth for subrequests */
+ if (!ap_is_initial_req(req)) {
+ return OK;
+ }
+
cfg = ap_get_module_config(req->per_dir_config, &auth_gssapi_module);
if (cfg->ssl_only) {
req->connection->conn_config,
&auth_gssapi_module);
if (!mc) {
- return DECLINED;
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, req,
+ "Failed to retrieve connection context!");
+ goto done;
}
+ }
+
+ /* if available, session always supersedes connection bound data */
+ mag_check_session(req, cfg, &mc);
+
+ if (mc) {
+ /* register the context in the memory pool, so it can be freed
+ * when the connection/request is terminated */
+ apr_pool_userdata_set(mc, "mag_conn_ptr",
+ mag_conn_destroy, mc->parent);
+
if (mc->established) {
ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, req,
- "Connection bound pre-authentication found.");
+ "Already established context found!");
apr_table_set(req->subprocess_env, "GSS_NAME", mc->gss_name);
req->ap_auth_type = apr_pstrdup(req->pool, "Negotiate");
req->user = apr_pstrdup(req->pool, mc->user_name);
maj = gss_accept_sec_context(&min, pctx, GSS_C_NO_CREDENTIAL,
&input, GSS_C_NO_CHANNEL_BINDINGS,
- &client, &mech_type, &output, &flags, NULL,
+ &client, &mech_type, &output, &flags, &vtime,
&delegated_cred);
if (GSS_ERROR(maj)) {
ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req,
goto done;
}
- /* 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) {
- if (!cfg->gss_conn_ctx) {
+ if (!mc) {
ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req,
- "Mechanism needs continuation but "
- "GssapiConnectionBound is off.");
+ "Mechanism needs continuation but neither "
+ "GssapiConnectionBound nor "
+ "GssapiUseSessions are available");
gss_delete_sec_context(&min, pctx, GSS_C_NO_BUFFER);
gss_release_buffer(&min, &output);
output.length = 0;
}
+ /* auth not complete send token and wait next packet */
goto done;
}
#ifdef HAVE_GSS_STORE_CRED_INTO
- if (cfg->cred_store && delegated_cred != GSS_C_NO_CREDENTIAL) {
+ if (cfg->cred_store.count != 0 && delegated_cred != GSS_C_NO_CREDENTIAL) {
gss_key_value_set_desc store = {0, NULL};
/* FIXME: run substitutions */
mc->user_name = apr_pstrdup(mc->parent, req->user);
mc->gss_name = apr_pstrdup(mc->parent, clientname);
mc->established = true;
+ if (vtime == GSS_C_INDEFINITE || vtime < MIN_SESS_EXP_TIME) {
+ vtime = MIN_SESS_EXP_TIME;
+ }
+ mc->expiration = time(NULL) + vtime;
+ mag_attempt_session(req, cfg, mc);
}
ret = OK;
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_use_sess(cmd_parms *parms, void *mconfig, int on)
+{
+ struct mag_config *cfg = (struct mag_config *)mconfig;
+ cfg->use_sessions = on ? true : false;
+ 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 keys;
+ unsigned char *val;
+ apr_status_t rc;
+ const char *k;
+ int l;
+
+ if (strncmp(w, "key:", 4) != 0) {
+ ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server,
+ "Invalid key format, expected prefix 'key:'");
+ return NULL;
+ }
+ k = w + 4;
+
+ 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;
+
+ if (keys.length != 32) {
+ ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, parms->server,
+ "Invalid key lenght, expected 32 got %d", keys.length);
+ return NULL;
+ }
+
+ 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!");
+ }
+ return NULL;
+}
+
static const char *mag_cred_store(cmd_parms *parms, void *mconfig,
const char *w)
{
"Work only if connection is SSL Secured"),
AP_INIT_FLAG("GssapiConnectionBound", mag_conn_ctx, NULL, OR_AUTHCFG,
"Authentication is bound to the TCP connection"),
+ 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,
+ "Key Used to seal session data."),
AP_INIT_ITERATE("GssapiCredStore", mag_cred_store, NULL, OR_AUTHCFG,
"Credential Store"),
{ NULL }
projects / mod_auth_gssapi.git / blobdiff