sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

tests/krb5: Add method to calculate account salt

Browse Source 
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Joseph Sutton 2021-07-22 16:22:09 +12:00 committed by Andrew Bartlett
parent 50d743bafc
commit f5689bb8fa
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,6 +192,8 @@ class KDCBaseTest(RawKerberosTest):
creds.set_username(account_name)
if machine_account:
creds.set_workstation(name)
else:
creds.set_workstation('')
#
# Save the account name so it can be deleted in tearDownClass
self.accounts.add(dn)

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

@ -295,6 +295,20 @@ class KerberosCredentials(Credentials):
def get_forced_salt(self):
return self.forced_salt
def get_salt(self):
if self.forced_salt is not None:
return self.forced_salt
if self.get_workstation():
salt_string = '%shost%s.%s' % (
self.get_realm().upper(),
self.get_username().lower().rsplit('$', 1)[0],
self.get_realm().lower())
else:
salt_string = self.get_realm().upper() + self.get_username()
return salt_string.encode('utf-8')
class KerberosTicketCreds:
def __init__(self, ticket, session_key,
@ -940,10 +954,7 @@ class RawKerberosTest(TestCaseInTempDir):
password = creds.get_password()
self.assertIsNotNone(password, msg=fail_msg)
salt = creds.get_forced_salt()
if salt is None:
salt = bytes("%s%s" % (creds.get_realm(), creds.get_username()),
encoding='utf-8')
salt = creds.get_salt()
return self.PasswordKey_create(etype=etype,
pwd=password,
salt=salt,