]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
tests/krb5: Make use of KerberosCredentials.get_sid()
authorJoseph Sutton <josephsutton@catalyst.net.nz>
Tue, 13 Jun 2023 22:51:54 +0000 (10:51 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 14 Jun 2023 22:57:35 +0000 (22:57 +0000)
KerberosCredentials objects now keep track of their account’s SID, which
removes the need to look it up with KDCBaseTest.get_objectSid().

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
python/samba/tests/krb5/alias_tests.py
python/samba/tests/krb5/authn_policy_tests.py
python/samba/tests/krb5/claims_tests.py
python/samba/tests/krb5/device_tests.py
python/samba/tests/krb5/group_tests.py
python/samba/tests/krb5/kdc_base_test.py
python/samba/tests/krb5/kdc_tgs_tests.py
python/samba/tests/krb5/kpasswd_tests.py
python/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
python/samba/tests/krb5/s4u_tests.py

index 3ddfe4ecc75366c6545d632f7da65e12c04b4605..a6a3d0389fa8ae82a1f62cb4f015a56c148515ca 100755 (executable)
@@ -94,7 +94,7 @@ class AliasTests(KDCBaseTest):
             samdb, mach_name, account_type=self.AccountType.COMPUTER)
         self.addCleanup(delete_force, samdb, mach_dn)
 
-        mach_sid = self.get_objectSid(samdb, mach_dn)
+        mach_sid = mach_creds.get_sid()
         realm = mach_creds.get_realm()
 
         # The account salt doesn't change when the account is renamed.
index deae14b504bbe0228c68c2fabeeab301d7102bad..d4040ec542f05423b31de94e7960442293fd8ff9 100755 (executable)
@@ -1340,18 +1340,15 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         self._get_tgt(client_creds, armor_tgt=mach_tgt)
 
     def test_authn_policy_allowed_from_user_allow(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
         mach_tgt = self.get_tgt(mach_creds)
-        mach_sid = self.get_objectSid(samdb, mach_creds.get_dn())
 
         # Create an authentication policy that explicitly allows the machine
         # account for a user. Include some different TGT lifetimes for testing
         # what gets logged.
-        allowed = f'O:SYD:(A;;CR;;;{mach_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{mach_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -1370,19 +1367,16 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         self._get_tgt(client_creds, armor_tgt=mach_tgt)
 
     def test_authn_policy_allowed_from_user_deny(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
         mach_tgt = self.get_tgt(mach_creds)
-        mach_sid = self.get_objectSid(samdb, mach_creds.get_dn())
 
         # Create an authentication policy that explicitly denies the machine
         # account for a user. Include some different TGT lifetimes for testing
         # what gets logged.
         allowed = 'O:SYD:(A;;CR;;;WD)'
-        denied = f'O:SYD:(D;;CR;;;{mach_sid})'
+        denied = f'O:SYD:(D;;CR;;;{mach_creds.get_sid()})'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
                                           enforced=True,
@@ -1401,17 +1395,14 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       expected_error=KDC_ERR_POLICY)
 
     def test_authn_policy_allowed_from_service_allow(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
         mach_tgt = self.get_tgt(mach_creds)
-        mach_sid = self.get_objectSid(samdb, mach_creds.get_dn())
 
         # Create an authentication policy that explicitly allows the machine
         # account for a service.
-        allowed = f'O:SYD:(A;;CR;;;{mach_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{mach_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -1428,18 +1419,15 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         self._get_tgt(client_creds, armor_tgt=mach_tgt)
 
     def test_authn_policy_allowed_from_service_deny(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
         mach_tgt = self.get_tgt(mach_creds)
-        mach_sid = self.get_objectSid(samdb, mach_creds.get_dn())
 
         # Create an authentication policy that explicitly denies the machine
         # account for a service.
         allowed = 'O:SYD:(A;;CR;;;WD)'
-        denied = f'O:SYD:(D;;CR;;;{mach_sid})'
+        denied = f'O:SYD:(D;;CR;;;{mach_creds.get_sid()})'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
                                           enforced=True,
@@ -1500,17 +1488,14 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         self._get_tgt(client_creds, armor_tgt=mach_tgt)
 
     def test_authn_policy_allowed_from_owner_self(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
         mach_tgt = self.get_tgt(mach_creds)
-        mach_sid = self.get_objectSid(samdb, mach_creds.get_dn())
 
         # Create an authentication policy that explicitly allows the machine
         # account for a user. Set the owner to the machine account.
-        allowed = f'O:{mach_sid}D:(A;;CR;;;WD)'
+        allowed = f'O:{mach_creds.get_sid()}D:(A;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
                                           enforced=True,
@@ -1808,18 +1793,15 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       expected_error=KDC_ERR_POLICY)
 
     def test_authn_policy_allowed_from_user_allow_from_rodc(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self._get_creds(account_type=self.AccountType.COMPUTER,
                                      allowed_rodc=True)
         # Modify the TGT to be issued by an RODC.
         mach_tgt = self.issued_by_rodc(self.get_tgt(mach_creds))
-        mach_sid = self.get_objectSid(samdb, mach_creds.get_dn())
 
         # Create an authentication policy that explicitly allows the machine
         # account for a user.
-        allowed = f'O:SYD:(A;;CR;;;{mach_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{mach_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -1835,19 +1817,16 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         self._get_tgt(client_creds, armor_tgt=mach_tgt)
 
     def test_authn_policy_allowed_from_user_deny_from_rodc(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self._get_creds(account_type=self.AccountType.COMPUTER,
                                      allowed_rodc=True)
         # Modify the TGT to be issued by an RODC.
         mach_tgt = self.issued_by_rodc(self.get_tgt(mach_creds))
-        mach_sid = self.get_objectSid(samdb, mach_creds.get_dn())
 
         # Create an authentication policy that explicitly denies the machine
         # account for a user.
         allowed = 'O:SYD:(A;;CR;;;WD)'
-        denied = f'O:SYD:(D;;CR;;;{mach_sid})'
+        denied = f'O:SYD:(D;;CR;;;{mach_creds.get_sid()})'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
                                           enforced=True,
@@ -1863,18 +1842,15 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       expected_error=KDC_ERR_POLICY)
 
     def test_authn_policy_allowed_from_service_allow_from_rodc(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self._get_creds(account_type=self.AccountType.COMPUTER,
                                      allowed_rodc=True)
         # Modify the TGT to be issued by an RODC.
         mach_tgt = self.issued_by_rodc(self.get_tgt(mach_creds))
-        mach_sid = self.get_objectSid(samdb, mach_creds.get_dn())
 
         # Create an authentication policy that explicitly allows the machine
         # account for a service.
-        allowed = f'O:SYD:(A;;CR;;;{mach_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{mach_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -1891,19 +1867,16 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         self._get_tgt(client_creds, armor_tgt=mach_tgt)
 
     def test_authn_policy_allowed_from_service_deny_from_rodc(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self._get_creds(account_type=self.AccountType.COMPUTER,
                                      allowed_rodc=True)
         # Modify the TGT to be issued by an RODC.
         mach_tgt = self.issued_by_rodc(self.get_tgt(mach_creds))
-        mach_sid = self.get_objectSid(samdb, mach_creds.get_dn())
 
         # Create an authentication policy that explicitly denies the machine
         # account for a service.
         allowed = 'O:SYD:(A;;CR;;;WD)'
-        denied = f'O:SYD:(D;;CR;;;{mach_sid})'
+        denied = f'O:SYD:(D;;CR;;;{mach_creds.get_sid()})'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
                                           enforced=True,
@@ -2142,14 +2115,14 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
         mach_tgt = self.get_tgt(mach_creds)
-        mach_sid = self.get_objectSid(samdb, mach_creds.get_dn())
+        mach_sid = mach_creds.get_sid()
 
         # Create a user account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER,
             use_cache=False)
         client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
+        client_sid = client_creds.get_sid()
 
         # Create an authentication policy that explicitly allows the machine
         # account for a user, while denying the user account itself.
@@ -2196,8 +2169,6 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       armor_tgt=mach_tgt)
 
     def test_authn_policy_allowed_to_computer_allow(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
@@ -2206,12 +2177,11 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a computer and
         # explicitly allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -2229,8 +2199,6 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       armor_tgt=mach_tgt)
 
     def test_authn_policy_allowed_to_computer_deny(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
@@ -2239,12 +2207,11 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a computer and
         # explicitly denies the user account to obtain a service ticket.
-        denied = f'O:SYD:(D;;CR;;;{client_sid})'
+        denied = f'O:SYD:(D;;CR;;;{client_creds.get_sid()})'
         allowed = 'O:SYD:(A;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -2268,18 +2235,16 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             check_patypes=False)
 
     def test_authn_policy_allowed_to_computer_allow_but_deny_mach(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
         mach_tgt = self.get_tgt(mach_creds)
-        mach_sid = self.get_objectSid(samdb, mach_creds.get_dn())
+        mach_sid = mach_creds.get_sid()
 
         # Create a user account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
+        client_sid = client_creds.get_sid()
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a computer and
@@ -2304,13 +2269,10 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       armor_tgt=mach_tgt)
 
     def test_authn_policy_allowed_to_computer_allow_mach(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
         mach_tgt = self.get_tgt(mach_creds)
-        mach_sid = self.get_objectSid(samdb, mach_creds.get_dn())
 
         # Create a user account.
         client_creds = self.get_cached_creds(
@@ -2319,7 +2281,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
 
         # Create an authentication policy that applies to a computer and
         # explicitly allows the machine account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{mach_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{mach_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -2343,17 +2305,14 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             check_patypes=False)
 
     def test_authn_policy_allowed_no_fast(self):
-        samdb = self.get_samdb()
-
         # Create a user account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a computer and
         # explicitly allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -2370,17 +2329,14 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         self._tgs_req(tgt, 0, client_creds, target_creds)
 
     def test_authn_policy_denied_no_fast(self):
-        samdb = self.get_samdb()
-
         # Create a user account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a computer and
         # explicitly disallows the user account to obtain a service ticket.
-        denied = f'O:SYD:(D;;CR;;;{client_sid})'
+        denied = f'O:SYD:(D;;CR;;;{client_creds.get_sid()})'
         allowed = 'O:SYD:(A;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -2567,8 +2523,6 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             check_patypes=False)
 
     def test_authn_policy_allowed_to_no_owner(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
@@ -2577,13 +2531,12 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a computer and
         # explicitly allows the user account to obtain a service ticket. Omit
         # the owner (O:SY) from the SDDL.
-        allowed = f'D:(A;;CR;;;{client_sid})'
+        allowed = f'D:(A;;CR;;;{client_creds.get_sid()})'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
                                           enforced=True,
@@ -2604,8 +2557,6 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       check_patypes=False)
 
     def test_authn_policy_allowed_to_no_owner_unenforced(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
@@ -2614,13 +2565,12 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         tgt = self.get_tgt(client_creds)
 
         # Create an unenforced authentication policy that applies to a computer
         # and explicitly allows the user account to obtain a service
         # ticket. Omit the owner (O:SY) from the SDDL.
-        allowed = f'D:(A;;CR;;;{client_sid})'
+        allowed = f'D:(A;;CR;;;{client_creds.get_sid()})'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
                                           enforced=False,
@@ -2635,8 +2585,6 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       armor_tgt=mach_tgt)
 
     def test_authn_policy_allowed_to_owner_self(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
@@ -2645,7 +2593,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
+        client_sid = client_creds.get_sid()
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a computer and
@@ -2666,8 +2614,6 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       armor_tgt=mach_tgt)
 
     def test_authn_policy_allowed_to_owner_anon(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
@@ -2676,13 +2622,12 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a computer and
         # explicitly allows the user account to obtain a service ticket. Set
         # the owner to be anonymous.
-        allowed = f'O:AND:(A;;CR;;;{client_sid})'
+        allowed = f'O:AND:(A;;CR;;;{client_creds.get_sid()})'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
                                           enforced=True,
@@ -2697,8 +2642,6 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       armor_tgt=mach_tgt)
 
     def test_authn_policy_allowed_to_user_allow(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
@@ -2707,12 +2650,11 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a user and explicitly
         # allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -2731,8 +2673,6 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       armor_tgt=mach_tgt)
 
     def test_authn_policy_allowed_to_user_deny(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
@@ -2741,12 +2681,11 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a user and
         # explicitly denies the user account to obtain a service ticket.
-        denied = f'O:SYD:(D;;CR;;;{client_sid})'
+        denied = f'O:SYD:(D;;CR;;;{client_creds.get_sid()})'
         allowed = 'O:SYD:(A;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -2771,8 +2710,6 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             check_patypes=False)
 
     def test_authn_policy_allowed_to_service_allow(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
@@ -2781,12 +2718,11 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a managed service and
         # explicitly allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -2805,8 +2741,6 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       armor_tgt=mach_tgt)
 
     def test_authn_policy_allowed_to_service_deny(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
@@ -2815,12 +2749,11 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a managed service and
         # explicitly denies the user account to obtain a service ticket.
-        denied = f'O:SYD:(D;;CR;;;{client_sid})'
+        denied = f'O:SYD:(D;;CR;;;{client_creds.get_sid()})'
         allowed = 'O:SYD:(A;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -2845,8 +2778,6 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             check_patypes=False)
 
     def test_authn_policy_allowed_to_user_allow_from_rodc(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
@@ -2855,13 +2786,12 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self._get_creds(account_type=self.AccountType.USER,
                                        allowed_rodc=True)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         # Modify the TGT to be issued by an RODC.
         tgt = self.issued_by_rodc(self.get_tgt(client_creds))
 
         # Create an authentication policy that applies to a user and explicitly
         # allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -2880,8 +2810,6 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       armor_tgt=mach_tgt)
 
     def test_authn_policy_allowed_to_user_deny_from_rodc(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
@@ -2890,13 +2818,12 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self._get_creds(account_type=self.AccountType.USER,
                                        allowed_rodc=True)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         # Modify the TGT to be issued by an RODC.
         tgt = self.issued_by_rodc(self.get_tgt(client_creds))
 
         # Create an authentication policy that applies to a user and
         # explicitly denies the user account to obtain a service ticket.
-        denied = f'O:SYD:(D;;CR;;;{client_sid})'
+        denied = f'O:SYD:(D;;CR;;;{client_creds.get_sid()})'
         allowed = 'O:SYD:(A;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -2920,8 +2847,6 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             expected_status=ntstatus.NT_STATUS_AUTHENTICATION_FIREWALL_FAILED)
 
     def test_authn_policy_allowed_to_computer_allow_from_rodc(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
@@ -2930,13 +2855,12 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self._get_creds(account_type=self.AccountType.USER,
                                        allowed_rodc=True)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         # Modify the TGT to be issued by an RODC.
         tgt = self.issued_by_rodc(self.get_tgt(client_creds))
 
         # Create an authentication policy that applies to a computer and
         # explicitly allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -2954,8 +2878,6 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       armor_tgt=mach_tgt)
 
     def test_authn_policy_allowed_to_computer_deny_from_rodc(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
@@ -2964,13 +2886,12 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self._get_creds(account_type=self.AccountType.USER,
                                        allowed_rodc=True)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         # Modify the TGT to be issued by an RODC.
         tgt = self.issued_by_rodc(self.get_tgt(client_creds))
 
         # Create an authentication policy that applies to a computer and
         # explicitly denies the user account to obtain a service ticket.
-        denied = f'O:SYD:(D;;CR;;;{client_sid})'
+        denied = f'O:SYD:(D;;CR;;;{client_creds.get_sid()})'
         allowed = 'O:SYD:(A;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -2993,8 +2914,6 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             expected_status=ntstatus.NT_STATUS_AUTHENTICATION_FIREWALL_FAILED,)
 
     def test_authn_policy_allowed_to_service_allow_from_rodc(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
@@ -3003,13 +2922,12 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self._get_creds(account_type=self.AccountType.USER,
                                        allowed_rodc=True)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         # Modify the TGT to be issued by an RODC.
         tgt = self.issued_by_rodc(self.get_tgt(client_creds))
 
         # Create an authentication policy that applies to a managed service and
         # explicitly allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -3028,8 +2946,6 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       armor_tgt=mach_tgt)
 
     def test_authn_policy_allowed_to_service_deny_from_rodc(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
@@ -3038,13 +2954,12 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self._get_creds(account_type=self.AccountType.USER,
                                        allowed_rodc=True)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         # Modify the TGT to be issued by an RODC.
         tgt = self.issued_by_rodc(self.get_tgt(client_creds))
 
         # Create an authentication policy that applies to a managed service and
         # explicitly denies the user account to obtain a service ticket.
-        denied = f'O:SYD:(D;;CR;;;{client_sid})'
+        denied = f'O:SYD:(D;;CR;;;{client_creds.get_sid()})'
         allowed = 'O:SYD:(A;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -3490,12 +3405,11 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             opts={'id': 1},
             use_cache=False)
         client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a computer and
         # explicitly allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -3526,12 +3440,11 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             opts={'id': 1},
             use_cache=False)
         client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a computer and
         # explicitly denies the user account to obtain a service ticket.
-        denied = f'O:SYD:(D;;CR;;;{client_sid})'
+        denied = f'O:SYD:(D;;CR;;;{client_creds.get_sid()})'
         allowed = 'O:SYD:(A;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -3557,12 +3470,11 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             account_type=self.AccountType.COMPUTER,
             use_cache=False)
         client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a computer and
         # explicitly allows the account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -3588,12 +3500,11 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             account_type=self.AccountType.COMPUTER,
             use_cache=False)
         client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a computer and
         # explicitly denies the account to obtain a service ticket.
-        denied = f'O:SYD:(D;;CR;;;{client_sid})'
+        denied = f'O:SYD:(D;;CR;;;{client_creds.get_sid()})'
         allowed = 'O:SYD:(A;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -3612,8 +3523,6 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       armor_tgt=tgt)
 
     def test_authn_policy_allowed_to_user_allow_s4u2self(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
@@ -3626,11 +3535,10 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             name_type=NT_PRINCIPAL,
             names=[client_creds.get_username()])
         client_realm = client_creds.get_realm()
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
 
         # Create an authentication policy that applies to a computer and
         # explicitly allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
                                           enforced=True,
@@ -3659,8 +3567,6 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       armor_tgt=mach_tgt)
 
     def test_authn_policy_allowed_to_user_deny_s4u2self(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
@@ -3673,11 +3579,10 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             name_type=NT_PRINCIPAL,
             names=[client_creds.get_username()])
         client_realm = client_creds.get_realm()
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
 
         # Create an authentication policy that applies to a computer and
         # explicitly denies the user account to obtain a service ticket.
-        denied = f'O:SYD:(D;;CR;;;{client_sid})'
+        denied = f'O:SYD:(D;;CR;;;{client_creds.get_sid()})'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
                                           enforced=True,
@@ -3711,8 +3616,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
 
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
+        client_sid = client_creds.get_sid()
 
         client_username = client_creds.get_username()
         client_cname = self.PrincipalName_create(name_type=NT_PRINCIPAL,
@@ -3742,7 +3646,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             opts={
                 'delegation_to_spn': target_spn,
             })
-        service_sid = self.get_objectSid(samdb, service_creds.get_dn())
+        service_sid = service_creds.get_sid()
         service_tgt = self.get_tgt(service_creds)
 
         # Create an authentication policy that applies to a computer and
@@ -3796,8 +3700,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
 
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
+        client_sid = client_creds.get_sid()
 
         client_tkt_options = 'forwardable'
         expected_flags = krb5_asn1.TicketFlags(client_tkt_options)
@@ -3823,7 +3726,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             opts={
                 'delegation_to_spn': target_spn,
             })
-        service_sid = self.get_objectSid(samdb, service_creds.get_dn())
+        service_sid = service_creds.get_sid()
         service_tgt = self.get_tgt(service_creds)
 
         # Create an authentication policy that applies to a computer and
@@ -3926,8 +3829,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
 
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
+        client_sid = client_creds.get_sid()
 
         client_username = client_creds.get_username()
         client_cname = self.PrincipalName_create(name_type=NT_PRINCIPAL,
@@ -3948,7 +3850,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         service_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER,
             opts={'id': 1})
-        service_sid = self.get_objectSid(samdb, service_creds.get_dn())
+        service_sid = service_creds.get_sid()
         service_tgt = self.get_tgt(service_creds)
 
         # Create an authentication policy that applies to a computer and
@@ -4010,8 +3912,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
 
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
+        client_sid = client_creds.get_sid()
 
         client_tkt_options = 'forwardable'
         expected_flags = krb5_asn1.TicketFlags(client_tkt_options)
@@ -4028,7 +3929,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         service_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER,
             opts={'id': 1})
-        service_sid = self.get_objectSid(samdb, service_creds.get_dn())
+        service_sid = service_creds.get_sid()
         service_tgt = self.get_tgt(service_creds)
 
         # Create an authentication policy that applies to a computer and
@@ -4135,8 +4036,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
 
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
+        client_sid = client_creds.get_sid()
 
         client_username = client_creds.get_username()
         client_cname = self.PrincipalName_create(name_type=NT_PRINCIPAL,
@@ -4161,7 +4061,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             use_cache=False)
         service_dn_str = str(service_creds.get_dn())
         service_spn = service_creds.get_spn()
-        service_sid = self.get_objectSid(samdb, service_creds.get_dn())
+        service_sid = service_creds.get_sid()
         service_tgt = self.get_tgt(service_creds)
 
         # Allow delegation to ourselves.
@@ -4219,8 +4119,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
 
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
+        client_sid = client_creds.get_sid()
 
         client_username = client_creds.get_username()
         client_cname = self.PrincipalName_create(name_type=NT_PRINCIPAL,
@@ -4245,7 +4144,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             use_cache=False)
         service_dn_str = str(service_creds.get_dn())
         service_spn = service_creds.get_spn()
-        service_sid = self.get_objectSid(samdb, service_creds.get_dn())
+        service_sid = service_creds.get_sid()
         service_tgt = self.get_tgt(service_creds)
 
         # Allow delegation to ourselves.
@@ -4303,8 +4202,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
 
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
+        client_sid = client_creds.get_sid()
 
         client_tkt_options = 'forwardable'
         expected_flags = krb5_asn1.TicketFlags(client_tkt_options)
@@ -4324,7 +4222,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             opts={'id': 1},
             use_cache=False)
         service_dn_str = str(service_creds.get_dn())
-        service_sid = self.get_objectSid(samdb, service_creds.get_dn())
+        service_sid = service_creds.get_sid()
         service_tgt = self.get_tgt(service_creds)
 
         # Don’t set msDS-AllowedToDelegateTo.
@@ -4373,8 +4271,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
 
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
+        client_sid = client_creds.get_sid()
 
         client_username = client_creds.get_username()
         client_cname = self.PrincipalName_create(name_type=NT_PRINCIPAL,
@@ -4404,7 +4301,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             opts={'delegation_from_dn': ndr_pack(security_descriptor)},
             use_cache=False)
         service_dn_str = str(service_creds.get_dn())
-        service_sid = self.get_objectSid(samdb, service_creds.get_dn())
+        service_sid = service_creds.get_sid()
         service_tgt = self.get_tgt(service_creds)
 
         # Create an authentication policy that applies to a computer and
@@ -4463,8 +4360,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
 
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
+        client_sid = client_creds.get_sid()
 
         client_username = client_creds.get_username()
         client_cname = self.PrincipalName_create(name_type=NT_PRINCIPAL,
@@ -4494,7 +4390,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             opts={'delegation_from_dn': ndr_pack(security_descriptor)},
             use_cache=False)
         service_dn_str = str(service_creds.get_dn())
-        service_sid = self.get_objectSid(samdb, service_creds.get_dn())
+        service_sid = service_creds.get_sid()
         service_tgt = self.get_tgt(service_creds)
 
         client_service_tkt = self.get_service_ticket(
@@ -4553,8 +4449,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
 
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
+        client_sid = client_creds.get_sid()
 
         client_tkt_options = 'forwardable'
         expected_flags = krb5_asn1.TicketFlags(client_tkt_options)
@@ -4574,7 +4469,7 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             opts={'id': 1},
             use_cache=False)
         service_dn_str = str(service_creds.get_dn())
-        service_sid = self.get_objectSid(samdb, service_creds.get_dn())
+        service_sid = service_creds.get_sid()
         service_tgt = self.get_tgt(service_creds)
 
         # Don’t set msDS-AllowedToActOnBehalfOfOtherIdentity.
@@ -4616,20 +4511,17 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       check_patypes=False)
 
     def test_authn_policy_allowed_to_computer_allow_user2user(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
         mach_tgt = self.get_tgt(mach_creds)
 
         client_creds = self.get_mach_creds()
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         client_tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a computer and
         # explicitly allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
                                           enforced=True,
@@ -4649,20 +4541,17 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                       additional_ticket=target_tgt)
 
     def test_authn_policy_allowed_to_computer_deny_user2user(self):
-        samdb = self.get_samdb()
-
         # Create a machine account with which to perform FAST.
         mach_creds = self.get_cached_creds(
             account_type=self.AccountType.COMPUTER)
         mach_tgt = self.get_tgt(mach_creds)
 
         client_creds = self.get_mach_creds()
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         client_tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a computer and
         # explicitly denies the user account to obtain a service ticket.
-        denied = f'O:SYD:(D;;CR;;;{client_sid})'
+        denied = f'O:SYD:(D;;CR;;;{client_creds.get_sid()})'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
                                           enforced=True,
@@ -4699,12 +4588,11 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a user and explicitly
         # allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -4758,12 +4646,11 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a computer and
         # explicitly allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -4817,12 +4704,11 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
         tgt = self.get_tgt(client_creds)
 
         # Create an authentication policy that applies to a managed service and
         # explicitly allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -5697,16 +5583,13 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                             logon_type=netlogon.NetlogonNetworkInformation)
 
     def test_samlogon_allowed_to_computer_allow(self):
-        samdb = self.get_samdb()
-
         # Create a user account.
         client_creds = self._get_creds(account_type=self.AccountType.USER,
                                        ntlm=True)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
 
         # Create an authentication policy that applies to a computer and
         # explicitly allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -5730,16 +5613,13 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                             logon_type=netlogon.NetlogonInteractiveInformation)
 
     def test_samlogon_allowed_to_computer_deny(self):
-        samdb = self.get_samdb()
-
         # Create a user account.
         client_creds = self._get_creds(account_type=self.AccountType.USER,
                                        ntlm=True)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
 
         # Create an authentication policy that applies to a computer and
         # explicitly denies the user account to obtain a service ticket.
-        denied = f'O:SYD:(D;;CR;;;{client_sid})'
+        denied = f'O:SYD:(D;;CR;;;{client_creds.get_sid()})'
         allowed = 'O:SYD:(A;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -5767,17 +5647,14 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             expect_error=ntstatus.NT_STATUS_AUTHENTICATION_FIREWALL_FAILED)
 
     def test_samlogon_allowed_to_computer_deny_protected(self):
-        samdb = self.get_samdb()
-
         # Create a protected user account.
         client_creds = self._get_creds(account_type=self.AccountType.USER,
                                        protected=True,
                                        ntlm=True)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
 
         # Create an authentication policy that applies to a computer and
         # explicitly denies the user account to obtain a service ticket.
-        denied = f'O:SYD:(D;;CR;;;{client_sid})'
+        denied = f'O:SYD:(D;;CR;;;{client_creds.get_sid()})'
         allowed = 'O:SYD:(A;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -5975,17 +5852,14 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             expect_error=ntstatus.NT_STATUS_AUTHENTICATION_FIREWALL_FAILED)
 
     def test_samlogon_allowed_to_no_owner(self):
-        samdb = self.get_samdb()
-
         # Create a user account.
         client_creds = self._get_creds(account_type=self.AccountType.USER,
                                        ntlm=True)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
 
         # Create an authentication policy that applies to a computer and
         # explicitly allows the user account to obtain a service ticket. Omit
         # the owner (O:SY) from the SDDL.
-        allowed = f'D:(A;;CR;;;{client_sid})'
+        allowed = f'D:(A;;CR;;;{client_creds.get_sid()})'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
                                           enforced=True,
@@ -6010,17 +5884,14 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             expect_error=ntstatus.NT_STATUS_INVALID_PARAMETER)
 
     def test_samlogon_allowed_to_no_owner_unenforced(self):
-        samdb = self.get_samdb()
-
         # Create a user account.
         client_creds = self._get_creds(account_type=self.AccountType.USER,
                                        ntlm=True)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
 
         # Create an unenforced authentication policy that applies to a computer
         # and explicitly allows the user account to obtain a service
         # ticket. Omit the owner (O:SY) from the SDDL.
-        allowed = f'D:(A;;CR;;;{client_sid})'
+        allowed = f'D:(A;;CR;;;{client_creds.get_sid()})'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
                                           enforced=False,
@@ -6041,16 +5912,13 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                             logon_type=netlogon.NetlogonInteractiveInformation)
 
     def test_samlogon_allowed_to_service_allow(self):
-        samdb = self.get_samdb()
-
         # Create a user account.
         client_creds = self._get_creds(account_type=self.AccountType.USER,
                                        ntlm=True)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
 
         # Create an authentication policy that applies to a managed service and
         # explicitly allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -6075,16 +5943,13 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                             logon_type=netlogon.NetlogonInteractiveInformation)
 
     def test_samlogon_allowed_to_service_deny(self):
-        samdb = self.get_samdb()
-
         # Create a user account.
         client_creds = self._get_creds(account_type=self.AccountType.USER,
                                        ntlm=True)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
 
         # Create an authentication policy that applies to a managed service and
         # explicitly denies the user account to obtain a service ticket.
-        denied = f'O:SYD:(D;;CR;;;{client_sid})'
+        denied = f'O:SYD:(D;;CR;;;{client_creds.get_sid()})'
         allowed = 'O:SYD:(A;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -6235,11 +6100,10 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                                        ntlm=True,
                                        cached=False)
         client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
 
         # Create an authentication policy that applies to a computer and
         # explicitly allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -6265,11 +6129,10 @@ class AuthnPolicyTests(KdcTgsBaseTests):
                                        ntlm=True,
                                        cached=False)
         client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
 
         # Create an authentication policy that applies to a computer and
         # explicitly denies the user account to obtain a service ticket.
-        denied = f'O:SYD:(D;;CR;;;{client_sid})'
+        denied = f'O:SYD:(D;;CR;;;{client_creds.get_sid()})'
         allowed = 'O:SYD:(A;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -6299,11 +6162,10 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             ntlm=True,
             cached=False)
         client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
 
         # Create an authentication policy that applies to a managed service and
         # explicitly allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -6330,11 +6192,10 @@ class AuthnPolicyTests(KdcTgsBaseTests):
             ntlm=True,
             cached=False)
         client_dn = client_creds.get_dn()
-        client_sid = self.get_objectSid(samdb, client_dn)
 
         # Create an authentication policy that applies to a managed service and
         # explicitly denies the user account to obtain a service ticket.
-        denied = f'O:SYD:(D;;CR;;;{client_sid})'
+        denied = f'O:SYD:(D;;CR;;;{client_creds.get_sid()})'
         allowed = 'O:SYD:(A;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -6361,11 +6222,10 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self._get_creds(account_type=self.AccountType.USER,
                                        ntlm=True)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
 
         # Create an authentication policy that applies to a computer and
         # explicitly allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
@@ -6420,11 +6280,10 @@ class AuthnPolicyTests(KdcTgsBaseTests):
         # Create a user account.
         client_creds = self._get_creds(account_type=self.AccountType.USER,
                                        ntlm=True)
-        client_sid = self.get_objectSid(samdb, client_creds.get_dn())
 
         # Create an authentication policy that applies to a managed service and
         # explicitly allows the user account to obtain a service ticket.
-        allowed = f'O:SYD:(A;;CR;;;{client_sid})'
+        allowed = f'O:SYD:(A;;CR;;;{client_creds.get_sid()})'
         denied = 'O:SYD:(D;;CR;;;WD)'
         policy_id = self.get_new_username()
         policy = self.create_authn_policy(policy_id,
index 66a62303183c31d6681584db30ea532394569d64..a531da7ecb0620f8f70607c267c7d6b1f7de637c 100755 (executable)
@@ -437,7 +437,7 @@ class ClaimsTests(KDCBaseTest):
         user_cname = self.PrincipalName_create(name_type=NT_PRINCIPAL,
                                                names=[user_name])
 
-        user_sid = self.get_objectSid(samdb, user_dn)
+        user_sid = user_creds.get_sid()
 
         mach_realm = mach_creds.get_realm()
 
@@ -1616,7 +1616,7 @@ class ClaimsTests(KDCBaseTest):
         user_creds = self.get_cached_creds(
             account_type=self.AccountType.USER)
         user_dn = user_creds.get_dn()
-        user_sid = self.get_objectSid(samdb, user_dn)
+        user_sid = user_creds.get_sid()
 
         mach_name = self.get_new_username()
         mach_creds, mach_dn_str = self.create_account(
@@ -1625,7 +1625,7 @@ class ClaimsTests(KDCBaseTest):
             account_type=self.AccountType.COMPUTER,
             additional_details=details)
         mach_dn = ldb.Dn(samdb, mach_dn_str)
-        mach_sid = self.get_objectSid(samdb, mach_dn)
+        mach_sid = mach_creds.get_sid()
 
         user_principal = Principal(user_dn, user_sid)
         mach_principal = Principal(mach_dn, mach_sid)
index ef65f874ec4a18f5c589373b39af7f1cb77c1e57..a1997ecb966b7e5c2627aceeff5f1444d17b0f01 100755 (executable)
@@ -1915,7 +1915,7 @@ class DeviceTests(KDCBaseTest):
             account_type=self.AccountType.USER,
             use_cache=user_use_cache)
         user_dn = user_creds.get_dn()
-        user_sid = self.get_objectSid(samdb, user_dn)
+        user_sid = user_creds.get_sid()
         user_name = user_creds.get_username()
 
         trust_user_rid = random.randint(2000, 0xfffffffe)
@@ -1942,7 +1942,7 @@ class DeviceTests(KDCBaseTest):
             use_cache=mach_use_cache)
         mach_dn = mach_creds.get_dn()
         mach_dn_str = str(mach_dn)
-        mach_sid = self.get_objectSid(samdb, mach_dn)
+        mach_sid = mach_creds.get_sid()
 
         user_principal = Principal(user_dn, user_sid)
         mach_principal = Principal(mach_dn, mach_sid)
index 9878438e99ba071c589a5feabd1d532ec1afb465..4d43ec4217f30876d2ab85a9f23ff1308ee2c022 100755 (executable)
@@ -221,7 +221,7 @@ class GroupTests(KDCBaseTest):
             })
 
         # Get the SID and RID of the user account.
-        user_sid = self.get_objectSid(samdb, creds.get_dn())
+        user_sid = creds.get_sid()
         user_rid = int(user_sid.rsplit('-', 1)[1])
 
         # Get the SID and RID of the universal group.
@@ -288,7 +288,7 @@ class GroupTests(KDCBaseTest):
             })
 
         # Get the SID and RID of the user account.
-        user_sid = self.get_objectSid(samdb, creds.get_dn())
+        user_sid = creds.get_sid()
         user_rid = int(user_sid.rsplit('-', 1)[1])
 
         # Get the SID and RID of the universal group.
@@ -365,7 +365,7 @@ class GroupTests(KDCBaseTest):
             })
 
         # Get the SID and RID of the user account.
-        user_sid = self.get_objectSid(samdb, creds.get_dn())
+        user_sid = creds.get_sid()
         user_rid = int(user_sid.rsplit('-', 1)[1])
 
         # Get the SID and RID of the universal group.
@@ -1809,7 +1809,7 @@ class GroupTests(KDCBaseTest):
             account_type=self.AccountType.USER,
             use_cache=False)
         user_dn = user_creds.get_dn()
-        user_sid = self.get_objectSid(samdb, user_dn)
+        user_sid = user_creds.get_sid()
         user_name = user_creds.get_username()
         salt = user_creds.get_salt()
 
index 774cf24bffae98cd677ed09ea20317f2441e34a8..aecddc00e8be199d79184d6993d74e52bf307a08 100644 (file)
@@ -3203,7 +3203,7 @@ class KDCBaseTest(TestCaseInTempDir, RawKerberosTest):
                           attrs=['tokenGroups'])
         self.assertEqual(1, len(res))
 
-        sid = self.get_objectSid(samdb, dn)
+        sid = creds.get_sid()
 
         token_groups = res[0].get('tokenGroups', idx=0)
         token_sid = ndr_unpack(security.dom_sid, token_groups)
index 171623cc5d71395bd835da5455ff0df3d113b3ff..5c766cf477ab095f8767a0a254e310eb257d6643 100755 (executable)
@@ -471,7 +471,7 @@ class KdcTgsTests(KdcTgsBaseTests):
         enc_part = self.decode_service_ticket(mc, ticket)
 
         pac_data = self.get_pac_data(enc_part['authorization-data'])
-        sid = self.get_objectSid(samdb, dn)
+        sid = uc.get_sid()
         upn = "%s@%s" % (uc.get_username(), realm)
         self.assertEqual(
             uc.get_username(),
@@ -896,7 +896,7 @@ class KdcTgsTests(KdcTgsBaseTests):
         if upn_name is None:
             realm = client_creds.get_realm().lower()
             upn_name = f'{account_name}@{realm}'
-        sid = self.get_objectSid(samdb, dn)
+        sid = client_creds.get_sid()
 
         tgt = self.get_tgt(client_creds,
                            expected_account_name=account_name,
@@ -2147,7 +2147,7 @@ class KdcTgsTests(KdcTgsBaseTests):
         creds = self._get_creds()
 
         samdb = self.get_samdb()
-        sid = self.get_objectSid(samdb, creds.get_dn())
+        sid = creds.get_sid()
 
         self.get_tgt(creds, pac_request=None,
                      expect_pac=True,
@@ -2158,7 +2158,7 @@ class KdcTgsTests(KdcTgsBaseTests):
         creds = self._get_creds()
 
         samdb = self.get_samdb()
-        sid = self.get_objectSid(samdb, creds.get_dn())
+        sid = creds.get_sid()
 
         tgt = self.get_tgt(creds, pac_request=None,
                            expect_pac=True,
@@ -2172,7 +2172,7 @@ class KdcTgsTests(KdcTgsBaseTests):
         creds = self._get_creds()
 
         samdb = self.get_samdb()
-        sid = self.get_objectSid(samdb, creds.get_dn())
+        sid = creds.get_sid()
 
         tgt = self.get_tgt(creds, pac_request=None,
                            expect_pac=True,
@@ -2191,7 +2191,7 @@ class KdcTgsTests(KdcTgsBaseTests):
                                 revealed_to_rodc=True)
 
         samdb = self.get_samdb()
-        sid = self.get_objectSid(samdb, creds.get_dn())
+        sid = creds.get_sid()
 
         tgt = self.get_tgt(creds, pac_request=None,
                            expect_pac=True,
@@ -2208,7 +2208,7 @@ class KdcTgsTests(KdcTgsBaseTests):
         creds = self._get_creds()
 
         samdb = self.get_samdb()
-        sid = self.get_objectSid(samdb, creds.get_dn())
+        sid = creds.get_sid()
 
         tgt = self.get_tgt(creds, pac_request=None,
                            expect_pac=True,
@@ -2224,7 +2224,7 @@ class KdcTgsTests(KdcTgsBaseTests):
                                 revealed_to_rodc=True)
 
         samdb = self.get_samdb()
-        sid = self.get_objectSid(samdb, creds.get_dn())
+        sid = creds.get_sid()
 
         tgt = self.get_tgt(creds, pac_request=None,
                            expect_pac=True,
@@ -2239,7 +2239,7 @@ class KdcTgsTests(KdcTgsBaseTests):
         creds = self._get_creds()
 
         samdb = self.get_samdb()
-        sid = self.get_objectSid(samdb, creds.get_dn())
+        sid = creds.get_sid()
 
         tgt = self.get_tgt(creds, pac_request=None,
                            expect_pac=True,
@@ -2258,7 +2258,7 @@ class KdcTgsTests(KdcTgsBaseTests):
                                 revealed_to_rodc=True)
 
         samdb = self.get_samdb()
-        sid = self.get_objectSid(samdb, creds.get_dn())
+        sid = creds.get_sid()
 
         tgt = self.get_tgt(creds, pac_request=None,
                            expect_pac=True,
@@ -2275,7 +2275,7 @@ class KdcTgsTests(KdcTgsBaseTests):
         creds = self._get_creds()
 
         samdb = self.get_samdb()
-        sid = self.get_objectSid(samdb, creds.get_dn())
+        sid = creds.get_sid()
 
         tgt = self.get_tgt(creds, pac_request=None,
                            expect_pac=True,
@@ -2291,7 +2291,7 @@ class KdcTgsTests(KdcTgsBaseTests):
                                 revealed_to_rodc=True)
 
         samdb = self.get_samdb()
-        sid = self.get_objectSid(samdb, creds.get_dn())
+        sid = creds.get_sid()
 
         tgt = self.get_tgt(creds, pac_request=None,
                            expect_pac=True,
@@ -2949,11 +2949,7 @@ class KdcTgsTests(KdcTgsBaseTests):
                 'id': 1
             })
 
-        samdb = self.get_samdb()
-
-        other_dn = other_creds.get_dn()
-        other_sid = self.get_objectSid(samdb, other_dn)
-
+        other_sid = other_creds.get_sid()
         other_rid = int(other_sid.rsplit('-', 1)[1])
 
         return other_rid
index 647ccbffa02947a6d1d9c2f9108f0f90a3217692..2ff72f24f5d028cd56c91cf1b566ad041bf8cb07 100755 (executable)
@@ -518,7 +518,7 @@ class KpasswdTests(KDCBaseTest):
         sd_utils = SDUtils(samdb)
 
         user_dn = creds.get_dn()
-        user_sid = self.get_objectSid(samdb, user_dn)
+        user_sid = creds.get_sid()
 
         # Give the user control access on their account.
         ace = f'(A;;CR;;;{user_sid})'
@@ -636,17 +636,11 @@ class KpasswdTests(KDCBaseTest):
                                                  names=['krbtgt', realm])
         ticket.set_sname(krbtgt_sname)
 
-        # Get the user's SID.
-        samdb = self.get_samdb()
-
-        user_dn = creds.get_dn()
-        user_sid = self.get_objectSid(samdb, user_dn)
-
         # Modify the ticket to add a requester SID and give it two minutes to
         # live.
         ticket = self.modify_lifetime(ticket,
                                       lifetime=2 * 60,
-                                      requester_sid=user_sid)
+                                      requester_sid=creds.get_sid())
 
         # Try to use that ticket to get a service ticket.
         service_creds = self.get_service_creds()
@@ -670,17 +664,11 @@ class KpasswdTests(KDCBaseTest):
                                                  names=['krbtgt', realm])
         ticket.set_sname(krbtgt_sname)
 
-        # Get the user's SID.
-        samdb = self.get_samdb()
-
-        user_dn = creds.get_dn()
-        user_sid = self.get_objectSid(samdb, user_dn)
-
         # Modify the ticket to add a requester SID and give it two minutes and
         # ten seconds to live.
         ticket = self.modify_lifetime(ticket,
                                       lifetime=2 * 60 + 10,
-                                      requester_sid=user_sid)
+                                      requester_sid=creds.get_sid())
 
         # Try to use that ticket to get a service ticket.
         service_creds = self.get_service_creds()
index 6be5842190d5d81600058af6fea47a9528291cb2..c50349fbd7f00d3afd14b985cb9c8726a5a33b57 100755 (executable)
@@ -53,7 +53,6 @@ class MS_Kile_Client_Principal_Lookup_Tests(KDCBaseTest):
     def check_pac(self, samdb, auth_data, dn, uc, name, upn=None):
 
         pac_data = self.get_pac_data(auth_data)
-        sid = self.get_objectSid(samdb, dn)
         if upn is None:
             upn = "%s@%s" % (name, uc.get_realm().lower())
         if name.endswith('$'):
@@ -76,7 +75,7 @@ class MS_Kile_Client_Principal_Lookup_Tests(KDCBaseTest):
             pac_data.upn,
             "pac_data = {%s}" % str(pac_data))
         self.assertEqual(
-            sid,
+            uc.get_sid(),
             pac_data.account_sid,
             "pac_data = {%s}" % str(pac_data))
 
index d3e0d6233e477437ed0aeff82c20a09a1cbc757b..83ca06e457795bd82cbc125658b780d9ec2cdf10 100755 (executable)
@@ -246,10 +246,6 @@ class S4UKerberosTests(KDCBaseTest):
         client_cname = self.PrincipalName_create(name_type=NT_PRINCIPAL,
                                                  names=[client_name])
 
-        samdb = self.get_samdb()
-        client_dn = client_creds.get_dn()
-        sid = self.get_objectSid(samdb, client_dn)
-
         service_name = kdc_dict.pop('service_name', None)
         if service_name is None:
             service_name = service_creds.get_username()[:-1]
@@ -313,7 +309,7 @@ class S4UKerberosTests(KDCBaseTest):
             expected_account_name=client_name,
             expected_groups=expected_groups,
             unexpected_groups=unexpected_groups,
-            expected_sid=sid,
+            expected_sid=client_creds.get_sid(),
             expected_flags=expected_flags,
             unexpected_flags=unexpected_flags,
             ticket_decryption_key=service_decryption_key,
@@ -568,9 +564,7 @@ class S4UKerberosTests(KDCBaseTest):
             account_type=self.AccountType.USER,
             opts=client_opts)
 
-        samdb = self.get_samdb()
-        client_dn = client_creds.get_dn()
-        sid = self.get_objectSid(samdb, client_dn)
+        sid = client_creds.get_sid()
 
         service1_opts = kdc_dict.pop('service1_opts', {})
         service2_opts = kdc_dict.pop('service2_opts', {})