From 6e999eab1c3ffd79730f9003f7f284b51a840a15 Mon Sep 17 00:00:00 2001 From: Joseph Sutton Date: Wed, 1 Nov 2023 13:55:14 +1300 Subject: [PATCH] =?utf8?q?tests/krb5:=20Test=20performing=20a=20FAST?= =?utf8?q?=E2=80=90armored=20TGS=E2=80=90REQ=20when=20the=20TGT=20already?= =?utf8?q?=20contains=20device=20info/claims?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett --- .../samba/tests/krb5/conditional_ace_tests.py | 52 +++++++++++++++++++ selftest/knownfail_heimdal_kdc | 8 +++ selftest/knownfail_mit_kdc | 12 +++++ 3 files changed, 72 insertions(+) diff --git a/python/samba/tests/krb5/conditional_ace_tests.py b/python/samba/tests/krb5/conditional_ace_tests.py index 70a34c8e330..5249d578bb1 100755 --- a/python/samba/tests/krb5/conditional_ace_tests.py +++ b/python/samba/tests/krb5/conditional_ace_tests.py @@ -4255,12 +4255,64 @@ class TgsReqServicePolicyTests(ConditionalAceBaseTests): def test_pac_device_info(self): self._run_pac_device_info_test() + def test_pac_device_info_existing_device_info(self): + self._run_pac_device_info_test(existing_device_info=True) + + def test_pac_device_info_existing_device_claims(self): + self._run_pac_device_info_test(existing_device_claims=True) + + def test_pac_device_info_existing_device_info_and_claims(self): + self._run_pac_device_info_test(existing_device_claims=True, + existing_device_info=True) + def test_pac_device_info_no_compound_id_support(self): self._run_pac_device_info_test(compound_id_support=False) + def test_pac_device_info_no_compound_id_support_existing_device_info(self): + self._run_pac_device_info_test(compound_id_support=False, + existing_device_info=True) + + def test_pac_device_info_no_compound_id_support_existing_device_claims(self): + self._run_pac_device_info_test(compound_id_support=False, + existing_device_claims=True) + + def test_pac_device_info_no_compound_id_support_existing_device_info_and_claims(self): + self._run_pac_device_info_test(compound_id_support=False, + existing_device_claims=True, + existing_device_info=True) + + def test_pac_device_info_no_compound_id_support_no_claims_valid_existing_device_info(self): + self._run_pac_device_info_test(device_claims_valid=False, + compound_id_support=False, + existing_device_info=True) + + def test_pac_device_info_no_compound_id_support_no_claims_valid_existing_device_claims(self): + self._run_pac_device_info_test(device_claims_valid=False, + compound_id_support=False, + existing_device_claims=True) + + def test_pac_device_info_no_compound_id_support_no_claims_valid_existing_device_info_and_claims(self): + self._run_pac_device_info_test(device_claims_valid=False, + compound_id_support=False, + existing_device_claims=True, + existing_device_info=True) + def test_pac_device_info_no_claims_valid(self): self._run_pac_device_info_test(device_claims_valid=False) + def test_pac_device_info_no_claims_valid_existing_device_info(self): + self._run_pac_device_info_test(device_claims_valid=False, + existing_device_info=True) + + def test_pac_device_info_no_claims_valid_existing_device_claims(self): + self._run_pac_device_info_test(device_claims_valid=False, + existing_device_claims=True) + + def test_pac_device_info_no_claims_valid_existing_device_info_and_claims(self): + self._run_pac_device_info_test(device_claims_valid=False, + existing_device_claims=True, + existing_device_info=True) + def _run_pac_device_info_test(self, *, compound_id_support=True, device_claims_valid=True, diff --git a/selftest/knownfail_heimdal_kdc b/selftest/knownfail_heimdal_kdc index c10b7df1f2c..97ec5cc5ab3 100644 --- a/selftest/knownfail_heimdal_kdc +++ b/selftest/knownfail_heimdal_kdc @@ -133,3 +133,11 @@ ^samba\.tests\.krb5\.conditional_ace_tests\.samba\.tests\.krb5\.conditional_ace_tests\.ConditionalAceTests\.test_device_in_network_group_rbcd\(ad_dc\)$ ^samba\.tests\.krb5\.conditional_ace_tests\.samba\.tests\.krb5\.conditional_ace_tests\.DeviceRestrictionTests\.test_device_in_network_group\(ad_dc\)$ ^samba\.tests\.krb5\.conditional_ace_tests\.samba\.tests\.krb5\.conditional_ace_tests\.TgsReqServicePolicyTests\.test_device_in_network_group\(ad_dc\)$ +^samba\.tests\.krb5\.conditional_ace_tests\.samba\.tests\.krb5\.conditional_ace_tests\.TgsReqServicePolicyTests\.test_pac_device_info_existing_device_claims\(ad_dc\)$ +^samba\.tests\.krb5\.conditional_ace_tests\.samba\.tests\.krb5\.conditional_ace_tests\.TgsReqServicePolicyTests\.test_pac_device_info_existing_device_info_and_claims\(ad_dc\)$ +^samba\.tests\.krb5\.conditional_ace_tests\.samba\.tests\.krb5\.conditional_ace_tests\.TgsReqServicePolicyTests\.test_pac_device_info_existing_device_info\(ad_dc\)$ +^samba\.tests\.krb5\.conditional_ace_tests\.samba\.tests\.krb5\.conditional_ace_tests\.TgsReqServicePolicyTests\.test_pac_device_info_no_claims_valid_existing_device_claims\(ad_dc\)$ +^samba\.tests\.krb5\.conditional_ace_tests\.samba\.tests\.krb5\.conditional_ace_tests\.TgsReqServicePolicyTests\.test_pac_device_info_no_claims_valid_existing_device_info_and_claims\(ad_dc\)$ +^samba\.tests\.krb5\.conditional_ace_tests\.samba\.tests\.krb5\.conditional_ace_tests\.TgsReqServicePolicyTests\.test_pac_device_info_no_claims_valid_existing_device_info\(ad_dc\)$ +^samba\.tests\.krb5\.conditional_ace_tests\.samba\.tests\.krb5\.conditional_ace_tests\.TgsReqServicePolicyTests\.test_pac_device_info_no_compound_id_support_existing_device_claims\(ad_dc\)$ +^samba\.tests\.krb5\.conditional_ace_tests\.samba\.tests\.krb5\.conditional_ace_tests\.TgsReqServicePolicyTests\.test_pac_device_info_no_compound_id_support_no_claims_valid_existing_device_claims\(ad_dc\)$ diff --git a/selftest/knownfail_mit_kdc b/selftest/knownfail_mit_kdc index 983c817721b..f2df39dee9d 100644 --- a/selftest/knownfail_mit_kdc +++ b/selftest/knownfail_mit_kdc @@ -4118,4 +4118,16 @@ samba.tests.krb5.as_canonicalization_tests.samba.tests.krb5.as_canonicalization_ ^samba.tests.krb5.conditional_ace_tests.samba.tests.krb5.conditional_ace_tests.TgsReqServicePolicyTests.test_device_in_network_group\(ad_dc\)$ ^samba.tests.krb5.conditional_ace_tests.samba.tests.krb5.conditional_ace_tests.TgsReqServicePolicyTests.test_device_in_service_asserted_identity\(ad_dc\)$ ^samba.tests.krb5.conditional_ace_tests.samba.tests.krb5.conditional_ace_tests.TgsReqServicePolicyTests.test_device_in_world_group\(ad_dc\)$ +^samba.tests.krb5.conditional_ace_tests.samba.tests.krb5.conditional_ace_tests.TgsReqServicePolicyTests.test_pac_device_info_existing_device_claims\(ad_dc\)$ +^samba.tests.krb5.conditional_ace_tests.samba.tests.krb5.conditional_ace_tests.TgsReqServicePolicyTests.test_pac_device_info_existing_device_info_and_claims\(ad_dc\)$ +^samba.tests.krb5.conditional_ace_tests.samba.tests.krb5.conditional_ace_tests.TgsReqServicePolicyTests.test_pac_device_info_existing_device_info\(ad_dc\)$ +^samba.tests.krb5.conditional_ace_tests.samba.tests.krb5.conditional_ace_tests.TgsReqServicePolicyTests.test_pac_device_info_no_claims_valid_existing_device_claims\(ad_dc\)$ +^samba.tests.krb5.conditional_ace_tests.samba.tests.krb5.conditional_ace_tests.TgsReqServicePolicyTests.test_pac_device_info_no_claims_valid_existing_device_info_and_claims\(ad_dc\)$ +^samba.tests.krb5.conditional_ace_tests.samba.tests.krb5.conditional_ace_tests.TgsReqServicePolicyTests.test_pac_device_info_no_claims_valid_existing_device_info\(ad_dc\)$ +^samba.tests.krb5.conditional_ace_tests.samba.tests.krb5.conditional_ace_tests.TgsReqServicePolicyTests.test_pac_device_info_no_compound_id_support_existing_device_claims\(ad_dc\)$ +^samba.tests.krb5.conditional_ace_tests.samba.tests.krb5.conditional_ace_tests.TgsReqServicePolicyTests.test_pac_device_info_no_compound_id_support_existing_device_info_and_claims\(ad_dc\)$ +^samba.tests.krb5.conditional_ace_tests.samba.tests.krb5.conditional_ace_tests.TgsReqServicePolicyTests.test_pac_device_info_no_compound_id_support_existing_device_info\(ad_dc\)$ +^samba.tests.krb5.conditional_ace_tests.samba.tests.krb5.conditional_ace_tests.TgsReqServicePolicyTests.test_pac_device_info_no_compound_id_support_no_claims_valid_existing_device_claims\(ad_dc\)$ +^samba.tests.krb5.conditional_ace_tests.samba.tests.krb5.conditional_ace_tests.TgsReqServicePolicyTests.test_pac_device_info_no_compound_id_support_no_claims_valid_existing_device_info_and_claims\(ad_dc\)$ +^samba.tests.krb5.conditional_ace_tests.samba.tests.krb5.conditional_ace_tests.TgsReqServicePolicyTests.test_pac_device_info_no_compound_id_support_no_claims_valid_existing_device_info\(ad_dc\)$ ^samba.tests.krb5.conditional_ace_tests.samba.tests.krb5.conditional_ace_tests.TgsReqServicePolicyTests.test_simple_as_req_client_and_target_policy\(ad_dc\) -- 2.47.3