#include "config.h"
-#define MODAUTHKERB_VERSION "5.0-rc4"
+#define MODAUTHKERB_VERSION "5.0-rc5"
#include <httpd.h>
#include <http_config.h>
#ifdef STANDARD20_MODULE_STUFF
#include <ap_compat.h>
#include <apr_strings.h>
+#include <apr_base64.h>
#endif
-
#ifdef KRB5
#include <krb5.h>
#ifdef HEIMDAL
#else
# include <gssapi/gssapi.h>
# include <gssapi/gssapi_generic.h>
+# include <gssapi/gssapi_krb5.h>
# define GSS_C_NT_USER_NAME gss_nt_user_name
# define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
# define krb5_get_err_text(context,code) error_message(code)
#include <netdb.h> /* gethostbyname() */
#endif /* KRB4 */
+/* XXX remove dependency on unistd.h ??? */
+#include <unistd.h>
+
#ifdef STANDARD20_MODULE_STUFF
module AP_MODULE_DECLARE_DATA auth_kerb_module;
#else
int krb_verify_kdc;
char *krb_service_name;
int krb_authoritative;
+ int krb_delegate_basic;
#ifdef KRB5
char *krb_5_keytab;
int krb_method_gssapi;
TAKE1, "Service name to be used by Apache for authentication."),
command("KrbAuthoritative", ap_set_flag_slot, krb_authoritative,
- FLAG, "Set to 'off' to allow access control to be passed along to lower modules if the UserID is not known to this module."),
+ FLAG, "Set to 'off' to allow access control to be passed along to lower modules iff the UserID is not known to this module."),
+
+ command("KrbDelegateBasic", ap_set_flag_slot, krb_delegate_basic,
+ FLAG, "Always offer Basic authentication regardless of KrbMethodK5Pass and pass on authentication to lower modules if Basic headers arrive."),
#ifdef KRB5
command("Krb5Keytab", ap_set_file_slot, krb_5_keytab,
/* This is our replacement krb5_rc_store function */
static krb5_error_code
mod_auth_kerb_rc_store(krb5_context context, krb5_rcache rcache,
- krb5_donot_replay *donot_replay)
+ krb5_donot_replay_internal *donot_replay)
{
return 0;
}
/* And this is the operations vector for our replay cache */
-const krb5_rc_ops mod_auth_kerb_rc_ops = {
+const krb5_rc_ops_internal mod_auth_kerb_rc_ops = {
0,
"dfl",
krb5_rc_dfl_init,
((kerb_auth_config *)rec)->krb_verify_kdc = 1;
((kerb_auth_config *)rec)->krb_service_name = "HTTP";
((kerb_auth_config *)rec)->krb_authoritative = 1;
+ ((kerb_auth_config *)rec)->krb_delegate_basic = 0;
#ifdef KRB5
((kerb_auth_config *)rec)->krb_method_k5pass = 1;
((kerb_auth_config *)rec)->krb_method_gssapi = 1;
/***************************************************************************
Username/Password Validation for Krb5
***************************************************************************/
+
+/* MIT kerberos uses replay cache checks even during credential verification
+ * (i.e. in krb5_verify_init_creds()), which is obviosuly useless. In order to
+ * avoid problems with multiple apache processes accessing the same rcache file
+ * we had to use this call instead, which is only a bit modified version of
+ * krb5_verify_init_creds() */
static krb5_error_code
verify_krb5_init_creds(krb5_context context, krb5_creds *creds,
krb5_principal ap_req_server, krb5_keytab ap_req_keytab)
krb5_auth_context auth_context = NULL;
krb5_keytab keytab = NULL;
- krb5_data_zero (&req);
+ memset(&req, 0, sizeof(req));
if (ap_req_keytab == NULL) {
ret = krb5_kt_default (context, &keytab);
goto end;
krb5_auth_con_free (context, auth_context);
+ auth_context = NULL;
ret = krb5_auth_con_init(context, &auth_context);
if (ret)
goto end;
+ /* use KRB5_AUTH_CONTEXT_DO_SEQUENCE to skip replay cache checks */
krb5_auth_con_setflags(context, auth_context, KRB5_AUTH_CONTEXT_DO_SEQUENCE);
ret = krb5_rd_req (context, &auth_context, &req, ap_req_server,
/* Inspired by krb5_verify_user from Heimdal */
static krb5_error_code
verify_krb5_user(request_rec *r, krb5_context context, krb5_principal principal,
- krb5_ccache ccache, const char *password, const char *service,
- krb5_keytab keytab, int krb_verify_kdc)
+ const char *password, const char *service, krb5_keytab keytab,
+ int krb_verify_kdc, krb5_ccache *ccache)
{
krb5_creds creds;
krb5_principal server = NULL;
krb5_error_code ret;
+ krb5_ccache ret_ccache = NULL;
/* XXX error messages shouldn't be logged here (and in the while() loop in
* authenticate_user_krb5pwd() as weell), in order to avoid confusing log
goto end;
}
- if (ccache) {
- ret = krb5_cc_initialize(context, ccache, principal);
- if (ret) {
- log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "krb5_cc_initialize() failed: %s",
- krb5_get_err_text(context, ret));
- goto end;
- }
+ ret = krb5_cc_resolve(context, "MEMORY:", &ret_ccache);
+ if (ret) {
+ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "generating new memory ccache failed: %s",
+ krb5_get_err_text(context, ret));
+ goto end;
+ }
- ret = krb5_cc_store_cred(context, ccache, &creds);
- if (ret) {
- log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "krb5_cc_store_cred() failed: %s",
- krb5_get_err_text(context, ret));
- goto end;
- }
+ ret = krb5_cc_initialize(context, ret_ccache, principal);
+ if (ret) {
+ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "krb5_cc_initialize() failed: %s",
+ krb5_get_err_text(context, ret));
+ goto end;
+ }
+
+ ret = krb5_cc_store_cred(context, ret_ccache, &creds);
+ if (ret) {
+ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "krb5_cc_store_cred() failed: %s",
+ krb5_get_err_text(context, ret));
+ goto end;
}
+ *ccache = ret_ccache;
+ ret_ccache = NULL;
end:
krb5_free_cred_contents(context, &creds);
if (server)
krb5_free_principal(context, server);
+ if (ret_ccache)
+ krb5_cc_destroy(context, ret_ccache);
return ret;
}
int ret;
char *name = NULL;
int all_principals_unkown;
- char *ccname = NULL;
- int fd;
code = krb5_init_context(&kcontext);
if (code) {
goto end;
}
- code = krb5_cc_resolve(kcontext, "MEMORY:", &ccache);
- if (code) {
- log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "generating new memory ccache failed: %s",
- krb5_get_err_text(kcontext, code));
- ret = HTTP_INTERNAL_SERVER_ERROR;
- unlink(ccname);
- goto end;
- }
-
if (conf->krb_5_keytab)
krb5_kt_resolve(kcontext, conf->krb_5_keytab, &keytab);
continue;
}
- code = verify_krb5_user(r, kcontext, client, ccache, sent_pw,
+ code = verify_krb5_user(r, kcontext, client, sent_pw,
conf->krb_service_name,
- keytab, conf->krb_verify_kdc);
+ keytab, conf->krb_verify_kdc, &ccache);
if (!conf->krb_authoritative && code) {
/* if we're not authoritative, we allow authentication to pass on
* to another modules if (and only if) the user is not known to us */
ret = OK;
end:
+ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ "kerb_authenticate_user_krb5pwd ret=%d user=%s authtype=%s",
+ ret, (MK_USER)?MK_USER:"(NULL)", MK_AUTH_TYPE);
if (client)
krb5_free_principal(kcontext, client);
if (ccache)
OM_uint32 msg_ctx = 0;
gss_buffer_desc status_string;
char *err_msg;
- size_t len;
err_msg = ap_pstrdup(p, prefix);
do {
"gss_import_name() failed"));
return HTTP_INTERNAL_SERVER_ERROR;
}
+
+ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "Acquiring creds for %s", buf);
major_status = gss_acquire_cred(&minor_status, server_name, GSS_C_INDEFINITE,
GSS_C_NO_OID_SET, GSS_C_ACCEPT,
* Note that this is a dirty hack to get things working and there may
* well be unknown side-effects.
*/
- if (memcmp(((krb5_gss_cred_id_t) *server_creds)->rcache->ops->type, "dfl", 3) == 0)
- /* Override the rcache operations */
- ((krb5_gss_cred_id_t) *server_creds)->rcache->ops = &mod_auth_kerb_rc_ops;
-#if 0
- else
- /* rcache did not point to default rcache structure, return error */
- return HTTP_INTERNAL_SERVER_ERROR;
-#endif
+ {
+ krb5_gss_cred_id_t gss_creds = (krb5_gss_cred_id_t) *server_creds;
+
+ if (gss_creds && gss_creds->rcache && gss_creds->rcache->ops &&
+ gss_creds->rcache->ops->type &&
+ memcmp(gss_creds->rcache->ops->type, "dfl", 3) == 0)
+ /* Override the rcache operations */
+ gss_creds->rcache->ops = &mod_auth_kerb_rc_ops;
+ }
#endif
return 0;
accept_sec_token = (cmp_gss_type(&input_token, &spnego_oid) == 0) ?
gss_accept_sec_context_spnego : gss_accept_sec_context;
+ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "Verifying client data using %s",
+ (accept_sec_token == gss_accept_sec_context)
+ ? "KRB5 GSS-API"
+ : "SPNEGO GSS-API");
+
major_status = accept_sec_token(&minor_status,
&context,
server_creds,
NULL,
NULL,
&delegated_cred);
+ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ "Verification returned code %d", major_status);
if (output_token.length) {
char *token = NULL;
size_t len;
ap_base64encode(token, output_token.value, output_token.length);
token[len] = '\0';
*negotiate_ret_value = token;
+ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ "GSS-API token of length %d bytes will be sent back",
+ major_status, output_token.length);
gss_release_buffer(&minor_status2, &output_token);
}
/* get the user realm specified in .htaccess */
auth_name = ap_auth_name(r);
- /* XXX should the WWW-Authenticate header be cleared first? */
+ /* XXX should the WWW-Authenticate header be cleared first?
+ * apache in the proxy mode should retain client's authN headers? */
#ifdef KRB5
if (negotiate_ret_value != NULL && conf->krb_method_gssapi) {
negoauth_param = (*negotiate_ret_value == '\0') ? "Negotiate" :
ap_pstrcat(r->pool, "Negotiate ", negotiate_ret_value, NULL);
ap_table_add(r->err_headers_out, header_name, negoauth_param);
}
- if (use_krb5pwd && conf->krb_method_k5pass) {
+ if ((use_krb5pwd && conf->krb_method_k5pass) || conf->krb_delegate_basic) {
ap_table_add(r->err_headers_out, header_name,
ap_pstrcat(r->pool, "Basic realm=\"", auth_name, "\"", NULL));
set_basic = 1;
#endif
#ifdef KRB4
- if (use_krb4 && conf->krb_method_k4pass && !set_basic)
+ if (!set_basic &&
+ ((use_krb4 && conf->krb_method_k4pass) || conf->krb_delegate_basic))
ap_table_add(r->err_headers_out, header_name,
ap_pstrcat(r->pool, "Basic realm=\"", auth_name, "\"", NULL));
#endif
/* get the type specified in .htaccess */
type = ap_auth_type(r);
+ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ "kerb_authenticate_user entered with user %s and auth_type %s",
+ (MK_USER)?MK_USER:"(NULL)",type?type:"(NULL)");
+
if (type && strcasecmp(type, "Kerberos") == 0)
use_krb5 = use_krb4 = 1;
else if(type && strcasecmp(type, "KerberosV5") == 0)
- use_krb4 = 0;
+ use_krb5 = 1;
else if(type && strcasecmp(type, "KerberosV4") == 0)
- use_krb5 = 0;
+ use_krb4 = 1;
else
return DECLINED;
/* get what the user sent us in the HTTP header */
- auth_line = MK_TABLE_GET(r->headers_in, "Authorization");
+ auth_line = MK_TABLE_GET(r->headers_in, (r->proxyreq == PROXYREQ_PROXY)
+ ? "Proxy-Authorization"
+ : "Authorization");
if (!auth_line) {
- auth_line = MK_TABLE_GET(r->headers_in, "Proxy-Authorization");
- if (!auth_line) {
- set_kerb_auth_headers(r, conf, use_krb4, use_krb5,
- (use_krb5) ? "\0" : NULL);
- return HTTP_UNAUTHORIZED;
- }
+ set_kerb_auth_headers(r, conf, use_krb4, use_krb5,
+ (use_krb5) ? "\0" : NULL);
+ return HTTP_UNAUTHORIZED;
}
auth_type = ap_getword_white(r->pool, &auth_line);
+ /* If we are delegating Basic to other modules, DECLINE the request */
+ if (conf->krb_delegate_basic &&
+#ifdef KRB5
+ !conf->krb_method_k5pass &&
+#endif
+#ifdef KRB4
+ !conf->krb_method_k4pass &&
+#endif
+ (strcasecmp(auth_type, "Basic") == 0))
+ return DECLINED;
+
if (already_succeeded(r))
return last_return;
NULL, /* process initialization */
NULL, /* process exit/cleanup */
NULL /* [ 1] post read_request handling */
+#ifdef EAPI
+ ,NULL, /* EAPI: add_module */
+ NULL, /* EAPI: remove_module */
+ NULL, /* EAPI: rewrite_command */
+ NULL /* EAPI: new_connection */
+#endif
};
#else
static int
projects / mod_auth_kerb.cvs / .git / blobdiff