From: Garming Sam Date: Thu, 23 Mar 2017 21:51:05 +0000 (+1300) Subject: whitespace: auth_log.py python conventions X-Git-Tag: tdb-1.3.13~224 X-Git-Url: http://git.samba.org/samba.git/?p=nivanova%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=3e0a08a3d1038b518247d370914aca28f0c33d71 whitespace: auth_log.py python conventions Signed-off-by: Garming Sam --- diff --git a/python/samba/tests/auth_log.py b/python/samba/tests/auth_log.py index edd1d0b88c3..6f32712c339 100644 --- a/python/samba/tests/auth_log.py +++ b/python/samba/tests/auth_log.py @@ -47,14 +47,12 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): def _test_rpc_ncacn_np(self, authTypes, creds, service, binding, protection, checkFunction): - def isLastExpectedMessage( msg): - return ( - msg["type"] == "Authorization" and - ( msg["Authorization"]["serviceDescription"] == "DCE/RPC" or - msg["Authorization"]["serviceDescription"] == service) and - msg["Authorization"]["authType"] == authTypes[0] and - msg["Authorization"]["transportProtection"] == protection - ) + def isLastExpectedMessage(msg): + return (msg["type"] == "Authorization" and + (msg["Authorization"]["serviceDescription"] == "DCE/RPC" or + msg["Authorization"]["serviceDescription"] == service) and + msg["Authorization"]["authType"] == authTypes[0] and + msg["Authorization"]["transportProtection"] == protection) if binding: binding = "[%s]" % binding @@ -81,7 +79,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): len(messages), "Did not receive the expected number of messages") - # Check the first message it should be an Authentication + # Check the first message it should be an Authentication msg = messages[0] self.assertEquals("Authentication", msg["type"]) self.assertEquals("NT_STATUS_OK", msg["Authentication"]["status"]) @@ -100,14 +98,14 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): # Check the third message it should be an Authentication # if we are expecting 4 messages if expected_messages == 4: - def checkServiceDescription( desc): + def checkServiceDescription(desc): return (desc == "DCE/RPC" or desc == service) msg = messages[2] self.assertEquals("Authentication", msg["type"]) self.assertEquals("NT_STATUS_OK", msg["Authentication"]["status"]) self.assertTrue( - checkServiceDescription( msg["Authentication"]["serviceDescription"])) + checkServiceDescription(msg["Authentication"]["serviceDescription"])) self.assertEquals(authTypes[3], msg["Authentication"]["authDescription"]) @@ -118,7 +116,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): len(messages), "Did not receive the expected number of messages") - # Check the first message it should be an Authentication + # Check the first message it should be an Authentication # This is almost certainly Authentication over UDP, and is probably # returning message too big, msg = messages[0] @@ -242,13 +240,11 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): def _test_rpc_ncacn_ip_tcp(self, authTypes, creds, service, binding, protection, checkFunction): - def isLastExpectedMessage( msg): - return ( - msg["type"] == "Authorization" and - msg["Authorization"]["serviceDescription"] == "DCE/RPC" and - msg["Authorization"]["authType"] == authTypes[0] and - msg["Authorization"]["transportProtection"] == protection - ) + def isLastExpectedMessage(msg): + return (msg["type"] == "Authorization" and + msg["Authorization"]["serviceDescription"] == "DCE/RPC" and + msg["Authorization"]["authType"] == authTypes[0] and + msg["Authorization"]["transportProtection"] == protection) if binding: binding = "[%s]" % binding @@ -263,7 +259,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): creds) - messages = self.waitForMessages( isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage) checkFunction(messages, authTypes, service, binding, protection) def rpc_ncacn_ip_tcp_ntlm_check(self, messages, authTypes, service, @@ -400,9 +396,9 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): def test_ldap(self): - def isLastExpectedMessage( msg): + def isLastExpectedMessage(msg): return (msg["type"] == "Authorization" and - msg["Authorization"]["serviceDescription"] == "LDAP" and + msg["Authorization"]["serviceDescription"] == "LDAP" and msg["Authorization"]["transportProtection"] == "SIGN" and msg["Authorization"]["authType"] == "krb5") @@ -410,12 +406,12 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): lp = self.get_loadparm(), credentials=self.get_credentials()) - messages = self.waitForMessages( isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage) self.assertEquals(3, len(messages), "Did not receive the expected number of messages") - # Check the first message it should be an Authentication + # Check the first message it should be an Authentication msg = messages[0] self.assertEquals("Authentication", msg["type"]) self.assertEquals("NT_STATUS_OK", msg["Authentication"]["status"]) @@ -424,7 +420,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): self.assertEquals("ENC-TS Pre-authentication", msg["Authentication"]["authDescription"]) - # Check the first message it should be an Authentication + # Check the first message it should be an Authentication msg = messages[1] self.assertEquals("Authentication", msg["type"]) self.assertEquals("NT_STATUS_OK", msg["Authentication"]["status"]) @@ -435,9 +431,9 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): def test_ldap_ntlm(self): - def isLastExpectedMessage( msg): + def isLastExpectedMessage(msg): return (msg["type"] == "Authorization" and - msg["Authorization"]["serviceDescription"] == "LDAP" and + msg["Authorization"]["serviceDescription"] == "LDAP" and msg["Authorization"]["transportProtection"] == "SEAL" and msg["Authorization"]["authType"] == "NTLMSSP") @@ -445,7 +441,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): lp = self.get_loadparm(), credentials=self.get_credentials()) - messages = self.waitForMessages( isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage) self.assertEquals(2, len(messages), "Did not receive the expected number of messages") @@ -458,9 +454,9 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): self.assertEquals("NTLMSSP", msg["Authentication"]["authDescription"]) def test_ldap_simple_bind(self): - def isLastExpectedMessage( msg): + def isLastExpectedMessage(msg): return (msg["type"] == "Authorization" and - msg["Authorization"]["serviceDescription"] == "LDAP" and + msg["Authorization"]["serviceDescription"] == "LDAP" and msg["Authorization"]["transportProtection"] == "TLS" and msg["Authorization"]["authType"] == "simple bind") @@ -472,12 +468,12 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): lp = self.get_loadparm(), credentials=creds) - messages = self.waitForMessages( isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage) self.assertEquals(2, len(messages), "Did not receive the expected number of messages") - # Check the first message it should be an Authentication + # Check the first message it should be an Authentication msg = messages[0] self.assertEquals("Authentication", msg["type"]) self.assertEquals("NT_STATUS_OK", msg["Authentication"]["status"]) @@ -487,15 +483,15 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): msg["Authentication"]["authDescription"]) def test_ldap_simple_bind_bad_password(self): - def isLastExpectedMessage( msg): + def isLastExpectedMessage(msg): return (msg["type"] == "Authentication" and - msg["Authentication"]["serviceDescription"] == "LDAP" and + msg["Authentication"]["serviceDescription"] == "LDAP" and msg["Authentication"]["status"] == "NT_STATUS_WRONG_PASSWORD" and msg["Authentication"]["authDescription"] == "simple bind") creds = self.insta_creds(template=self.get_credentials()) - creds.set_password( "badPassword") + creds.set_password("badPassword") creds.set_bind_dn("%s\\%s" % (creds.get_domain(), creds.get_username())) @@ -506,18 +502,18 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): credentials=creds) except LdbError: thrown = True - self.assertEquals( thrown, True) + self.assertEquals(thrown, True) - messages = self.waitForMessages( isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage) self.assertEquals(1, len(messages), "Did not receive the expected number of messages") def test_ldap_simple_bind_bad_user(self): - def isLastExpectedMessage( msg): + def isLastExpectedMessage(msg): return (msg["type"] == "Authentication" and - msg["Authentication"]["serviceDescription"] == "LDAP" and + msg["Authentication"]["serviceDescription"] == "LDAP" and msg["Authentication"]["status"] == "NT_STATUS_NO_SUCH_USER" and msg["Authentication"]["authDescription"] == "simple bind") @@ -532,18 +528,18 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): credentials=creds) except LdbError: thrown = True - self.assertEquals( thrown, True) + self.assertEquals(thrown, True) - messages = self.waitForMessages( isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage) self.assertEquals(1, len(messages), "Did not receive the expected number of messages") def test_ldap_simple_bind_unparseable_user(self): - def isLastExpectedMessage( msg): + def isLastExpectedMessage(msg): return (msg["type"] == "Authentication" and - msg["Authentication"]["serviceDescription"] == "LDAP" and + msg["Authentication"]["serviceDescription"] == "LDAP" and msg["Authentication"]["status"] == "NT_STATUS_NO_SUCH_USER" and msg["Authentication"]["authDescription"] == "simple bind") @@ -558,9 +554,9 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): credentials=creds) except LdbError: thrown = True - self.assertEquals( thrown, True) + self.assertEquals(thrown, True) - messages = self.waitForMessages( isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage) self.assertEquals(1, len(messages), "Did not receive the expected number of messages") @@ -613,10 +609,10 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): len(messages), "Did not receive the expected number of messages") def test_smb(self): - def isLastExpectedMessage( msg): + def isLastExpectedMessage(msg): return (msg["type"] == "Authorization" and - msg["Authorization"]["serviceDescription"] == "SMB" and - msg["Authorization"]["authType"] == "krb5" and + msg["Authorization"]["serviceDescription"] == "SMB" and + msg["Authorization"]["authType"] == "krb5" and msg["Authorization"]["transportProtection"] == "SMB") creds = self.insta_creds(template=self.get_credentials()) @@ -625,11 +621,11 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): lp=self.get_loadparm(), creds=creds) - messages = self.waitForMessages( isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage) self.assertEquals(3, len(messages), "Did not receive the expected number of messages") - # Check the first message it should be an Authentication + # Check the first message it should be an Authentication msg = messages[0] self.assertEquals("Authentication", msg["type"]) self.assertEquals("NT_STATUS_OK", msg["Authentication"]["status"]) @@ -648,7 +644,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): msg["Authentication"]["authDescription"]) def test_smb_bad_password(self): - def isLastExpectedMessage( msg): + def isLastExpectedMessage(msg): return (msg["type"] == "Authentication" and msg["Authentication"]["serviceDescription"] == "Kerberos KDC" and @@ -668,16 +664,16 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): creds=creds) except NTSTATUSError: thrown = True - self.assertEquals( thrown, True) + self.assertEquals(thrown, True) - messages = self.waitForMessages( isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage) self.assertEquals(1, len(messages), "Did not receive the expected number of messages") def test_smb_bad_user(self): - def isLastExpectedMessage( msg): + def isLastExpectedMessage(msg): return (msg["type"] == "Authentication" and msg["Authentication"]["serviceDescription"] == "Kerberos KDC" and @@ -697,18 +693,18 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): creds=creds) except NTSTATUSError: thrown = True - self.assertEquals( thrown, True) + self.assertEquals(thrown, True) - messages = self.waitForMessages( isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage) self.assertEquals(1, len(messages), "Did not receive the expected number of messages") def test_smb_anonymous(self): - def isLastExpectedMessage( msg): + def isLastExpectedMessage(msg): return (msg["type"] == "Authorization" and msg["Authorization"]["serviceDescription"] == "SMB" and - msg["Authorization"]["authType"] == "NTLMSSP" and + msg["Authorization"]["authType"] == "NTLMSSP" and msg["Authorization"]["account"] == "ANONYMOUS LOGON" and msg["Authorization"]["transportProtection"] == "SMB") @@ -718,7 +714,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): auth = "-N" call(["bin/smbclient", path, auth, "-c quit"]) - messages = self.waitForMessages( isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage) self.assertEquals(3, len(messages), "Did not receive the expected number of messages") @@ -729,11 +725,11 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): self.assertEquals("NT_STATUS_NO_SUCH_USER", msg["Authentication"]["status"]) self.assertEquals("SMB", - msg["Authentication"]["serviceDescription"]) + msg["Authentication"]["serviceDescription"]) self.assertEquals("NTLMSSP", - msg["Authentication"]["authDescription"]) + msg["Authentication"]["authDescription"]) self.assertEquals("No-Password", - msg["Authentication"]["passwordType"]) + msg["Authentication"]["passwordType"]) # Check the second message it should be an Authentication msg = messages[1] @@ -741,16 +737,16 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): self.assertEquals("NT_STATUS_OK", msg["Authentication"]["status"]) self.assertEquals("SMB", - msg["Authentication"]["serviceDescription"]) + msg["Authentication"]["serviceDescription"]) self.assertEquals("NTLMSSP", - msg["Authentication"]["authDescription"]) + msg["Authentication"]["authDescription"]) self.assertEquals("No-Password", - msg["Authentication"]["passwordType"]) + msg["Authentication"]["passwordType"]) self.assertEquals("ANONYMOUS LOGON", - msg["Authentication"]["becameAccount"]) + msg["Authentication"]["becameAccount"]) def test_smb_no_krb_spnego(self): - def isLastExpectedMessage( msg): + def isLastExpectedMessage(msg): return (msg["type"] == "Authorization" and msg["Authorization"]["serviceDescription"] == "SMB" and msg["Authorization"]["authType"] == "NTLMSSP" and @@ -763,23 +759,23 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): lp=self.get_loadparm(), creds=creds) - messages = self.waitForMessages( isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage) self.assertEquals(2, len(messages), "Did not receive the expected number of messages") - # Check the first message it should be an Authentication + # Check the first message it should be an Authentication msg = messages[0] self.assertEquals("Authentication", msg["type"]) self.assertEquals("NT_STATUS_OK", msg["Authentication"]["status"]) self.assertEquals("SMB", - msg["Authentication"]["serviceDescription"]) + msg["Authentication"]["serviceDescription"]) self.assertEquals("NTLMSSP", - msg["Authentication"]["authDescription"]) + msg["Authentication"]["authDescription"]) self.assertEquals("NTLMv2", - msg["Authentication"]["passwordType"]) + msg["Authentication"]["passwordType"]) def test_smb_no_krb_spnego_bad_password(self): - def isLastExpectedMessage( msg): + def isLastExpectedMessage(msg): return (msg["type"] == "Authentication" and msg["Authentication"]["serviceDescription"] == "SMB" and msg["Authentication"]["authDescription"] == "NTLMSSP" and @@ -799,15 +795,15 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): creds=creds) except NTSTATUSError: thrown = True - self.assertEquals( thrown, True) + self.assertEquals(thrown, True) - messages = self.waitForMessages( isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage) self.assertEquals(1, len(messages), "Did not receive the expected number of messages") def test_smb_no_krb_spnego_bad_user(self): - def isLastExpectedMessage( msg): + def isLastExpectedMessage(msg): return (msg["type"] == "Authentication" and msg["Authentication"]["serviceDescription"] == "SMB" and msg["Authentication"]["authDescription"] == "NTLMSSP" and @@ -827,15 +823,15 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): creds=creds) except NTSTATUSError: thrown = True - self.assertEquals( thrown, True) + self.assertEquals(thrown, True) - messages = self.waitForMessages( isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage) self.assertEquals(1, len(messages), "Did not receive the expected number of messages") def test_smb_no_krb_no_spnego_no_ntlmv2(self): - def isLastExpectedMessage( msg): + def isLastExpectedMessage(msg): return (msg["type"] == "Authorization" and msg["Authorization"]["serviceDescription"] == "SMB" and msg["Authorization"]["authType"] == "bare-NTLM" and @@ -847,26 +843,26 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): "sysvol", lp=self.get_loadparm(), creds=creds, - ntlmv2_auth = False, - use_spnego = False ) + ntlmv2_auth=False, + use_spnego=False) - messages = self.waitForMessages( isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage) self.assertEquals(2, len(messages), "Did not receive the expected number of messages") - # Check the first message it should be an Authentication + # Check the first message it should be an Authentication msg = messages[0] self.assertEquals("Authentication", msg["type"]) self.assertEquals("NT_STATUS_OK", msg["Authentication"]["status"]) self.assertEquals("SMB", - msg["Authentication"]["serviceDescription"]) + msg["Authentication"]["serviceDescription"]) self.assertEquals("bare-NTLM", - msg["Authentication"]["authDescription"]) + msg["Authentication"]["authDescription"]) self.assertEquals("NTLMv1", - msg["Authentication"]["passwordType"]) + msg["Authentication"]["passwordType"]) def test_smb_no_krb_no_spnego_no_ntlmv2_bad_password(self): - def isLastExpectedMessage( msg): + def isLastExpectedMessage(msg): return (msg["type"] == "Authentication" and msg["Authentication"]["serviceDescription"] == "SMB" and msg["Authentication"]["authDescription"] == "bare-NTLM" and @@ -884,20 +880,20 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): "sysvol", lp=self.get_loadparm(), creds=creds, - ntlmv2_auth = False, - use_spnego = False ) + ntlmv2_auth=False, + use_spnego=False) except NTSTATUSError: thrown = True - self.assertEquals( thrown, True) + self.assertEquals(thrown, True) - messages = self.waitForMessages( isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage) self.assertEquals(1, len(messages), "Did not receive the expected number of messages") def test_smb_no_krb_no_spnego_no_ntlmv2_bad_user(self): - def isLastExpectedMessage( msg): + def isLastExpectedMessage(msg): return (msg["type"] == "Authentication" and msg["Authentication"]["serviceDescription"] == "SMB" and msg["Authentication"]["authDescription"] == "bare-NTLM" and @@ -915,14 +911,14 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): "sysvol", lp=self.get_loadparm(), creds=creds, - ntlmv2_auth = False, - use_spnego = False ) + ntlmv2_auth=False, + use_spnego=False) except NTSTATUSError: thrown = True - self.assertEquals( thrown, True) + self.assertEquals(thrown, True) - messages = self.waitForMessages( isLastExpectedMessage) + messages = self.waitForMessages(isLastExpectedMessage) self.assertEquals(1, len(messages), "Did not receive the expected number of messages")