Attachment 12857 Details for Bug 12507 – Additional patch for v4-6-test

[patch] Additional patch for v4-6-test

tmp46.diff.txt (text/plain), 12.59 KB, created by Stefan Metzmacher on 2017-01-27 12:33:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2017-01-27 12:33:38 UTC

Size: 12.59 KB

patch

obsolete

>From 542ae7cc757e0032685b63b23e7b97fbee04c2b3 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Wed, 11 Jan 2017 13:34:28 +0100
>Subject: [PATCH] s4:tests/sec_descriptor: use more unique oid values
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12507
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: David Disseldorp <ddiss@samba.org>
>
>Autobuild-User(master): David Disseldorp <ddiss@samba.org>
>Autobuild-Date(master): Thu Jan 12 04:02:21 CET 2017 on sn-devel-144
>
>(cherry picked from commit b4f40e4d6db4d5a8e889ea778ebbce8eaf6b10f5)
>---
> source4/dsdb/tests/python/sec_descriptor.py | 82 +++++++++--------------------
> 1 file changed, 25 insertions(+), 57 deletions(-)
>
>diff --git a/source4/dsdb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py
>index ac80469..2f02418 100755
>--- a/source4/dsdb/tests/python/sec_descriptor.py
>+++ b/source4/dsdb/tests/python/sec_descriptor.py
>@@ -64,24 +64,23 @@ class DescriptorTests(samba.tests.TestCase):
>     def get_users_domain_dn(self, name):
>         return "CN=%s,CN=Users,%s" % (name, self.base_dn)
> 
>-    def get_unique_schema_class_name(self):
>+    def create_schema_class(self, _ldb, desc=None):
>         while True:
>-            class_name = "test-class%s" % random.randint(1,100000)
>+            class_id = random.randint(0,65535)
>+            class_name = "descriptor-test-class%s" % class_id
>             class_dn = "CN=%s,%s" % (class_name, self.schema_dn)
>             try:
>-                self.ldb_admin.search(base=class_dn, attrs=["*"])
>+                self.ldb_admin.search(base=class_dn, attrs=["name"])
>             except LdbError, (num, _):
>                 self.assertEquals(num, ERR_NO_SUCH_OBJECT)
>-                return class_name
>+                break
> 
>-    def create_schema_class(self, _ldb, object_dn, desc=None):
>         ldif = """
>-dn: """ + object_dn + """
>+dn: """ + class_dn + """
> objectClass: classSchema
> objectCategory: CN=Class-Schema,""" + self.schema_dn + """
>-defaultObjectCategory: """ + object_dn + """
>-distinguishedName: """ + object_dn + """
>-governsId: 1.3.6.1.4.1.7165.4.6.3.""" + str(random.randint(1,100000)) + """
>+defaultObjectCategory: """ + class_dn + """
>+governsId: 1.3.6.1.4.1.7165.4.6.2.3.""" + str(class_id) + """
> instanceType: 4
> objectClassCategory: 1
> subClassOf: organizationalPerson
>@@ -97,6 +96,7 @@ systemOnly: FALSE
>             elif isinstance(desc, security.descriptor):
>                 ldif += "nTSecurityDescriptor:: %s" % base64.b64encode(ndr_pack(desc))
>         _ldb.add_ldif(ldif)
>+        return class_dn
> 
>     def create_configuration_container(self, _ldb, object_dn, desc=None):
>         ldif = """
>@@ -688,9 +688,7 @@ class OwnerGroupDescriptorTests(DescriptorTests):
>         mod = "(A;;WDCC;;;AU)"
>         self.sd_utils.dacl_add_ace(self.schema_dn, mod)
>         # Create example Schema class
>-        class_name = self.get_unique_schema_class_name()
>-        class_dn = "CN=%s,%s" % (class_name, self.schema_dn)
>-        self.create_schema_class(_ldb, class_dn)
>+        class_dn = self.create_schema_class(_ldb)
>         desc_sddl = self.sd_utils.get_sd_as_sddl(class_dn)
>         res = re.search("(O:.*G:.*?)D:", desc_sddl).group(1)
>         self.assertEqual(self.results[self.DS_BEHAVIOR][self._testMethodName[5:]], res)
>@@ -705,9 +703,7 @@ class OwnerGroupDescriptorTests(DescriptorTests):
>         mod = "(A;CI;WDCC;;;AU)"
>         self.sd_utils.dacl_add_ace(self.schema_dn, mod)
>         # Create example Schema class
>-        class_name = self.get_unique_schema_class_name()
>-        class_dn = "CN=%s,%s" % (class_name, self.schema_dn)
>-        self.create_schema_class(_ldb, class_dn)
>+        class_dn = self.create_schema_class(_ldb)
>         desc_sddl = self.sd_utils.get_sd_as_sddl(class_dn)
>         res = re.search("(O:.*G:.*?)D:", desc_sddl).group(1)
>         self.assertEqual(self.results[self.DS_BEHAVIOR][self._testMethodName[5:]], res)
>@@ -722,9 +718,7 @@ class OwnerGroupDescriptorTests(DescriptorTests):
>         mod = "(A;CI;WDCC;;;AU)"
>         self.sd_utils.dacl_add_ace(self.schema_dn, mod)
>         # Create example Schema class
>-        class_name = self.get_unique_schema_class_name()
>-        class_dn = "CN=%s,%s" % (class_name, self.schema_dn)
>-        self.create_schema_class(_ldb, class_dn)
>+        class_dn = self.create_schema_class(_ldb)
>         desc_sddl = self.sd_utils.get_sd_as_sddl(class_dn)
>         res = re.search("(O:.*G:.*?)D:", desc_sddl).group(1)
>         self.assertEqual(self.results[self.DS_BEHAVIOR][self._testMethodName[5:]], res)
>@@ -740,9 +734,7 @@ class OwnerGroupDescriptorTests(DescriptorTests):
>         mod = "(A;CI;WDCC;;;AU)"
>         self.sd_utils.dacl_add_ace(self.schema_dn, mod)
>         # Create example Schema class
>-        class_name = self.get_unique_schema_class_name()
>-        class_dn = "CN=%s,%s" % (class_name, self.schema_dn)
>-        self.create_schema_class(_ldb, class_dn)
>+        class_dn = self.create_schema_class(_ldb)
>         desc_sddl = self.sd_utils.get_sd_as_sddl(class_dn)
>         res = re.search("(O:.*G:.*?)D:", desc_sddl).group(1)
>         self.assertEqual(self.results[self.DS_BEHAVIOR][self._testMethodName[5:]] % str(user_sid), res)
>@@ -757,9 +749,7 @@ class OwnerGroupDescriptorTests(DescriptorTests):
>         mod = "(A;CI;WDCC;;;AU)"
>         self.sd_utils.dacl_add_ace(self.schema_dn, mod)
>         # Create example Schema class
>-        class_name = self.get_unique_schema_class_name()
>-        class_dn = "CN=%s,%s" % (class_name, self.schema_dn)
>-        self.create_schema_class(_ldb, class_dn)
>+        class_dn = self.create_schema_class(_ldb)
>         desc_sddl = self.sd_utils.get_sd_as_sddl(class_dn)
>         res = re.search("(O:.*G:.*?)D:", desc_sddl).group(1)
>         self.assertEqual(self.results[self.DS_BEHAVIOR][self._testMethodName[5:]], res)
>@@ -774,9 +764,7 @@ class OwnerGroupDescriptorTests(DescriptorTests):
>         mod = "(A;CI;WDCC;;;AU)"
>         self.sd_utils.dacl_add_ace(self.schema_dn, mod)
>         # Create example Schema class
>-        class_name = self.get_unique_schema_class_name()
>-        class_dn = "CN=%s,%s" % (class_name, self.schema_dn)
>-        self.create_schema_class(_ldb, class_dn)
>+        class_dn = self.create_schema_class(_ldb)
>         desc_sddl = self.sd_utils.get_sd_as_sddl(class_dn)
>         res = re.search("(O:.*G:.*?)D:", desc_sddl).group(1)
>         self.assertEqual(self.results[self.DS_BEHAVIOR][self._testMethodName[5:]], res)
>@@ -791,9 +779,7 @@ class OwnerGroupDescriptorTests(DescriptorTests):
>         mod = "(A;CI;WDCC;;;AU)"
>         self.sd_utils.dacl_add_ace(self.schema_dn, mod)
>         # Create example Schema class
>-        class_name = self.get_unique_schema_class_name()
>-        class_dn = "CN=%s,%s" % (class_name, self.schema_dn)
>-        self.create_schema_class(_ldb, class_dn)
>+        class_dn = self.create_schema_class(_ldb)
>         desc_sddl = self.sd_utils.get_sd_as_sddl(class_dn)
>         res = re.search("(O:.*G:.*?)D:", desc_sddl).group(1)
>         self.assertEqual(self.results[self.DS_BEHAVIOR][self._testMethodName[5:]], res)
>@@ -808,9 +794,7 @@ class OwnerGroupDescriptorTests(DescriptorTests):
>         mod = "(A;CI;WDCC;;;AU)"
>         self.sd_utils.dacl_add_ace(self.schema_dn, mod)
>         # Create example Schema class
>-        class_name = self.get_unique_schema_class_name()
>-        class_dn = "CN=%s,%s" % (class_name, self.schema_dn)
>-        self.create_schema_class(_ldb, class_dn)
>+        class_dn = self.create_schema_class(_ldb)
>         desc_sddl = self.sd_utils.get_sd_as_sddl(class_dn)
>         res = re.search("(O:.*G:.*?)D:", desc_sddl).group(1)
>         self.assertEqual(self.results[self.DS_BEHAVIOR][self._testMethodName[5:]], res)
>@@ -829,9 +813,7 @@ class OwnerGroupDescriptorTests(DescriptorTests):
>         # Create a custom security descriptor
>         desc_sddl = "O:DAG:DAD:(A;;RP;;;DU)"
>         # Create example Schema class
>-        class_name = self.get_unique_schema_class_name()
>-        class_dn = "CN=%s,%s" % (class_name, self.schema_dn)
>-        self.create_schema_class(_ldb, class_dn, desc_sddl)
>+        class_dn = self.create_schema_class(_ldb, desc_sddl)
>         desc_sddl = self.sd_utils.get_sd_as_sddl(class_dn)
>         res = re.search("(O:.*G:.*?)D:", desc_sddl).group(1)
>         self.assertEqual("O:DAG:DA", res)
>@@ -847,9 +829,7 @@ class OwnerGroupDescriptorTests(DescriptorTests):
>         # Create a custom security descriptor
>         desc_sddl = "O:DAG:DAD:(A;;RP;;;DU)"
>         # Create example Schema class
>-        class_name = self.get_unique_schema_class_name()
>-        class_dn = "CN=%s,%s" % (class_name, self.schema_dn)
>-        self.create_schema_class(_ldb, class_dn, desc_sddl)
>+        class_dn = self.create_schema_class(_ldb, desc_sddl)
>         desc_sddl = self.sd_utils.get_sd_as_sddl(class_dn)
>         res = re.search("(O:.*G:.*?)D:", desc_sddl).group(1)
>         self.assertEqual("O:DAG:DA", res)
>@@ -864,9 +844,7 @@ class OwnerGroupDescriptorTests(DescriptorTests):
>         user_sid = self.sd_utils.get_object_sid( self.get_users_domain_dn(user_name) )
>         desc_sddl = "O:%sG:DAD:(A;;RP;;;DU)" % str(user_sid)
>         # Create example Schema class
>-        class_name = self.get_unique_schema_class_name()
>-        class_dn = "CN=%s,%s" % (class_name, self.schema_dn)
>-        self.create_schema_class(_ldb, class_dn, desc_sddl)
>+        class_dn = self.create_schema_class(_ldb, desc_sddl)
>         desc_sddl = self.sd_utils.get_sd_as_sddl(class_dn)
>         res = re.search("(O:.*G:.*?)D:", desc_sddl).group(1)
>         self.assertEqual(self.results[self.DS_BEHAVIOR][self._testMethodName[5:]] % str(user_sid), res)
>@@ -881,9 +859,7 @@ class OwnerGroupDescriptorTests(DescriptorTests):
>         user_sid = self.sd_utils.get_object_sid( self.get_users_domain_dn(user_name) )
>         desc_sddl = "O:%sG:DAD:(A;;RP;;;DU)" % str(user_sid)
>         # Create example Schema class
>-        class_name = self.get_unique_schema_class_name()
>-        class_dn = "CN=%s,%s" % (class_name, self.schema_dn)
>-        self.create_schema_class(_ldb, class_dn, desc_sddl)
>+        class_dn = self.create_schema_class(_ldb, desc_sddl)
>         desc_sddl = self.sd_utils.get_sd_as_sddl(class_dn)
>         res = re.search("(O:.*G:.*?)D:", desc_sddl).group(1)
>         self.assertEqual(self.results[self.DS_BEHAVIOR][self._testMethodName[5:]] % str(user_sid), res)
>@@ -899,9 +875,7 @@ class OwnerGroupDescriptorTests(DescriptorTests):
>         # Create a custom security descriptor
>         desc_sddl = "O:DAG:DAD:(A;;RP;;;DU)"
>         # Create example Schema class
>-        class_name = self.get_unique_schema_class_name()
>-        class_dn = "CN=%s,%s" % (class_name, self.schema_dn)
>-        self.create_schema_class(_ldb, class_dn, desc_sddl)
>+        class_dn = self.create_schema_class(_ldb, desc_sddl)
>         desc_sddl = self.sd_utils.get_sd_as_sddl(class_dn)
>         res = re.search("(O:.*G:.*?)D:", desc_sddl).group(1)
>         self.assertEqual("O:DAG:DA", res)
>@@ -917,9 +891,7 @@ class OwnerGroupDescriptorTests(DescriptorTests):
>         # Create a custom security descriptor
>         desc_sddl = "O:DAG:DAD:(A;;RP;;;DU)"
>         # Create example Schema class
>-        class_name = self.get_unique_schema_class_name()
>-        class_dn = "CN=%s,%s" % (class_name, self.schema_dn)
>-        self.create_schema_class(_ldb, class_dn, desc_sddl)
>+        class_dn = self.create_schema_class(_ldb, desc_sddl)
>         desc_sddl = self.sd_utils.get_sd_as_sddl(class_dn)
>         res = re.search("(O:.*G:.*?)D:", desc_sddl).group(1)
>         self.assertEqual("O:DAG:DA", res)
>@@ -935,9 +907,7 @@ class OwnerGroupDescriptorTests(DescriptorTests):
>         # Create a custom security descriptor
>         desc_sddl = "O:DAG:DAD:(A;;RP;;;DU)"
>         # Create example Schema class
>-        class_name = self.get_unique_schema_class_name()
>-        class_dn = "CN=%s,%s" % (class_name, self.schema_dn)
>-        self.create_schema_class(_ldb, class_dn, desc_sddl)
>+        class_dn = self.create_schema_class(_ldb, desc_sddl)
>         desc_sddl = self.sd_utils.get_sd_as_sddl(class_dn)
>         res = re.search("(O:.*G:.*?)D:", desc_sddl).group(1)
>         self.assertEqual("O:DAG:DA", res)
>@@ -953,9 +923,7 @@ class OwnerGroupDescriptorTests(DescriptorTests):
>         # Create a custom security descriptor
>         desc_sddl = "O:DAG:DAD:(A;;RP;;;DU)"
>         # Create example Schema class
>-        class_name = self.get_unique_schema_class_name()
>-        class_dn = "CN=%s,%s" % (class_name, self.schema_dn)
>-        self.create_schema_class(_ldb, class_dn, desc_sddl)
>+        class_dn = self.create_schema_class(_ldb, desc_sddl)
>         desc_sddl = self.sd_utils.get_sd_as_sddl(class_dn)
>         res = re.search("(O:.*G:.*?)D:", desc_sddl).group(1)
>         self.assertEqual("O:DAG:DA", res)
>-- 
>1.9.1
>

Flags:

ddiss: review+

Actions: View

Attachments on bug 12507: 12817 | 12857