sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

tests/krb5: Allow creating accounts supporting claims or compound identity separately

Browse Source 
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Joseph Sutton 2023-03-03 12:20:06 +13:00 committed by Andrew Bartlett
parent ad19dd100f
commit 23ce6f30e2
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/samba/tests/krb5/fast_tests.py
View File

@ -1921,6 +1921,8 @@ class FAST_Tests(KDCBaseTest):
opts={ opts={
**opts, **opts,
'fast_support': True, 'fast_support': True,
'claims_support': True,
'compound_id_support': True,
'supported_enctypes': ( 'supported_enctypes': (
security.KERB_ENCTYPE_RC4_HMAC_MD5 | security.KERB_ENCTYPE_RC4_HMAC_MD5 |
security.KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96_SK security.KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96_SK

16
python/samba/tests/krb5/kdc_base_test.py
View File

@ -1304,6 +1304,8 @@ class KDCBaseTest(RawKerberosTest):
'delegation_from_dn': None, 'delegation_from_dn': None,
'trusted_to_auth_for_delegation': False, 'trusted_to_auth_for_delegation': False,
'fast_support': False, 'fast_support': False,
'claims_support': False,
'compound_id_support': False,
'sid_compression_support': True, 'sid_compression_support': True,
'member_of': None, 'member_of': None,
'kerberos_enabled': True, 'kerberos_enabled': True,
@ -1353,6 +1355,8 @@ class KDCBaseTest(RawKerberosTest):
delegation_from_dn, delegation_from_dn,
trusted_to_auth_for_delegation, trusted_to_auth_for_delegation,
fast_support, fast_support,
claims_support,
compound_id_support,
sid_compression_support, sid_compression_support,
member_of, member_of,
kerberos_enabled, kerberos_enabled,
@ -1391,7 +1395,13 @@ class KDCBaseTest(RawKerberosTest):
enctypes = supported_enctypes enctypes = supported_enctypes
if fast_support: if fast_support:
enctypes = enctypes or 0 enctypes = enctypes or 0
enctypes |= KerberosCredentials.fast_supported_bits enctypes |= security.KERB_ENCTYPE_FAST_SUPPORTED
if claims_support:
enctypes = enctypes or 0
enctypes |= security.KERB_ENCTYPE_CLAIMS_SUPPORTED
if compound_id_support:
enctypes = enctypes or 0
enctypes |= security.KERB_ENCTYPE_COMPOUND_IDENTITY_SUPPORTED
if sid_compression_support is False: if sid_compression_support is False:
enctypes = enctypes or 0 enctypes = enctypes or 0
enctypes |= security.KERB_ENCTYPE_RESOURCE_SID_COMPRESSION_DISABLED enctypes |= security.KERB_ENCTYPE_RESOURCE_SID_COMPRESSION_DISABLED
@ -1534,6 +1544,8 @@ class KDCBaseTest(RawKerberosTest):
account_type=self.AccountType.COMPUTER, account_type=self.AccountType.COMPUTER,
opts={ opts={
'fast_support': True, 'fast_support': True,
'claims_support': True,
'compound_id_support': True,
'supported_enctypes': ( 'supported_enctypes': (
security.KERB_ENCTYPE_RC4_HMAC_MD5 | security.KERB_ENCTYPE_RC4_HMAC_MD5 |
security.KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96_SK security.KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96_SK
@ -1555,6 +1567,8 @@ class KDCBaseTest(RawKerberosTest):
opts={ opts={
'trusted_to_auth_for_delegation': True, 'trusted_to_auth_for_delegation': True,
'fast_support': True, 'fast_support': True,
'claims_support': True,
'compound_id_support': True,
'supported_enctypes': ( 'supported_enctypes': (
security.KERB_ENCTYPE_RC4_HMAC_MD5 | security.KERB_ENCTYPE_RC4_HMAC_MD5 |
security.KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96_SK security.KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96_SK

9
python/samba/tests/krb5/raw_testcase.py
View File

@ -370,11 +370,10 @@ class WrongLengthChecksumKey(RodcPacEncryptionKey):
class KerberosCredentials(Credentials): class KerberosCredentials(Credentials):
fast_supported_bits = (security.KERB_ENCTYPE_FAST_SUPPORTED | non_etype_bits = (
security.KERB_ENCTYPE_COMPOUND_IDENTITY_SUPPORTED | security.KERB_ENCTYPE_FAST_SUPPORTED) | (
security.KERB_ENCTYPE_CLAIMS_SUPPORTED) security.KERB_ENCTYPE_COMPOUND_IDENTITY_SUPPORTED) | (
security.KERB_ENCTYPE_CLAIMS_SUPPORTED) | (
non_etype_bits = fast_supported_bits | (
security.KERB_ENCTYPE_RESOURCE_SID_COMPRESSION_DISABLED) | ( security.KERB_ENCTYPE_RESOURCE_SID_COMPRESSION_DISABLED) | (
security.KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96_SK) security.KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96_SK)