|
 |
d738b9 |
From 97a39c0048344c43af4006a4b9e7da609095510d Mon Sep 17 00:00:00 2001
|
|
|
d738b9 |
From: Robbie Harwood <rharwood@redhat.com>
|
|
|
d738b9 |
Date: Mon, 13 Nov 2017 13:32:37 -0500
|
|
|
d738b9 |
Subject: [PATCH] Expose context errors in pkinit_server_plugin_init
|
|
|
d738b9 |
|
|
|
d738b9 |
Commit 3ff426b9048a8024e5c175256c63cd0ad0572320 attempted to display
|
|
|
d738b9 |
an error when OCSP support was requested, but this error message was
|
|
|
d738b9 |
suppressed in pkinit_server_plugin_init(). Add a trace log for each
|
|
|
d738b9 |
realm initialization error, and pass through the realm initialization
|
|
|
d738b9 |
error when the KDC serves only one realm. Other error messages from
|
|
|
d738b9 |
pkinit_init_kdc_profile(), such as missing pkinit_identity or
|
|
|
d738b9 |
pkinit_anchors, are also now exposted.
|
|
|
d738b9 |
|
|
|
d738b9 |
[ghudson@mit.edu: clarified commit message]
|
|
|
d738b9 |
|
|
|
d738b9 |
ticket: 8621 (new)
|
|
|
d738b9 |
target_version: 1.16
|
|
|
d738b9 |
tags: pullup
|
|
|
d738b9 |
|
|
|
d738b9 |
(cherry picked from commit 225aab3540c13c6289b22022d5e110f6fc26151d)
|
|
|
d738b9 |
---
|
|
|
d738b9 |
src/plugins/preauth/pkinit/pkinit_srv.c | 19 +++++++++++++------
|
|
|
d738b9 |
src/plugins/preauth/pkinit/pkinit_trace.h | 3 +++
|
|
|
d738b9 |
2 files changed, 16 insertions(+), 6 deletions(-)
|
|
|
d738b9 |
|
|
|
d738b9 |
diff --git a/src/plugins/preauth/pkinit/pkinit_srv.c b/src/plugins/preauth/pkinit/pkinit_srv.c
|
|
|
d738b9 |
index 8e77606f8..143d331a2 100644
|
|
|
d738b9 |
--- a/src/plugins/preauth/pkinit/pkinit_srv.c
|
|
|
d738b9 |
+++ b/src/plugins/preauth/pkinit/pkinit_srv.c
|
|
|
d738b9 |
@@ -1622,16 +1622,23 @@ pkinit_server_plugin_init(krb5_context context,
|
|
|
d738b9 |
|
|
|
d738b9 |
for (i = 0, j = 0; i < numrealms; i++) {
|
|
|
d738b9 |
TRACE_PKINIT_SERVER_INIT_REALM(context, realmnames[i]);
|
|
|
d738b9 |
- retval = pkinit_server_plugin_init_realm(context, realmnames[i], &plgctx);
|
|
|
d738b9 |
- if (retval == 0 && plgctx != NULL)
|
|
|
d738b9 |
+ krb5_clear_error_message(context);
|
|
|
d738b9 |
+ retval = pkinit_server_plugin_init_realm(context, realmnames[i],
|
|
|
d738b9 |
+ &plgctx);
|
|
|
d738b9 |
+ if (retval)
|
|
|
d738b9 |
+ TRACE_PKINIT_SERVER_INIT_FAIL(context, realmnames[i], retval);
|
|
|
d738b9 |
+ else
|
|
|
d738b9 |
realm_contexts[j++] = plgctx;
|
|
|
d738b9 |
}
|
|
|
d738b9 |
|
|
|
d738b9 |
if (j == 0) {
|
|
|
d738b9 |
- retval = EINVAL;
|
|
|
d738b9 |
- krb5_set_error_message(context, retval,
|
|
|
d738b9 |
- _("No realms configured correctly for pkinit "
|
|
|
d738b9 |
- "support"));
|
|
|
d738b9 |
+ if (numrealms == 1) {
|
|
|
d738b9 |
+ k5_prependmsg(context, retval, "PKINIT initialization failed");
|
|
|
d738b9 |
+ } else {
|
|
|
d738b9 |
+ retval = EINVAL;
|
|
|
d738b9 |
+ k5_setmsg(context, retval,
|
|
|
d738b9 |
+ _("No realms configured correctly for pkinit support"));
|
|
|
d738b9 |
+ }
|
|
|
d738b9 |
goto errout;
|
|
|
d738b9 |
}
|
|
|
d738b9 |
|
|
|
d738b9 |
diff --git a/src/plugins/preauth/pkinit/pkinit_trace.h b/src/plugins/preauth/pkinit/pkinit_trace.h
|
|
|
d738b9 |
index 6abe28c0c..8d489469f 100644
|
|
|
d738b9 |
--- a/src/plugins/preauth/pkinit/pkinit_trace.h
|
|
|
d738b9 |
+++ b/src/plugins/preauth/pkinit/pkinit_trace.h
|
|
|
d738b9 |
@@ -100,6 +100,9 @@
|
|
|
d738b9 |
TRACE(c, "PKINIT server skipping EKU check due to configuration")
|
|
|
d738b9 |
#define TRACE_PKINIT_SERVER_INIT_REALM(c, realm) \
|
|
|
d738b9 |
TRACE(c, "PKINIT server initializing realm {str}", realm)
|
|
|
d738b9 |
+#define TRACE_PKINIT_SERVER_INIT_FAIL(c, realm, retval) \
|
|
|
d738b9 |
+ TRACE(c, "PKINIT server initialization failed for realm {str}: {kerr}", \
|
|
|
d738b9 |
+ realm, retval)
|
|
|
d738b9 |
#define TRACE_PKINIT_SERVER_MATCHING_UPN_FOUND(c) \
|
|
|
d738b9 |
TRACE(c, "PKINIT server found a matching UPN SAN in client cert")
|
|
|
d738b9 |
#define TRACE_PKINIT_SERVER_MATCHING_SAN_FOUND(c) \
|