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

s4:dsdb/tests: let password_lockout.py use other_ldb variables instead of self.ldb3

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher 2016-02-05 08:37:53 +01:00 committed by Andrew Bartlett
parent f03d490b7b
commit e760319526
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
source4/dsdb/tests/python/password_lockout.py
View File

@ -512,6 +512,7 @@ lockoutThreshold: """ + str(lockoutThreshold) + """
# Notice: This works only against Windows if "dSHeuristics" has been set # Notice: This works only against Windows if "dSHeuristics" has been set
# properly # properly
creds = self.creds2 creds = self.creds2
other_ldb = self.ldb3
username = creds.get_username() username = creds.get_username()
userdn = "cn=%s,cn=users,%s" % (username, self.base_dn) userdn = "cn=%s,cn=users,%s" % (username, self.base_dn)
@ -531,7 +532,7 @@ lockoutThreshold: """ + str(lockoutThreshold) + """
# Wrong old password # Wrong old password
try: try:
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: userPassword delete: userPassword
@ -555,7 +556,7 @@ userPassword: thatsAcomplPASS2
badPasswordTime = int(res[0]["badPasswordTime"][0]) badPasswordTime = int(res[0]["badPasswordTime"][0])
# Correct old password # Correct old password
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: userPassword delete: userPassword
@ -575,7 +576,7 @@ userPassword: thatsAcomplPASS2
# Wrong old password # Wrong old password
try: try:
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: userPassword delete: userPassword
@ -602,7 +603,7 @@ userPassword: thatsAcomplPASS2
# Wrong old password # Wrong old password
try: try:
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: userPassword delete: userPassword
@ -629,7 +630,7 @@ userPassword: thatsAcomplPASS2
# Wrong old password # Wrong old password
try: try:
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: userPassword delete: userPassword
@ -654,7 +655,7 @@ userPassword: thatsAcomplPASS2
# Wrong old password # Wrong old password
try: try:
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: userPassword delete: userPassword
@ -679,7 +680,7 @@ userPassword: thatsAcomplPASS2
try: try:
# Correct old password # Correct old password
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: userPassword delete: userPassword
@ -722,7 +723,7 @@ userPassword: thatsAcomplPASS2
try: try:
# Correct old password # Correct old password
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: userPassword delete: userPassword
@ -767,7 +768,7 @@ userPassword: thatsAcomplPASS2x
# This shows that setting the UF_LOCKOUT flag makes no difference # This shows that setting the UF_LOCKOUT flag makes no difference
try: try:
# Correct old password # Correct old password
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: unicodePwd delete: unicodePwd
@ -805,7 +806,7 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2x\"".encode('utf-16-le'))
# The correct password after doing the unlock # The correct password after doing the unlock
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: unicodePwd delete: unicodePwd
@ -826,7 +827,7 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2x\"".encode('utf-16-le'))
# Wrong old password # Wrong old password
try: try:
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: userPassword delete: userPassword
@ -852,7 +853,7 @@ userPassword: thatsAcomplPASS2XYZ
# Wrong old password # Wrong old password
try: try:
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: userPassword delete: userPassword
@ -901,6 +902,7 @@ userPassword: thatsAcomplPASS2XYZ
def test_unicodePwd_lockout_with_clear_change(self): def test_unicodePwd_lockout_with_clear_change(self):
print "Performs a password cleartext change operation on 'unicodePwd'" print "Performs a password cleartext change operation on 'unicodePwd'"
creds = self.creds2 creds = self.creds2
other_ldb = self.ldb3
username = creds.get_username() username = creds.get_username()
userdn = "cn=%s,cn=users,%s" % (username, self.base_dn) userdn = "cn=%s,cn=users,%s" % (username, self.base_dn)
@ -919,7 +921,7 @@ userPassword: thatsAcomplPASS2XYZ
# Wrong old password # Wrong old password
try: try:
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: unicodePwd delete: unicodePwd
@ -943,7 +945,7 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2\"".encode('utf-16-le'))
badPasswordTime = int(res[0]["badPasswordTime"][0]) badPasswordTime = int(res[0]["badPasswordTime"][0])
# Correct old password # Correct old password
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: unicodePwd delete: unicodePwd
@ -963,7 +965,7 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2\"".encode('utf-16-le'))
# Wrong old password # Wrong old password
try: try:
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: unicodePwd delete: unicodePwd
@ -1004,7 +1006,7 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2\"".encode('utf-16-le'))
# Wrong old password # Wrong old password
try: try:
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: unicodePwd delete: unicodePwd
@ -1032,7 +1034,7 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2\"".encode('utf-16-le'))
# Wrong old password # Wrong old password
try: try:
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: unicodePwd delete: unicodePwd
@ -1057,7 +1059,7 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2\"".encode('utf-16-le'))
# Wrong old password # Wrong old password
try: try:
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: unicodePwd delete: unicodePwd
@ -1082,7 +1084,7 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2\"".encode('utf-16-le'))
try: try:
# Correct old password # Correct old password
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: unicodePwd delete: unicodePwd
@ -1119,7 +1121,7 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2x\"".encode('utf-16-le'))
msDSUserAccountControlComputed=0) msDSUserAccountControlComputed=0)
# Correct old password # Correct old password
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: unicodePwd delete: unicodePwd
@ -1140,7 +1142,7 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2x\"".encode('utf-16-le'))
# Wrong old password # Wrong old password
try: try:
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: unicodePwd delete: unicodePwd
@ -1166,7 +1168,7 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2\"".encode('utf-16-le'))
# Wrong old password # Wrong old password
try: try:
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: unicodePwd delete: unicodePwd
@ -1206,7 +1208,7 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2\"".encode('utf-16-le'))
# Wrong old password # Wrong old password
try: try:
self.ldb3.modify_ldif(""" other_ldb.modify_ldif("""
dn: """ + userdn + """ dn: """ + userdn + """
changetype: modify changetype: modify
delete: unicodePwd delete: unicodePwd