sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

CVE-2020-25722 selftest: Adapt sam.py test to userAccountControl/objectclass restrictions

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14753

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
This commit is contained in:
Andrew Bartlett 2021-10-21 15:19:19 +13:00 committed by Jule Anger
parent 6c03fb656d
commit 66986eefc6
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
selftest/knownfail.d/uac_objectclass_restrict
View File

@ -3,8 +3,6 @@
# #
# All these tests need to be fixed and the entries here removed # All these tests need to be fixed and the entries here removed
^samba4.sam.python\(.*\).__main__.SamTests.test_userAccountControl_computer_modify
^samba4.sam.python\(.*\).__main__.SamTests.test_userAccountControl_user_modify
^samba4.sam.python\(fl2008r2dc\).__main__.SamTests.test_users_groups\(fl2008r2dc\) ^samba4.sam.python\(fl2008r2dc\).__main__.SamTests.test_users_groups\(fl2008r2dc\)
^samba4.ldap.python\(ad_dc_default\).__main__.BasicTests.test_all\(ad_dc_default\) ^samba4.ldap.python\(ad_dc_default\).__main__.BasicTests.test_all\(ad_dc_default\)
^samba4.sam.python\(ad_dc_default\).__main__.SamTests.test_users_groups\(ad_dc_default\) ^samba4.sam.python\(ad_dc_default\).__main__.SamTests.test_users_groups\(ad_dc_default\)

6
source4/dsdb/tests/python/sam.py
View File

@ -2134,7 +2134,7 @@ class SamTests(samba.tests.TestCase):
self.fail() self.fail()
except LdbError as e67: except LdbError as e67:
(num, _) = e67.args (num, _) = e67.args
self.assertEqual(num, ERR_UNWILLING_TO_PERFORM) self.assertEqual(num, ERR_OBJECT_CLASS_VIOLATION)
m = Message() m = Message()
m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn) m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
@ -2153,7 +2153,7 @@ class SamTests(samba.tests.TestCase):
self.fail() self.fail()
except LdbError as e68: except LdbError as e68:
(num, _) = e68.args (num, _) = e68.args
self.assertEqual(num, ERR_UNWILLING_TO_PERFORM) self.assertEqual(num, ERR_OBJECT_CLASS_VIOLATION)
res1 = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn, res1 = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn,
scope=SCOPE_BASE, attrs=["sAMAccountType"]) scope=SCOPE_BASE, attrs=["sAMAccountType"])
@ -2501,7 +2501,7 @@ class SamTests(samba.tests.TestCase):
self.fail() self.fail()
except LdbError as e76: except LdbError as e76:
(num, _) = e76.args (num, _) = e76.args
self.assertEqual(num, ERR_INSUFFICIENT_ACCESS_RIGHTS) self.assertEqual(num, ERR_OBJECT_CLASS_VIOLATION)
# "primaryGroupID" does not change if account type remains the same # "primaryGroupID" does not change if account type remains the same