From: Douglas Bagnall Date: Fri, 14 Nov 2025 07:05:57 +0000 (+1300) Subject: pytest:krb5: ms-kile-client tests notice lack of dollar matching X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ff29216761ce3d0c9fd320eb02dc5944769faf9;p=thirdparty%2Fsamba.git pytest:krb5: ms-kile-client tests notice lack of dollar matching In the ad_dc_ntvfs environment. Signed-off-by: Douglas Bagnall Reviewed-by: Jennifer Sutton --- diff --git a/python/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py b/python/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py index 23a3fce55ed..59be116a6bb 100755 --- a/python/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py +++ b/python/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py @@ -165,6 +165,13 @@ class MS_Kile_Client_Principal_Lookup_Tests(KDCBaseTest): name_type=NT_SRV_INST, names=["krbtgt", realm]) rep = self.as_req(cname, sname, realm, etype) + + if not self.uncanonicalized_implicit_dollar: + # we are explicitly not doing "step 2", so the principal + # should not be found. + self.check_error_rep(rep, KDC_ERR_C_PRINCIPAL_UNKNOWN) + return + self.check_pre_authentication(rep) # Do the next AS-REQ @@ -302,6 +309,11 @@ class MS_Kile_Client_Principal_Lookup_Tests(KDCBaseTest): name_type=NT_SRV_INST, names=["krbtgt", realm]) rep = self.as_req(cname, sname, realm, etype) + if not self.uncanonicalized_implicit_dollar: + # principal should not be found in this case + self.check_error_rep(rep, KDC_ERR_C_PRINCIPAL_UNKNOWN) + return + self.check_as_reply(rep) salt = "%s%s" % (realm.upper(), user_name) key = self.PasswordKey_create( @@ -356,6 +368,10 @@ class MS_Kile_Client_Principal_Lookup_Tests(KDCBaseTest): name_type=NT_SRV_INST, names=["krbtgt", realm]) rep = self.as_req(cname, sname, realm, etype) + if not self.uncanonicalized_implicit_dollar: + self.check_error_rep(rep, KDC_ERR_C_PRINCIPAL_UNKNOWN) + return + self.check_pre_authentication(rep) # Do the next AS-REQ @@ -421,6 +437,9 @@ class MS_Kile_Client_Principal_Lookup_Tests(KDCBaseTest): name_type=NT_SRV_INST, names=["krbtgt", realm]) rep = self.as_req(cname, sname, realm, etype) + if not self.uncanonicalized_implicit_dollar: + self.check_error_rep(rep, KDC_ERR_C_PRINCIPAL_UNKNOWN) + return self.check_pre_authentication(rep) # Do the next AS-REQ @@ -590,6 +609,10 @@ class MS_Kile_Client_Principal_Lookup_Tests(KDCBaseTest): name_type=NT_SRV_INST, names=["krbtgt", realm]) rep = self.as_req(cname, sname, realm, etype) + if not self.uncanonicalized_implicit_dollar: + self.check_error_rep(rep, KDC_ERR_C_PRINCIPAL_UNKNOWN) + return + self.check_pre_authentication(rep) # Do the next AS-REQ @@ -664,6 +687,10 @@ class MS_Kile_Client_Principal_Lookup_Tests(KDCBaseTest): name_type=NT_SRV_INST, names=["krbtgt", realm]) rep = self.as_req(cname, sname, realm, etype) + if not self.uncanonicalized_implicit_dollar: + self.check_error_rep(rep, KDC_ERR_C_PRINCIPAL_UNKNOWN) + return + self.check_as_reply(rep) salt = "%s%s" % (realm.upper(), user_name) key = self.PasswordKey_create( @@ -720,6 +747,10 @@ class MS_Kile_Client_Principal_Lookup_Tests(KDCBaseTest): name_type=NT_SRV_INST, names=["krbtgt", realm]) rep = self.as_req(cname, sname, realm, etype) + if not self.uncanonicalized_implicit_dollar: + self.check_error_rep(rep, KDC_ERR_C_PRINCIPAL_UNKNOWN) + return + self.check_pre_authentication(rep) # Do the next AS-REQ @@ -786,6 +817,9 @@ class MS_Kile_Client_Principal_Lookup_Tests(KDCBaseTest): name_type=NT_SRV_INST, names=["krbtgt", realm]) rep = self.as_req(cname, sname, realm, etype) + if not self.uncanonicalized_implicit_dollar: + self.check_error_rep(rep, KDC_ERR_C_PRINCIPAL_UNKNOWN) + return self.check_pre_authentication(rep) # Do the next AS-REQ diff --git a/selftest/knownfail.d/krb5-no-dollar b/selftest/knownfail.d/krb5-no-dollar index 278493e17d4..f96cc384589 100644 --- a/selftest/knownfail.d/krb5-no-dollar +++ b/selftest/knownfail.d/krb5-no-dollar @@ -1,6 +1,2 @@ -^samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.MS_Kile_Client_Principal_Lookup_Tests\.test_enterprise_principal_step_6_a\(ad_dc_ntvfs\) -^samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.MS_Kile_Client_Principal_Lookup_Tests\.test_nt_enterprise_principal_step_6_b\(ad_dc_ntvfs\) -^samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.MS_Kile_Client_Principal_Lookup_Tests\.test_nt_principal_step_4_a\(ad_dc_ntvfs\) -^samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.MS_Kile_Client_Principal_Lookup_Tests\.test_nt_principal_step_4_b\(ad_dc_ntvfs\) -^samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.MS_Kile_Client_Principal_Lookup_Tests\.test_nt_principal_step_4_c\(ad_dc_ntvfs\) -^samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.MS_Kile_Client_Principal_Lookup_Tests\.test_nt_principal_step_6_c\(ad_dc_ntvfs\) +^samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.MS_Kile_Client_Principal_Lookup_Tests\.test_enterprise_principal_step_5\(ad_dc_ntvfs\) +^samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.samba\.tests\.krb5\.ms_kile_client_principal_lookup_tests\.MS_Kile_Client_Principal_Lookup_Tests\.test_nt_principal_step_2\(ad_dc_ntvfs\)