ad trust: accept subordinate domains of the forest trust root
Commit 8b6d1ab854 added support for
subordinate UPN suffixes but missed the case where subordinate UPN is a
subdomain of the forest root domain and not mentioned in the UPN
suffixes list.
Correct this situation by applying the same check to the trusted domain
name as well.
Fixes: https://pagure.io/freeipa/issue/8554
Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
1 parent
7e605e958e
commit
381cc5e8ea
1 file changed
+11
-1
@@ -2975,10 +2975,20 @@ krb5_error_code ipadb_is_princ_from_trusted_realm(krb5_context kcontext,
|
||||
|
||||
/* Iterate through list of trusts and check if input realm belongs to any of the trust */
|
||||
for(i = 0 ; i < ipactx->mspac->num_trusts ; i++) {
|
||||
size_t len = 0;
|
||||
result = strncasecmp(test_realm,
|
||||
ipactx->mspac->trusts[i].domain_name,
|
||||
size) == 0;
|
||||
|
||||
if (!result) {
|
||||
len = strlen(ipactx->mspac->trusts[i].domain_name);
|
||||
if ((size > len) && (test_realm[size - len - 1] == '.')) {
|
||||
result = strncasecmp(test_realm + (size - len),
|
||||
ipactx->mspac->trusts[i].domain_name,
|
||||
len) == 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (!result && (ipactx->mspac->trusts[i].flat_name != NULL)) {
|
||||
result = strncasecmp(test_realm,
|
||||
ipactx->mspac->trusts[i].flat_name,
|
||||
@@ -2994,7 +3004,7 @@ krb5_error_code ipadb_is_princ_from_trusted_realm(krb5_context kcontext,
|
||||
/* if UPN suffix did not match exactly, find if it is
|
||||
* superior to the test_realm, e.g. if test_realm ends
|
||||
* with the UPN suffix prefixed with dot*/
|
||||
size_t len = ipactx->mspac->trusts[i].upn_suffixes_len[j];
|
||||
len = ipactx->mspac->trusts[i].upn_suffixes_len[j];
|
||||
if ((size > len) && (test_realm[size - len - 1] == '.')) {
|
||||
result = strncasecmp(test_realm + (size - len),
|
||||
ipactx->mspac->trusts[i].upn_suffixes[j],
|
||||
|
||||
Reference in new issue
Block a user