int rc = OK;
if((rc = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR))) {
+ gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_get_post_data: Failed to set up client block");
return(rc);
}
if(ap_should_client_block(r)) {
-
- char argsbuffer[HUGE_STRING_LEN];
- apr_off_t rsize, len_read, rpos = 0;
- apr_off_t length = r->remaining;
+ char argsbuffer[HUGE_STRING_LEN];
+ apr_off_t rsize, len_read, rpos = 0;
+ apr_off_t length = r->remaining;
*rbuf = (const char *) apr_pcalloc(r->pool, (apr_size_t) (length + 1));
*size = length;
else {
rsize = len_read;
}
-
+
memcpy((char *) *rbuf + rpos, argsbuffer, (size_t) rsize);
rpos += rsize;
}
apr_off_t datalen;
const char *key, *val, *type;
int rc = 0;
+ size_t len;
*nonce = 0;
input_token->length = 0;
input_token->value = NULL;
+ gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_get_post_data: Entering function");
+
if(r->method_number != M_POST) {
- gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_get_post_data: Request data is not a POST, declining.");
+ gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_get_post_data: Request data is not a POST, declining.");
return DECLINED;
}
type = apr_table_get(r->headers_in, "Content-Type");
if(strcasecmp(type, DEFAULT_ENCTYPE) != 0) {
- gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_get_post_data: Unexpected content type, declining.");
+ gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_get_post_data: Unexpected content type, declining.");
return DECLINED;
}
if((rc = gssweb_read_req(r, &data, &datalen)) != OK) {
- gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_get_post_data: Data read error, rc = %d", rc);
+ gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_get_post_data: Data read error, rc = %d", rc);
return rc;
}
-
+
while(*data && (val = ap_getword(r->pool, &data, '&'))) {
- gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_get_post_data: obtained val from ap_getword() (%s)", val);
key = ap_getword(r->pool, &val, '=');
ap_unescape_url((char*)key);
ap_unescape_url((char*)val);
if (0 == strcasecmp(key, "token")) {
- gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_get_post_data: found token (%s)", val);
- input_token->value = malloc(strlen(val));
+ gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_get_post_data: Found encoded token: %s", val);
+ len = apr_base64_decode_len(val);
+ if (NULL == (input_token->value = apr_pcalloc(r->pool, len+1))) {
+ }
input_token->length = apr_base64_decode(input_token->value, val);
- gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_get_post_data: Token successfully decoded.");
}
else if (0 == strcasecmp(key, "nonce")) {
- gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_get_post_data: found nonce (%s)", val);
+ gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_get_post_data: Found nonce: %s", val);
*nonce = atoi(val);
}
else {
- gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_get_post_data: unknown key (%s)", key);
+ gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_get_post_data: unknown key (%s), ignored", key);
}
}
if ((0 == *nonce) || (0 == input_token->length)) {
- gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_get_post_data: nonce (%d) or token len (%d) is 0, declining", *nonce, input_token->length);
+ gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_get_post_data: nonce (%d) or token len (%d) is 0, declining", *nonce, input_token->length);
return DECLINED;
}
else {
static apr_status_t gssweb_authenticate_filter (ap_filter_t *f,
apr_bucket_brigade *brig_in)
{
- gss_log(APLOG_MARK, APLOG_DEBUG, 0, f->r, "Entering GSSWeb filter");
-
request_rec *r = f->r;
conn_rec *c = r->connection;
apr_bucket_brigade *brig_out;
apr_bucket *bkt_eos = NULL;
const char *data = NULL;
apr_size_t len = 0;
+ apr_size_t enc_len = 0;
char *buf = NULL;
char *stoken = NULL;
- apr_size_t n = 0, i = 0;
+ apr_size_t n = 0;
gss_conn_ctx conn_ctx = NULL;
const char *c_type = NULL;
const char *c_len = NULL;
apr_status_t ret = 0;
- /* get the context from the request */
- conn_ctx = gss_get_conn_ctx(r);
- if ((NULL == conn_ctx) ||
- (GSS_C_NO_CONTEXT == conn_ctx->context) ||
- (GSS_CTX_EMPTY == conn_ctx->state) ||
- (0 == conn_ctx->output_token.length)) {
- conn_ctx->filter_stat = GSS_FILT_ERROR;
- gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_authenticate_filter: Failed to find valid context.");
+ gss_log(APLOG_MARK, APLOG_DEBUG, 0, f->r, "Entering GSSWeb filter");
+
+ /* Get the context from the request. If the context is NULL or
+ * there is no outstanding request (no nonce set), just forward
+ * all of the buckets as-is, because the client isn't gssweb
+ */
+ if ((NULL == (conn_ctx = gss_retrieve_conn_ctx(r))) ||
+ (0 == conn_ctx->nonce)) {
+ for (bkt_in = APR_BRIGADE_FIRST(brig_in);
+ bkt_in != APR_BRIGADE_SENTINEL(brig_in);
+ bkt_in = APR_BUCKET_NEXT(bkt_in))
+ {
+ if (NULL == (brig_out = apr_brigade_create(r->pool, c->bucket_alloc))) {
+ apr_brigade_cleanup(brig_in);
+ return HTTP_INTERNAL_SERVER_ERROR;
+ }
+ apr_bucket_copy(bkt_in, &bkt_out);
+ APR_BRIGADE_INSERT_TAIL(brig_out, bkt_out);
+ ap_pass_brigade(f->next, brig_out);
+ }
+ gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_authenticate_filter: Failed to find valid context");
apr_brigade_cleanup(brig_in);
- return HTTP_INTERNAL_SERVER_ERROR;
+ return OK;
}
-
- /* if this is the first call for a response, send opening JSON block */
+ c_type = apr_table_get(r->headers_in, "Content-Type");
+ c_len = apr_table_get(r->headers_in, "Content-Length");
+ /* clear content-length and MD5 checksum */
+ apr_table_unset(r->headers_out, "Content-Length");
+ apr_table_unset(r->headers_out, "Content-MD5");
+ gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_authenticate_filter: Received Content-Type: %s, Content-Length: %d", c_type, c_len);
+
+ /* If this is the first call for a response, send opening JSON block */
if (GSS_FILT_NEW == conn_ctx->filter_stat) {
+ gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_authenticate_filter: First filter call for response");
if (NULL == (brig_out = apr_brigade_create(r->pool, c->bucket_alloc))) {
conn_ctx->filter_stat = GSS_FILT_ERROR;
gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_authenticate_filter: Unable to allocate output brigade (opening)");
return HTTP_INTERNAL_SERVER_ERROR;
}
+ /* Encode the output token */
len = apr_base64_encode_len(conn_ctx->output_token.length);
- if (NULL == (data = apr_bucket_alloc(len+1024, c->bucket_alloc)) ||
- NULL == (stoken = apr_bucket_alloc(len+1, c->bucket_alloc))) {
- gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_authenticate_filter: Unable to allocate space for opening json block");
+ if (NULL == (stoken = apr_bucket_alloc(len+1, c->bucket_alloc))) {
+ gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_authenticate_filter: Unable to allocate space for encoded output token");
apr_brigade_cleanup(brig_in);
apr_brigade_cleanup(brig_out);
return HTTP_INTERNAL_SERVER_ERROR;
}
-
apr_base64_encode_binary(stoken, conn_ctx->output_token.value, conn_ctx->output_token.length);
+
+ if (NULL == (data = apr_bucket_alloc(len+1024, c->bucket_alloc))) {
+ gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_authenticate_filter: Unable to allocate space for opening JSON block");
+ apr_brigade_cleanup(brig_in);
+ apr_brigade_cleanup(brig_out);
+ return HTTP_INTERNAL_SERVER_ERROR;
+ }
+
+ /* Send opening JSON block */
snprintf((char *)data, len+1024,
"{\"gssweb\": {\n\"token\": \"%s\",\n\"nonce\": \"%d\"},\n\"application\": {\n\"data\": \"",
stoken, conn_ctx->nonce);
- gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_authenticate_filter: Sending: %s", data);
+ gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_authenticate_filter: Sending (%d bytes): %s", strlen(data), data);
bkt_out = apr_bucket_heap_create(data, strlen(data), apr_bucket_free,
c->bucket_alloc);
conn_ctx->filter_stat = GSS_FILT_INPROGRESS;
}
- /* loop through the app data buckets, escaping and sending each one */
+ /* Loop through the app data buckets, escaping and sending each one */
for (bkt_in = APR_BRIGADE_FIRST(brig_in);
bkt_in != APR_BRIGADE_SENTINEL(brig_in);
bkt_in = APR_BUCKET_NEXT(bkt_in))
/* create and add the JSON closing block */
if (NULL == (data = apr_bucket_alloc(1024, c->bucket_alloc))) {
- gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_authenticate_filter: Unable to allocate space for closing json block");
+ gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_authenticate_filter: Unable to allocate space for closing JSON block");
apr_brigade_cleanup(brig_in);
apr_brigade_cleanup(brig_out);
return HTTP_INTERNAL_SERVER_ERROR;
}
- c_type = apr_table_get(r->headers_in, "Content-Type");
- c_len = apr_table_get(r->headers_in, "Content-Length");
- snprintf((char *)data, 1024, "\"\n\"content-type\": \"%s,\n\"content-length\": \"%s\"\n}\n}", c_type, c_len);
- gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_authenticate_filter: Sending: %s", data);
+ snprintf((char *)data, 1024, "\",\n\"content-type\": \"%s\",\n\"content-length\": \"%s\"\n}\n}", c_type, c_len);
+ gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_authenticate_filter: Sending (%d bytes) %s", strlen(data), data);
bkt_out = apr_bucket_heap_create(data, strlen(data), apr_bucket_free,
c->bucket_alloc);
bkt_eos = apr_bucket_eos_create(c->bucket_alloc);
APR_BRIGADE_INSERT_TAIL (brig_out, bkt_eos);
+ /* set application type to 'application/json' */
+ apr_table_set(r->headers_out, "Content-Type", "application/json");
+
+ /* clear content-length and MD5 checksum */
+ apr_table_unset(r->headers_out, "Content-Length");
+ apr_table_unset(r->headers_out, "Content-MD5");
+
/* pass the brigade */
gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_authenticate_filter: Sending: EOS");
if (0 != (ret = ap_pass_brigade(f->next, brig_out))) {
- gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_authenticate_filter: Unable to pass output brigade (eos)");
conn_ctx->filter_stat = GSS_FILT_ERROR;
apr_brigade_cleanup(brig_in);
apr_brigade_cleanup(brig_out);
/* Read application data from each input bucket */
apr_bucket_read(bkt_in, &data, &len, APR_BLOCK_READ);
- gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_authenticate_filter: Application Data (%d bytes): %s", len, data);
-
- if (NULL == (buf = apr_bucket_alloc(len*2+1, c->bucket_alloc))) {
- gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_authenticate_filter: Unable to allocate space for application data");
- apr_brigade_cleanup(brig_in);
- apr_brigade_cleanup(brig_out);
- return HTTP_INTERNAL_SERVER_ERROR;
- }
- /* Write data to an output brigade, escaping quotes */
- for(n=0, i=0; n < len, i < 2*len ; n++) {
- if ('"' != data[n]) {
- buf[i++] = data[n];
- } else {
- /* Write the escaped quote character */
- buf[i++] = '\\';
- buf[i++] = '"';
- /* Skip the quote character */
+ /* Base64 encode the data (if any) */
+ if (0 != len) {
+ enc_len = apr_base64_encode_len(len);
+ if (NULL == (buf = apr_bucket_alloc(enc_len, c->bucket_alloc))) {
+ gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_authenticate_filter: Unable to allocate space for encoded application data");
+ apr_brigade_cleanup(brig_in);
+ apr_brigade_cleanup(brig_out);
+ return HTTP_INTERNAL_SERVER_ERROR;
+ }
+ enc_len = apr_base64_encode_binary(buf, data, len);
+
+ /* Put the data in a bucket and add it to the the output brigade */
+ bkt_out = apr_bucket_heap_create(buf, enc_len-1, apr_bucket_free, c->bucket_alloc);
+ buf[enc_len] = '\0';
+ gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_authenticate_filter: Sending (%d bytes)", enc_len);
+ APR_BRIGADE_INSERT_TAIL(brig_out, bkt_out);
+
+ /* Send the output brigade */
+ if (OK != (ret = ap_pass_brigade(f->next, brig_out))) {
+ apr_brigade_cleanup(brig_in);
+ apr_brigade_cleanup(brig_out);
+ return ret;
}
- }
- buf[i] = '\0';
- bkt_out = apr_bucket_heap_create(buf, i, NULL, c->bucket_alloc);
- gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_authenticate_filter: Sending: %s", buf);
- APR_BRIGADE_INSERT_TAIL(brig_out, bkt_out);
-
- /* Send the output brigade */
- gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_authenticate_filter: Passing the application data brigade");
- if (OK != (ret = ap_pass_brigade(f->next, brig_out))) {
- apr_brigade_cleanup(brig_in);
- apr_brigade_cleanup(brig_out);
- return ret;
}
}
/* Make sure we don't see the same data again */
apr_brigade_cleanup(brig_in);
- return ret;
+ return OK;
}
/* gssweb_add_filter() -- Hook to add our output filter to the request
{
gss_conn_ctx conn_ctx = NULL;
- /* Get the context for this request */
- conn_ctx = gss_get_conn_ctx(r);
- if (conn_ctx == NULL) {
- gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_add_filter: Failed to find or create internal context.");
- return;
- }
+ /* Get the context for this request, if any */
+ conn_ctx = gss_retrieve_conn_ctx(r);
/* Add the output filter */
ap_add_output_filter("gssweb_auth_filter", (void *)conn_ctx, r, r->connection);
static int
gssweb_authenticate_user(request_rec *r)
{
- gss_auth_config *conf =
- (gss_auth_config *) ap_get_module_config(r->per_dir_config,
- &auth_gssweb_module);
const char *auth_line = NULL;
char *auth_type = NULL;
char *negotiate_ret_value = NULL;
gss_buffer_desc output_token = GSS_C_EMPTY_BUFFER;
gss_name_t client_name = GSS_C_NO_NAME;
gss_cred_id_t delegated_cred = GSS_C_NO_CREDENTIAL;
- gss_cred_id_t server_creds = GSS_C_NO_CREDENTIAL;
OM_uint32 ret_flags = 0;
unsigned int nonce;
+ int release_output_token = 1;
+ gss_auth_config *conf = NULL;
gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "Entering GSSWeb authentication");
-
+
+ /* Get the module configuration */
+ conf = (gss_auth_config *) ap_get_module_config(r->per_dir_config,
+ &auth_gssweb_module);
+
/* Check if this is for our auth type */
auth_type = (char *)ap_auth_type(r);
if (auth_type == NULL || strcasecmp(auth_type, "GSSWeb") != 0) {
gss_log(APLOG_MARK, APLOG_DEBUG, 0, r,
"gssweb_authenticate_user: AuthType '%s' is not GSSWeb, bailing out",
(auth_type) ? auth_type : "(NULL)");
-
- return DECLINED;
+ ret = DECLINED;
+ goto end;
}
- /* Set up a GSS context for this request, if there isn't one already */
- conn_ctx = gss_get_conn_ctx(r);
- if (conn_ctx == NULL) {
- gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_authenticate_user: Failed to create internal context");
- return HTTP_INTERNAL_SERVER_ERROR;
+ /* Retrieve the existing context (if any), or create one */
+ if ((NULL == (conn_ctx = gss_retrieve_conn_ctx(r))) &&
+ (NULL == (conn_ctx = gss_create_conn_ctx(r, conf)))) {
+ gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_authenticate_user: Unable to find or create context");
}
/* Read the token and nonce from the POST */
if (0 != gssweb_get_post_data(r, &nonce, &input_token)) {
+ gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_authenticate_user: Unable to read nonce or input token from GSSWeb input");
+ gss_delete_sec_context(&minor_status, &conn_ctx->context, GSS_C_NO_BUFFER);
+ conn_ctx->context = GSS_C_NO_CONTEXT;
+ conn_ctx->state = GSS_CTX_FAILED;
+ if (0 != conn_ctx->output_token.length)
+ gss_release_buffer(&minor_status, &(conn_ctx->output_token));
+ conn_ctx->output_token.length = 0;
ret = HTTP_UNAUTHORIZED;
- gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_authenticate_user: Unable to read nonce or input token.");
goto end;
}
gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_authenticate_user: GSSWeb nonce value = %u.", nonce);
-
- /* If the nonce is set and doesn't match, start over */
+
+ /* If the nonce does not match, release old context and create new */
if ((0 != conn_ctx->nonce) && (conn_ctx->nonce != nonce)) {
- if (GSS_C_NO_CONTEXT != conn_ctx->context) {
- gss_delete_sec_context(&minor_status, &conn_ctx->context, GSS_C_NO_BUFFER);
+ gss_log(APLOG_MARK, APLOG_DEBUG, 0, r,
+ "gssweb_authenticate_user: Nonce in context (%d) does not match nonce in input (%d), new request", conn_ctx->nonce, nonce);
+ gss_cleanup_conn_ctx(conn_ctx);
+ if (NULL == (conn_ctx = gss_create_conn_ctx (r, conf))) {
+ gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_authenticate_user: Failed to create GSS context");
+ ret = HTTP_INTERNAL_SERVER_ERROR;
+ goto end;
}
- conn_ctx->context = GSS_C_NO_CONTEXT;
- conn_ctx->state = GSS_CTX_EMPTY;
- conn_ctx->filter_stat = GSS_FILT_NEW;
- conn_ctx->user = NULL;
- if (0 != conn_ctx->output_token.length) {
- gss_release_buffer(&minor_status, &(conn_ctx->output_token));
- }
- conn_ctx->output_token.length = 0;
}
-
+
/* If the output filter reported an internal server error, return it */
if (GSS_FILT_ERROR == conn_ctx->filter_stat) {
- ret = HTTP_INTERNAL_SERVER_ERROR;
gss_log(APLOG_MARK, APLOG_ERR, 0, r,
"gssweb_authenticate_user: Output filter returned error, reporting.");
+ ret = HTTP_INTERNAL_SERVER_ERROR;
goto end;
}
- /* Set-up the output filter (TBD -- register this once?) */
- ap_register_output_filter("gssweb_auth_filter", gssweb_authenticate_filter, NULL, AP_FTYPE_RESOURCE);
+ /* Add the output filter to this request (for non-error returns) */
ap_add_output_filter("gssweb_auth_filter", (void *)conn_ctx, r, r->connection);
- /* Acquire server credentials (TBD -- do this once?) */
- ret = get_gss_creds(r, conf, &server_creds);
- if (ret)
- goto end;
- gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_authenticate_user: Server credentials acquired.");
-
/* Call gss_accept_sec_context */
major_status = gss_accept_sec_context(&minor_status,
&conn_ctx->context,
- server_creds,
+ conn_ctx->server_creds,
&input_token,
GSS_C_NO_CHANNEL_BINDINGS,
NULL,
gss_log(APLOG_MARK, APLOG_ERR, 0, r,
"%s", get_gss_error(r, major_status, minor_status,
"gssweb_authenticate_user: Failed to establish authentication"));
+ conn_ctx->state = GSS_CTX_FAILED;
+ }
+
+ /* If there was no token returned, clear token from context and exit */
+ if (0 == output_token.length) {
+ gss_log(APLOG_MARK, APLOG_ERR, 0, r, "gssweb_authenticate_user: No output token");
gss_delete_sec_context(&minor_status, &conn_ctx->context, GSS_C_NO_BUFFER);
conn_ctx->context = GSS_C_NO_CONTEXT;
- conn_ctx->state = GSS_CTX_EMPTY;
+ conn_ctx->state = GSS_CTX_FAILED;
+ if (0 != conn_ctx->output_token.length)
+ gss_release_buffer(&minor_status, &(conn_ctx->output_token));
+ conn_ctx->output_token.length = 0;
ret = HTTP_UNAUTHORIZED;
goto end;
- gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_authenticate_user: Decoding ouput token.");
}
- gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_authenticate_user: Got sec context, storing nonce and output token.");
-
/* Store the nonce & ouput token in the stored context */
conn_ctx->nonce = nonce;
conn_ctx->output_token = output_token;
-
+ release_output_token = 0;
+
/* If we aren't done yet, go around again */
+ gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_authenticate_user: Accept sec context complete, continue needed");
if (major_status & GSS_S_CONTINUE_NEEDED) {
conn_ctx->state = GSS_CTX_IN_PROGRESS;
ret = HTTP_UNAUTHORIZED;
goto end;
}
+ gss_log(APLOG_MARK, APLOG_DEBUG, 0, r, "gssweb_authenticate_user: Authentication succeeded!!");
conn_ctx->state = GSS_CTX_ESTABLISHED;
- r->user = apr_pstrdup(r->pool, conn_ctx->user);
- r->ap_auth_type = "GSSWeb";
+ r->user = apr_pstrdup(r->pool, conn_ctx->user);
+ r->ap_auth_type = "GSSWeb";
ret = OK;
end:
if (delegated_cred)
gss_release_cred(&minor_status, &delegated_cred);
- if (output_token.length)
+ if ((release_output_token) && (output_token.length))
gss_release_buffer(&minor_status, &output_token);
if (client_name != GSS_C_NO_NAME)
gss_release_name(&minor_status, &client_name);
- if (server_creds != GSS_C_NO_CREDENTIAL)
- gss_release_cred(&minor_status, &server_creds);
-
return ret;
}
static void
gssweb_register_hooks(apr_pool_t *p)
{
- ap_hook_check_user_id(gssweb_authenticate_user, NULL, NULL, APR_HOOK_MIDDLE);
- ap_hook_insert_error_filter(gssweb_add_filter, NULL, NULL, APR_HOOK_MIDDLE);
+ /* register the gssweb output filter */
+ ap_register_output_filter("gssweb_auth_filter", gssweb_authenticate_filter, NULL, AP_FTYPE_RESOURCE);
+
+ /* register hooks */
+ ap_hook_check_user_id(gssweb_authenticate_user, NULL, NULL, APR_HOOK_MIDDLE);
+ ap_hook_insert_error_filter(gssweb_add_filter, NULL, NULL, APR_HOOK_MIDDLE);
}
module AP_MODULE_DECLARE_DATA auth_gssweb_module = {
projects / mod_auth_kerb.cvs / .git / blobdiff