mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
pytest:krb5/lockout: associate user DN with the ldb it is used with
LDB is soon going to object strongly to Python DNs that don't come from the ldb that they are being used with, for memory safety reasons. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
parent
dbba6c22a4
commit
3ffc6c139b
@ -722,8 +722,6 @@ class LockoutTests(KDCBaseTest):
|
||||
# Create the user account for testing.
|
||||
user_creds = self.get_cached_creds(account_type=self.AccountType.USER,
|
||||
use_cache=False)
|
||||
user_dn = user_creds.get_dn()
|
||||
|
||||
admin_creds = self.get_admin_creds()
|
||||
lp = self.get_lp()
|
||||
|
||||
@ -731,6 +729,7 @@ class LockoutTests(KDCBaseTest):
|
||||
samdb = connect_samdb(samdb_url=lp.samdb_url(), lp=lp,
|
||||
credentials=admin_creds)
|
||||
self.assertLocalSamDB(samdb)
|
||||
user_dn = ldb.Dn(samdb, str(user_creds.get_dn()))
|
||||
|
||||
password = user_creds.get_password()
|
||||
|
||||
@ -764,7 +763,6 @@ class LockoutTests(KDCBaseTest):
|
||||
# Create the user account for testing.
|
||||
user_creds = self.get_cached_creds(account_type=self.AccountType.USER,
|
||||
use_cache=False)
|
||||
user_dn = user_creds.get_dn()
|
||||
|
||||
admin_creds = self.get_admin_creds()
|
||||
lp = self.get_lp()
|
||||
@ -774,6 +772,8 @@ class LockoutTests(KDCBaseTest):
|
||||
credentials=admin_creds)
|
||||
self.assertLocalSamDB(samdb)
|
||||
|
||||
user_dn = ldb.Dn(samdb, str(user_creds.get_dn()))
|
||||
|
||||
password = user_creds.get_password()
|
||||
if not correct_pw:
|
||||
password = password[:-1]
|
||||
@ -881,7 +881,6 @@ class LockoutTests(KDCBaseTest):
|
||||
# Create the user account for testing.
|
||||
user_creds = self.get_cached_creds(account_type=self.AccountType.USER,
|
||||
use_cache=False)
|
||||
user_dn = user_creds.get_dn()
|
||||
|
||||
admin_creds = self.get_admin_creds()
|
||||
lp = self.get_lp()
|
||||
@ -890,6 +889,7 @@ class LockoutTests(KDCBaseTest):
|
||||
samdb = connect_samdb(samdb_url=lp.samdb_url(), lp=lp,
|
||||
credentials=admin_creds)
|
||||
self.assertLocalSamDB(samdb)
|
||||
user_dn = ldb.Dn(samdb, str(user_creds.get_dn()))
|
||||
|
||||
# Prepare to connect to the server with an invalid password.
|
||||
with futures.ProcessPoolExecutor(max_workers=1) as executor:
|
||||
@ -979,7 +979,6 @@ class LockoutTests(KDCBaseTest):
|
||||
# Create the user account for testing.
|
||||
user_creds = self.get_cached_creds(account_type=self.AccountType.USER,
|
||||
use_cache=False)
|
||||
user_dn = user_creds.get_dn()
|
||||
|
||||
admin_creds = self.get_admin_creds()
|
||||
lp = self.get_lp()
|
||||
@ -988,6 +987,7 @@ class LockoutTests(KDCBaseTest):
|
||||
samdb = connect_samdb(samdb_url=lp.samdb_url(), lp=lp,
|
||||
credentials=admin_creds)
|
||||
self.assertLocalSamDB(samdb)
|
||||
user_dn = ldb.Dn(samdb, str(user_creds.get_dn()))
|
||||
|
||||
# Prepare to connect to the server with an invalid password, using four
|
||||
# simultaneous requests. Only three of those attempts should get
|
||||
@ -1074,7 +1074,6 @@ class LockoutTests(KDCBaseTest):
|
||||
# Create the user account for testing.
|
||||
user_creds = self.get_cached_creds(account_type=self.AccountType.USER,
|
||||
use_cache=False)
|
||||
user_dn = user_creds.get_dn()
|
||||
|
||||
admin_creds = self.get_admin_creds()
|
||||
lp = self.get_lp()
|
||||
@ -1083,7 +1082,7 @@ class LockoutTests(KDCBaseTest):
|
||||
samdb = connect_samdb(samdb_url=lp.samdb_url(), lp=lp,
|
||||
credentials=admin_creds)
|
||||
self.assertLocalSamDB(samdb)
|
||||
|
||||
user_dn = ldb.Dn(samdb, str(user_creds.get_dn()))
|
||||
password = user_creds.get_password()
|
||||
|
||||
# Prepare to connect to the server with a valid password.
|
||||
|
Loading…
Reference in New Issue
Block a user