sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-05 12:22:11 +03:00
Code Activity

selftest: Rename ntlmauth tests to ntlmdisabled

Browse Source 
There are already some existing ntlm_auth tests, so the new tests I've
added make things a bit confusing. Also, ntlmdisabled probably better
reflects the specific case we're trying to test.

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
This commit is contained in:
Tim Beale
2017-07-05 14:32:54 +12:00
committed by Andrew Bartlett
parent 1a1c4ad71c
commit 8c56aa2c91
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
python/samba/tests/ntlmauth.py → python/samba/tests/ntlmdisabled.py
View File

@ -1,4 +1,4 @@
# Tests to check basic NTLM authentication # Tests basic behaviour when NTLM is disabled
# #
# Copyright (C) Catalyst IT Ltd. 2017 # Copyright (C) Catalyst IT Ltd. 2017
# #
@ -28,13 +28,13 @@ from samba import credentials
from samba.dcerpc import srvsvc, samr, lsa from samba.dcerpc import srvsvc, samr, lsa
""" """
Tests basic NTLM authentication Tests behaviour when NTLM is disabled
""" """
class NtlmAuthTests(TestCase): class NtlmDisabledTests(TestCase):
def setUp(self): def setUp(self):
super(NtlmAuthTests, self).setUp() super(NtlmDisabledTests, self).setUp()
self.lp = self.get_loadparm() self.lp = self.get_loadparm()
self.server = os.getenv("SERVER") self.server = os.getenv("SERVER")
@ -47,7 +47,7 @@ class NtlmAuthTests(TestCase):
self.creds.set_kerberos_state(DONT_USE_KERBEROS) self.creds.set_kerberos_state(DONT_USE_KERBEROS)
def tearDown(self): def tearDown(self):
super(NtlmAuthTests, self).tearDown() super(NtlmDisabledTests, self).tearDown()
def test_ntlm_connection(self): def test_ntlm_connection(self):
try: try:
@ -76,7 +76,7 @@ class NtlmAuthTests(TestCase):
try: try:
conn.ChangePasswordUser2(server, username, None, None, True, None, None) conn.ChangePasswordUser2(server, username, None, None, True, None, None)
except NTSTATUSError as e: except NTSTATUSError as e:
# changing passwords is rejected when NTLM is disabled # changing passwords should be rejected when NTLM is disabled
enum = ctypes.c_uint32(e[0]).value enum = ctypes.c_uint32(e[0]).value
if enum == ntstatus.NT_STATUS_NTLM_BLOCKED: if enum == ntstatus.NT_STATUS_NTLM_BLOCKED:
self.fail("NTLM is disabled on this server") self.fail("NTLM is disabled on this server")

8
selftest/knownfail
View File

@ -333,8 +333,8 @@
^samba.tests.netlogonsvc.python\(simpleserver\) ^samba.tests.netlogonsvc.python\(simpleserver\)
^samba.tests.netlogonsvc.python\(fileserver\) ^samba.tests.netlogonsvc.python\(fileserver\)
# NTLM authentication is (intentionally) disabled in ktest # NTLM authentication is (intentionally) disabled in ktest
^samba.tests.ntlmauth.python\(ktest\).ntlmauth.NtlmAuthTests.test_ntlm_connection\(ktest\) ^samba.tests.ntlmdisabled.python\(ktest\).ntlmdisabled.NtlmDisabledTests.test_ntlm_connection\(ktest\)
^samba.tests.ntlmauth.python\(ad_dc_no_ntlm\).ntlmauth.NtlmAuthTests.test_samr_change_password\(ad_dc_no_ntlm\) ^samba.tests.ntlmdisabled.python\(ad_dc_no_ntlm\).ntlmdisabled.NtlmDisabledTests.test_samr_change_password\(ad_dc_no_ntlm\)
# Disabling NTLM means you can't use samr to change the password # Disabling NTLM means you can't use samr to change the password
^samba.tests.ntlmauth.python\(ktest\).ntlmauth.NtlmAuthTests.test_samr_change_password\(ktest\) ^samba.tests.ntlmdisabled.python\(ktest\).ntlmdisabled.NtlmDisabledTests.test_samr_change_password\(ktest\)
^samba.tests.ntlmauth.python\(ad_dc_no_ntlm\).ntlmauth.NtlmAuthTests.test_ntlm_connection\(ad_dc_no_ntlm\) ^samba.tests.ntlmdisabled.python\(ad_dc_no_ntlm\).ntlmdisabled.NtlmDisabledTests.test_ntlm_connection\(ad_dc_no_ntlm\)

4
source4/selftest/tests.py
View File

@ -965,9 +965,9 @@ for env in [ "simpleserver", "fileserver", "nt4_dc", "ad_dc", "ad_dc_ntvfs", "ad
name="samba.tests.netlogonsvc.python(%s)" % env) name="samba.tests.netlogonsvc.python(%s)" % env)
for env in [ "ktest", "ad_member", "ad_dc_no_ntlm" ]: for env in [ "ktest", "ad_member", "ad_dc_no_ntlm" ]:
planoldpythontestsuite(env, "ntlmauth", planoldpythontestsuite(env, "ntlmdisabled",
extra_path=[os.path.join(srcdir(), 'python/samba/tests')], extra_path=[os.path.join(srcdir(), 'python/samba/tests')],
name="samba.tests.ntlmauth.python(%s)" % env) name="samba.tests.ntlmdisabled.python(%s)" % env)
# Demote the vampire DC, it must be the last test each DC, before the dbcheck # Demote the vampire DC, it must be the last test each DC, before the dbcheck
for env in ['vampire_dc', 'promoted_dc', 'rodc']: for env in ['vampire_dc', 'promoted_dc', 'rodc']: