[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Mon Oct 4 21:56:01 UTC 2021
The branch, master has been updated
via b45190bdac7 selftest: Use self.assertRaisesLdbError() in user_account_control.py test
via 298515cac2f selftest: Move self.assertRaisesLdbError() to samba.tests.TestCase
from fc69206f8b8 lib:fuzzing: Fix quoting of --fuzz-target-ldflags
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b45190bdac7bd9dcefd5ed88be4bd9a97a712664
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Sep 16 16:09:24 2021 +1200
selftest: Use self.assertRaisesLdbError() in user_account_control.py test
This changes most of the simple pattern with self.samdb.modify()
to use the wrapper. Some other calls still need to be converted, while
the complex decision tree tests should remain as-is for now.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Mon Oct 4 21:55:43 UTC 2021 on sn-devel-184
commit 298515cac2f35082483c2b4e4b7dbfe4df1d2e0c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Sep 13 21:48:13 2021 +1200
selftest: Move self.assertRaisesLdbError() to samba.tests.TestCase
This is easier to reason with regarding which cases should work
and which cases should fail, avoiding issues where more success
than expected would be OK because a self.fail() was missed in a
try: block.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
python/samba/tests/__init__.py | 25 ++++++
source4/dsdb/tests/python/linked_attributes.py | 21 -----
source4/dsdb/tests/python/subtree_rename.py | 25 ------
source4/dsdb/tests/python/user_account_control.py | 100 ++++++++--------------
4 files changed, 62 insertions(+), 109 deletions(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py
index 7efd7807a22..2c7e7784966 100644
--- a/python/samba/tests/__init__.py
+++ b/python/samba/tests/__init__.py
@@ -188,6 +188,31 @@ class TestCase(unittest.TestCase):
self.fail(msg)
+ def assertRaisesLdbError(self, errcode, message, f, *args, **kwargs):
+ """Assert a function raises a particular LdbError."""
+ try:
+ f(*args, **kwargs)
+ except ldb.LdbError as e:
+ (num, msg) = e.args
+ if num != errcode:
+ lut = {v: k for k, v in vars(ldb).items()
+ if k.startswith('ERR_') and isinstance(v, int)}
+ self.fail("%s, expected "
+ "LdbError %s, (%d) "
+ "got %s (%d) "
+ "%s" % (message,
+ lut.get(errcode), errcode,
+ lut.get(num), num,
+ msg))
+ else:
+ lut = {v: k for k, v in vars(ldb).items()
+ if k.startswith('ERR_') and isinstance(v, int)}
+ self.fail("%s, expected "
+ "LdbError %s, (%d) "
+ "but we got success" % (message,
+ lut.get(errcode),
+ errcode))
+
class LdbTestCase(TestCase):
"""Trivial test case for running tests against a LDB."""
diff --git a/source4/dsdb/tests/python/linked_attributes.py b/source4/dsdb/tests/python/linked_attributes.py
index e66a1fdd0d7..65a248a299a 100644
--- a/source4/dsdb/tests/python/linked_attributes.py
+++ b/source4/dsdb/tests/python/linked_attributes.py
@@ -165,27 +165,6 @@ class LATests(samba.tests.TestCase):
attrs=['objectGUID'])
return str(misc.GUID(res[0]['objectGUID'][0]))
- def assertRaisesLdbError(self, errcode, msg, f, *args, **kwargs):
- """Assert a function raises a particular LdbError."""
- try:
- f(*args, **kwargs)
- except ldb.LdbError as e:
- (num, msg) = e.args
- if num != errcode:
- lut = {v: k for k, v in vars(ldb).items()
- if k.startswith('ERR_') and isinstance(v, int)}
- self.fail("%s, expected "
- "LdbError %s, (%d) "
- "got %s (%d)" % (msg,
- lut.get(errcode), errcode,
- lut.get(num), num))
- else:
- lut = {v: k for k, v in vars(ldb).items()
- if k.startswith('ERR_') and isinstance(v, int)}
- self.fail("%s, expected "
- "LdbError %s, (%d) "
- "but we got success" % (msg, lut.get(errcode), errcode))
-
def _test_la_backlinks(self, reveal=False):
tag = 'backlinks'
kwargs = {}
diff --git a/source4/dsdb/tests/python/subtree_rename.py b/source4/dsdb/tests/python/subtree_rename.py
index cace780a958..d396055af68 100644
--- a/source4/dsdb/tests/python/subtree_rename.py
+++ b/source4/dsdb/tests/python/subtree_rename.py
@@ -200,31 +200,6 @@ class SubtreeRenameTests(samba.tests.TestCase):
attrs=['objectGUID'])
return str(misc.GUID(res[0]['objectGUID'][0]))
- def assertRaisesLdbError(self, errcode, message, f, *args, **kwargs):
- """Assert a function raises a particular LdbError."""
- try:
- f(*args, **kwargs)
- except ldb.LdbError as e:
- (num, msg) = e.args
- if num != errcode:
- lut = {v: k for k, v in vars(ldb).items()
- if k.startswith('ERR_') and isinstance(v, int)}
- self.fail("%s, expected "
- "LdbError %s, (%d) "
- "got %s (%d) "
- "%s" % (message,
- lut.get(errcode), errcode,
- lut.get(num), num,
- msg))
- else:
- lut = {v: k for k, v in vars(ldb).items()
- if k.startswith('ERR_') and isinstance(v, int)}
- self.fail("%s, expected "
- "LdbError %s, (%d) "
- "but we got success" % (message,
- lut.get(errcode),
- errcode))
-
def test_la_move_ou_tree(self):
tag = 'move_tree'
diff --git a/source4/dsdb/tests/python/user_account_control.py b/source4/dsdb/tests/python/user_account_control.py
index 32207e42196..4602b3e97d4 100755
--- a/source4/dsdb/tests/python/user_account_control.py
+++ b/source4/dsdb/tests/python/user_account_control.py
@@ -244,35 +244,27 @@ class UserAccountControlTests(samba.tests.TestCase):
m.dn = res[0].dn
m["userAccountControl"] = ldb.MessageElement(str(samba.dsdb.UF_SERVER_TRUST_ACCOUNT),
ldb.FLAG_MOD_REPLACE, "userAccountControl")
- try:
- self.samdb.modify(m)
- self.fail("Unexpectedly able to set userAccountControl to be a DC on %s" % m.dn)
- except LdbError as e5:
- (enum, estr) = e5.args
- self.assertEqual(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS, enum)
+ self.assertRaisesLdbError(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS,
+ f"Unexpectedly able to set userAccountControl to be a DC on {m.dn}",
+ self.samdb.modify, m)
m = ldb.Message()
m.dn = res[0].dn
m["userAccountControl"] = ldb.MessageElement(str(samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT |
samba.dsdb.UF_PARTIAL_SECRETS_ACCOUNT),
ldb.FLAG_MOD_REPLACE, "userAccountControl")
- try:
- self.samdb.modify(m)
- self.fail("Unexpectedly able to set userAccountControl to be an RODC on %s" % m.dn)
- except LdbError as e6:
- (enum, estr) = e6.args
- self.assertEqual(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS, enum)
+
+ self.assertRaisesLdbError(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS,
+ f"Unexpectedly able to set userAccountControl to be a RODC on {m.dn}",
+ self.samdb.modify, m)
m = ldb.Message()
m.dn = res[0].dn
m["userAccountControl"] = ldb.MessageElement(str(samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT),
ldb.FLAG_MOD_REPLACE, "userAccountControl")
- try:
- self.samdb.modify(m)
- self.fail("Unexpectedly able to set userAccountControl to be an Workstation on %s" % m.dn)
- except LdbError as e7:
- (enum, estr) = e7.args
- self.assertEqual(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS, enum)
+ self.assertRaisesLdbError(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS,
+ f"Unexpectedly able to set userAccountControl to be a Workstation on {m.dn}",
+ self.samdb.modify, m)
m = ldb.Message()
m.dn = res[0].dn
@@ -284,13 +276,10 @@ class UserAccountControlTests(samba.tests.TestCase):
m.dn = res[0].dn
m["primaryGroupID"] = ldb.MessageElement(str(security.DOMAIN_RID_ADMINS),
ldb.FLAG_MOD_REPLACE, "primaryGroupID")
- try:
- self.samdb.modify(m)
- except LdbError as e8:
- (enum, estr) = e8.args
- self.assertEqual(ldb.ERR_UNWILLING_TO_PERFORM, enum)
- return
- self.fail()
+ self.assertRaisesLdbError(ldb.ERR_UNWILLING_TO_PERFORM,
+ f"Unexpectedly able to set primaryGroupID on {m.dn}",
+ self.samdb.modify, m)
+
def test_mod_computer_cc(self):
user_sid = self.sd_utils.get_object_sid(self.unpriv_user_dn)
@@ -320,24 +309,17 @@ class UserAccountControlTests(samba.tests.TestCase):
m["userAccountControl"] = ldb.MessageElement(str(samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT |
samba.dsdb.UF_PARTIAL_SECRETS_ACCOUNT),
ldb.FLAG_MOD_REPLACE, "userAccountControl")
- try:
- self.samdb.modify(m)
- self.fail("Unexpectedly able to set userAccountControl on %s" % m.dn)
- except LdbError as e9:
- (enum, estr) = e9.args
- self.assertEqual(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS, enum)
+ self.assertRaisesLdbError(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS,
+ f"Unexpectedly able to set userAccountControl as RODC on {m.dn}",
+ self.samdb.modify, m)
m = ldb.Message()
m.dn = res[0].dn
m["userAccountControl"] = ldb.MessageElement(str(samba.dsdb.UF_SERVER_TRUST_ACCOUNT),
ldb.FLAG_MOD_REPLACE, "userAccountControl")
- try:
- self.samdb.modify(m)
- self.fail()
- except LdbError as e10:
- (enum, estr) = e10.args
- self.assertEqual(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS, enum)
-
+ self.assertRaisesLdbError(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS,
+ f"Unexpectedly able to set userAccountControl as DC on {m.dn}",
+ self.samdb.modify, m)
m = ldb.Message()
m.dn = res[0].dn
@@ -349,12 +331,10 @@ class UserAccountControlTests(samba.tests.TestCase):
m.dn = res[0].dn
m["userAccountControl"] = ldb.MessageElement(str(samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT),
ldb.FLAG_MOD_REPLACE, "userAccountControl")
- try:
- self.samdb.modify(m)
- self.fail("Unexpectedly able to set userAccountControl to be an Workstation on %s" % m.dn)
- except LdbError as e11:
- (enum, estr) = e11.args
- self.assertEqual(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS, enum)
+ self.assertRaisesLdbError(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS,
+ f"Unexpectedly able to set userAccountControl to be a workstation on {m.dn}",
+ self.samdb.modify, m)
+
def test_add_computer_cc_normal_bare(self):
user_sid = self.sd_utils.get_object_sid(self.unpriv_user_dn)
@@ -392,12 +372,11 @@ class UserAccountControlTests(samba.tests.TestCase):
m.dn = res[0].dn
m["userAccountControl"] = ldb.MessageElement(str(samba.dsdb.UF_NORMAL_ACCOUNT),
ldb.FLAG_MOD_REPLACE, "userAccountControl")
- try:
- self.samdb.modify(m)
- self.fail("Unexpectedly able to set userAccountControl to be an Normal account without |UF_PASSWD_NOTREQD on %s" % m.dn)
- except LdbError as e7:
- (enum, estr) = e7.args
- self.assertEqual(ldb.ERR_UNWILLING_TO_PERFORM, enum)
+ self.assertRaisesLdbError(ldb.ERR_UNWILLING_TO_PERFORM,
+ f"Unexpectedly able to set userAccountControl to be an Normal "
+ "account without |UF_PASSWD_NOTREQD Unexpectedly able to "
+ "set userAccountControl to be a workstation on {m.dn}",
+ self.samdb.modify, m)
def test_admin_mod_uac(self):
@@ -419,12 +398,11 @@ class UserAccountControlTests(samba.tests.TestCase):
UF_PARTIAL_SECRETS_ACCOUNT |
UF_TRUSTED_FOR_DELEGATION),
ldb.FLAG_MOD_REPLACE, "userAccountControl")
- try:
- self.admin_samdb.modify(m)
- self.fail("Unexpectedly able to set userAccountControl to UF_WORKSTATION_TRUST_ACCOUNT|UF_PARTIAL_SECRETS_ACCOUNT|UF_TRUSTED_FOR_DELEGATION on %s" % m.dn)
- except LdbError as e12:
- (enum, estr) = e12.args
- self.assertEqual(ldb.ERR_OTHER, enum)
+ self.assertRaisesLdbError(ldb.ERR_OTHER,
+ f"Unexpectedly able to set userAccountControl to "
+ "UF_WORKSTATION_TRUST_ACCOUNT|UF_PARTIAL_SECRETS_ACCOUNT|"
+ "UF_TRUSTED_FOR_DELEGATION on {m.dn}",
+ self.admin_samdb.modify, m)
m = ldb.Message()
m.dn = res[0].dn
@@ -834,14 +812,10 @@ class UserAccountControlTests(samba.tests.TestCase):
m["primaryGroupID"] = ldb.MessageElement(
[str(security.DOMAIN_RID_USERS)], ldb.FLAG_MOD_REPLACE,
"primaryGroupID")
- try:
- self.admin_samdb.modify(m)
- # When creating a new object, you can not ever set the primaryGroupID
- self.fail("Unexpectedly able to set primaryGroupID to be other than DCS on %s" % computername)
- except LdbError as e15:
- (enum, estr) = e15.args
- self.assertEqual(enum, ldb.ERR_UNWILLING_TO_PERFORM)
+ self.assertRaisesLdbError(ldb.ERR_UNWILLING_TO_PERFORM,
+ f"Unexpectedly able to set primaryGroupID to be other than DCS on {m.dn}",
+ self.admin_samdb.modify, m)
def test_primarygroupID_priv_user_modify(self):
computername = self.computernames[0]
--
Samba Shared Repository
More information about the samba-cvs
mailing list