682dc07d28
- pull up fix for not calling a kdb plugin's check-transited-path method before calling the library's default version, which only knows how to read what's in the configuration file (RT#7709, #1013664)
57 lines
2.2 KiB
Diff
57 lines
2.2 KiB
Diff
commit 0406cd81ef9d18cd505fffabba3ac78901dc797d
|
|
Author: Greg Hudson <ghudson@mit.edu>
|
|
Date: Wed Sep 25 10:40:23 2013 -0400
|
|
|
|
Support authoritative KDB check_transited methods
|
|
|
|
In kdc_check_transited_list, consult the KDB module first. If it
|
|
succeeds, treat this as authoritative and do not use the core
|
|
transited mechanisms. Modules can return KRB5_PLUGIN_NO_HANDLE to
|
|
fall back to core mechanisms.
|
|
|
|
ticket: 7709
|
|
|
|
diff --git a/src/include/kdb.h b/src/include/kdb.h
|
|
index bc01976..69817bc 100644
|
|
--- a/src/include/kdb.h
|
|
+++ b/src/include/kdb.h
|
|
@@ -1261,8 +1261,9 @@ typedef struct _kdb_vftabl {
|
|
|
|
/*
|
|
* Optional: Perform a policy check on a cross-realm ticket's transited
|
|
- * field and return an error (other than KRB5_PLUGIN_OP_NOTSUPP) if the
|
|
- * check fails.
|
|
+ * field. Return 0 if the check authoritatively succeeds,
|
|
+ * KRB5_PLUGIN_NO_HANDLE to use the core transited-checking mechanisms, or
|
|
+ * another error (other than KRB5_PLUGIN_OP_NOTSUPP) if the check fails.
|
|
*/
|
|
krb5_error_code (*check_transited_realms)(krb5_context kcontext,
|
|
const krb5_data *tr_contents,
|
|
diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
|
|
index bc638c1..5409078 100644
|
|
--- a/src/kdc/kdc_util.c
|
|
+++ b/src/kdc/kdc_util.c
|
|
@@ -1573,16 +1573,14 @@ kdc_check_transited_list(kdc_realm_t *kdc_active_realm,
|
|
{
|
|
krb5_error_code code;
|
|
|
|
- /* Check using krb5.conf */
|
|
- code = krb5_check_transited_list(kdc_context, trans, realm1, realm2);
|
|
- if (code)
|
|
+ /* Check against the KDB module. Treat this answer as authoritative if the
|
|
+ * method is supported and doesn't explicitly pass control. */
|
|
+ code = krb5_db_check_transited_realms(kdc_context, trans, realm1, realm2);
|
|
+ if (code != KRB5_PLUGIN_OP_NOTSUPP && code != KRB5_PLUGIN_NO_HANDLE)
|
|
return code;
|
|
|
|
- /* Check against the KDB module. */
|
|
- code = krb5_db_check_transited_realms(kdc_context, trans, realm1, realm2);
|
|
- if (code == KRB5_PLUGIN_OP_NOTSUPP)
|
|
- code = 0;
|
|
- return code;
|
|
+ /* Check using krb5.conf [capaths] or hierarchical relationships. */
|
|
+ return krb5_check_transited_list(kdc_context, trans, realm1, realm2);
|
|
}
|
|
|
|
krb5_error_code
|