summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-09-19 17:46:48 +0200
committerMatthias Dieter Wallnöfer <mdw@sn-devel-104.sn.samba.org>2010-10-03 15:23:19 +0000
commita095a08e252588996c499f071aae2abae419a5c7 (patch)
tree183f89f4658ea87e9f21589a0871bced7cb7e61a
parentb2385e3725e9c41820b315c202a559f875b50743 (diff)
downloadsamba-a095a08e252588996c499f071aae2abae419a5c7.tar.gz
samba-a095a08e252588996c499f071aae2abae419a5c7.tar.bz2
samba-a095a08e252588996c499f071aae2abae419a5c7.zip
s4:deletetest.py - enhance the tests
- Integrate the ldap.py delete protection testing code and enhance it - Demonstrate the DISALLOW_MOVE_ON_DELETE system flag Signed-off-by: Andrew Bartlett <abartlet@samba.org>
-rwxr-xr-xsource4/dsdb/tests/python/deletetest.py237
1 files changed, 216 insertions, 21 deletions
diff --git a/source4/dsdb/tests/python/deletetest.py b/source4/dsdb/tests/python/deletetest.py
index aa93104c04..2b0372db65 100755
--- a/source4/dsdb/tests/python/deletetest.py
+++ b/source4/dsdb/tests/python/deletetest.py
@@ -14,7 +14,8 @@ import samba.getopt as options
from samba.auth import system_session
from ldb import SCOPE_BASE, LdbError
-from ldb import ERR_NO_SUCH_OBJECT
+from ldb import ERR_NO_SUCH_OBJECT, ERR_NOT_ALLOWED_ON_NON_LEAF
+from ldb import ERR_UNWILLING_TO_PERFORM
from samba import Ldb
from subunit.run import SubunitTestRunner
@@ -55,16 +56,22 @@ class BasicDeleteTests(unittest.TestCase):
self.assertEquals(len(res), 1)
return res[0]["defaultNamingContext"][0]
+ def find_configurationdn(self, ldb):
+ res = ldb.search(base="", expression="", scope=SCOPE_BASE,
+ attrs=["configurationNamingContext"])
+ self.assertEquals(len(res), 1)
+ return res[0]["configurationNamingContext"][0]
+
def setUp(self):
self.ldb = ldb
self.base_dn = self.find_basedn(ldb)
+ self.configuration_dn = self.find_configurationdn(ldb)
- def search_guid(self,guid):
+ def search_guid(self, guid):
print "SEARCH by GUID %s" % self.GUID_string(guid)
- expression = "(objectGUID=%s)" % self.GUID_string(guid)
- res = ldb.search(expression=expression,
- controls=["show_deleted:1"])
+ res = ldb.search(base="<GUID=%s>" % self.GUID_string(guid),
+ scope=SCOPE_BASE, controls=["show_deleted:1"])
self.assertEquals(len(res), 1)
return res[0]
@@ -118,72 +125,260 @@ class BasicDeleteTests(unittest.TestCase):
except LdbError, (num, _):
self.assertEquals(num, ERR_NO_SUCH_OBJECT)
+ def test_delete_protection(self):
+ """Delete protection tests"""
+
+ print self.base_dn
+
+ self.delete_force(self.ldb, "cn=entry1,cn=ldaptestcontainer," + self.base_dn)
+ self.delete_force(self.ldb, "cn=entry2,cn=ldaptestcontainer," + self.base_dn)
+ self.delete_force(self.ldb, "cn=ldaptestcontainer," + self.base_dn)
+
+ ldb.add({
+ "dn": "cn=ldaptestcontainer," + self.base_dn,
+ "objectclass": "container"})
+ ldb.add({
+ "dn": "cn=entry1,cn=ldaptestcontainer," + self.base_dn,
+ "objectclass": "container"})
+ ldb.add({
+ "dn": "cn=entry2,cn=ldaptestcontainer," + self.base_dn,
+ "objectclass": "container"})
+
+ try:
+ ldb.delete("cn=ldaptestcontainer," + self.base_dn)
+ self.fail()
+ except LdbError, (num, _):
+ self.assertEquals(num, ERR_NOT_ALLOWED_ON_NON_LEAF)
+
+ ldb.delete("cn=ldaptestcontainer," + self.base_dn, ["tree_delete:1"])
+
+ try:
+ res = ldb.search("cn=ldaptestcontainer," + self.base_dn,
+ scope=SCOPE_BASE, attrs=[])
+ self.fail()
+ except LdbError, (num, _):
+ self.assertEquals(num, ERR_NO_SUCH_OBJECT)
+ try:
+ res = ldb.search("cn=entry1,cn=ldaptestcontainer," + self.base_dn,
+ scope=SCOPE_BASE, attrs=[])
+ self.fail()
+ except LdbError, (num, _):
+ self.assertEquals(num, ERR_NO_SUCH_OBJECT)
+ try:
+ res = ldb.search("cn=entry2,cn=ldaptestcontainer," + self.base_dn,
+ scope=SCOPE_BASE, attrs=[])
+ self.fail()
+ except LdbError, (num, _):
+ self.assertEquals(num, ERR_NO_SUCH_OBJECT)
+
+ self.delete_force(self.ldb, "cn=entry1,cn=ldaptestcontainer," + self.base_dn)
+ self.delete_force(self.ldb, "cn=entry2,cn=ldaptestcontainer," + self.base_dn)
+ self.delete_force(self.ldb, "cn=ldaptestcontainer," + self.base_dn)
+
+ # Performs some protected object delete testing
+
+ res = ldb.search(base="", expression="", scope=SCOPE_BASE,
+ attrs=["dsServiceName", "dNSHostName"])
+ self.assertEquals(len(res), 1)
+
+ try:
+ ldb.delete(res[0]["dsServiceName"][0])
+ self.fail()
+ except LdbError, (num, _):
+ self.assertEquals(num, ERR_UNWILLING_TO_PERFORM)
+
+ res = ldb.search(self.base_dn, attrs=["rIDSetReferences"],
+ expression="(&(objectClass=computer)(dNSHostName=" + res[0]["dNSHostName"][0] + "))")
+ self.assertEquals(len(res), 1)
+
+ try:
+ ldb.delete(res[0]["rIDSetReferences"][0])
+ self.fail()
+ except LdbError, (num, _):
+ self.assertEquals(num, ERR_UNWILLING_TO_PERFORM)
+ try:
+ ldb.delete(res[0]["rIDSetReferences"][0], ["tree_delete:1"])
+ self.fail()
+ except LdbError, (num, _):
+ self.assertEquals(num, ERR_UNWILLING_TO_PERFORM)
+
+ try:
+ ldb.delete("cn=Enterprise Schema,cn=Partitions," + self.configuration_dn)
+ self.fail()
+ except LdbError, (num, _):
+ self.assertEquals(num, ERR_UNWILLING_TO_PERFORM)
+ try:
+ ldb.delete("cn=Enterprise Schema,cn=Partitions," + self.configuration_dn, ["tree_delete:1"])
+ self.fail()
+ except LdbError, (num, _):
+ self.assertEquals(num, ERR_UNWILLING_TO_PERFORM)
+
+ try:
+ ldb.delete("cn=Enterprise Configuration,cn=Partitions," + self.configuration_dn)
+ self.fail()
+ except LdbError, (num, _):
+ self.assertEquals(num, ERR_NOT_ALLOWED_ON_NON_LEAF)
+ try:
+ ldb.delete("cn=Enterprise Configuration,cn=Partitions," + self.configuration_dn, ["tree_delete:1"])
+ self.fail()
+ except LdbError, (num, _):
+ self.assertEquals(num, ERR_NOT_ALLOWED_ON_NON_LEAF)
+
+ res = ldb.search("cn=Partitions," + self.configuration_dn, attrs=[],
+ expression="(nCName=%s)" % self.base_dn)
+ self.assertEquals(len(res), 1)
+
+ try:
+ ldb.delete(res[0].dn)
+ self.fail()
+ except LdbError, (num, _):
+ self.assertEquals(num, ERR_NOT_ALLOWED_ON_NON_LEAF)
+ try:
+ ldb.delete(res[0].dn, ["tree_delete:1"])
+ self.fail()
+ except LdbError, (num, _):
+ self.assertEquals(num, ERR_NOT_ALLOWED_ON_NON_LEAF)
+
+ # Performs some "systemFlags" testing
+
+ # Delete failing since "SYSTEM_FLAG_DISALLOW_DELETE"
+ try:
+ ldb.delete("CN=Users," + self.base_dn)
+ self.fail()
+ except LdbError, (num, _):
+ self.assertEquals(num, ERR_UNWILLING_TO_PERFORM)
+
def test_all(self):
"""Basic delete tests"""
print self.base_dn
- dn1="cn=testuser,cn=users," + self.base_dn
- dn2="cn=testuser2,cn=users," + self.base_dn
+ usr1="cn=testuser,cn=users," + self.base_dn
+ usr2="cn=testuser2,cn=users," + self.base_dn
grp1="cn=testdelgroup1,cn=users," + self.base_dn
+ sit1="cn=testsite1,cn=sites," + self.configuration_dn
+ ss1="cn=NTDS Site Settings,cn=testsite1,cn=sites," + self.configuration_dn
+ srv1="cn=Servers,cn=testsite1,cn=sites," + self.configuration_dn
+ srv2="cn=TESTSRV,cn=Servers,cn=testsite1,cn=sites," + self.configuration_dn
- self.delete_force(self.ldb, dn1)
- self.delete_force(self.ldb, dn2)
+ self.delete_force(self.ldb, usr1)
+ self.delete_force(self.ldb, usr2)
self.delete_force(self.ldb, grp1)
+ self.delete_force(self.ldb, ss1)
+ self.delete_force(self.ldb, srv2)
+ self.delete_force(self.ldb, srv1)
+ self.delete_force(self.ldb, sit1)
ldb.add({
- "dn": dn1,
+ "dn": usr1,
"objectclass": "user",
- "cn": "testuser",
"description": "test user description",
"samaccountname": "testuser"})
ldb.add({
- "dn": dn2,
+ "dn": usr2,
"objectclass": "user",
- "cn": "testuser2",
"description": "test user 2 description",
"samaccountname": "testuser2"})
ldb.add({
"dn": grp1,
"objectclass": "group",
- "cn": "testdelgroup1",
"description": "test group",
"samaccountname": "testdelgroup1",
- "member": [ dn1, dn2 ] })
+ "member": [ usr1, usr2 ],
+ "isDeleted": "FALSE" })
+
+ ldb.add({
+ "dn": sit1,
+ "objectclass": "site" })
+
+ ldb.add({
+ "dn": ss1,
+ "objectclass": ["applicationSiteSettings", "nTDSSiteSettings"] })
- objLive1 = self.search_dn(dn1)
+ ldb.add({
+ "dn": srv1,
+ "objectclass": "serversContainer" })
+
+ ldb.add({
+ "dn": srv2,
+ "objectClass": "server" })
+
+ objLive1 = self.search_dn(usr1)
guid1=objLive1["objectGUID"][0]
- objLive2 = self.search_dn(dn2)
+ objLive2 = self.search_dn(usr2)
guid2=objLive2["objectGUID"][0]
objLive3 = self.search_dn(grp1)
guid3=objLive3["objectGUID"][0]
- ldb.delete(dn1)
- ldb.delete(dn2)
+ objLive4 = self.search_dn(sit1)
+ guid4=objLive4["objectGUID"][0]
+
+ objLive5 = self.search_dn(ss1)
+ guid5=objLive5["objectGUID"][0]
+
+ objLive6 = self.search_dn(srv1)
+ guid6=objLive6["objectGUID"][0]
+
+ objLive7 = self.search_dn(srv2)
+ guid7=objLive7["objectGUID"][0]
+
+ ldb.delete(usr1)
+ ldb.delete(usr2)
ldb.delete(grp1)
+ ldb.delete(srv1, ["tree_delete:1"])
+ ldb.delete(sit1, ["tree_delete:1"])
objDeleted1 = self.search_guid(guid1)
objDeleted2 = self.search_guid(guid2)
objDeleted3 = self.search_guid(guid3)
+ objDeleted4 = self.search_guid(guid4)
+ objDeleted5 = self.search_guid(guid5)
+ objDeleted6 = self.search_guid(guid6)
+ objDeleted7 = self.search_guid(guid7)
self.del_attr_values(objDeleted1)
self.del_attr_values(objDeleted2)
self.del_attr_values(objDeleted3)
+ self.del_attr_values(objDeleted4)
+ self.del_attr_values(objDeleted5)
+ self.del_attr_values(objDeleted6)
+ self.del_attr_values(objDeleted7)
self.preserved_attributes_list(objLive1, objDeleted1)
self.preserved_attributes_list(objLive2, objDeleted2)
+ self.preserved_attributes_list(objLive3, objDeleted3)
+ self.preserved_attributes_list(objLive4, objDeleted4)
+ self.preserved_attributes_list(objLive5, objDeleted5)
+ self.preserved_attributes_list(objLive6, objDeleted6)
+ self.preserved_attributes_list(objLive7, objDeleted7)
self.check_rdn(objLive1, objDeleted1, "cn")
self.check_rdn(objLive2, objDeleted2, "cn")
self.check_rdn(objLive3, objDeleted3, "cn")
+ self.check_rdn(objLive4, objDeleted4, "cn")
+ self.check_rdn(objLive5, objDeleted5, "cn")
+ self.check_rdn(objLive6, objDeleted6, "cn")
+ self.check_rdn(objLive7, objDeleted7, "cn")
- self.delete_deleted(ldb, dn1)
- self.delete_deleted(ldb, dn2)
+ self.delete_deleted(ldb, usr1)
+ self.delete_deleted(ldb, usr2)
self.delete_deleted(ldb, grp1)
+ self.delete_deleted(ldb, sit1)
+ self.delete_deleted(ldb, ss1)
+ self.delete_deleted(ldb, srv1)
+ self.delete_deleted(ldb, srv2)
+
+ self.assertTrue("CN=Deleted Objects" in str(objDeleted1.dn))
+ self.assertTrue("CN=Deleted Objects" in str(objDeleted2.dn))
+ self.assertTrue("CN=Deleted Objects" in str(objDeleted3.dn))
+ self.assertFalse("CN=Deleted Objects" in str(objDeleted4.dn))
+ self.assertTrue("CN=Deleted Objects" in str(objDeleted5.dn))
+ self.assertFalse("CN=Deleted Objects" in str(objDeleted6.dn))
+ self.assertFalse("CN=Deleted Objects" in str(objDeleted7.dn))
if not "://" in host:
if os.path.isfile(host):