mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
s4-repl: Add tests for add replication conflicts and use of LostAndFound
LostAndFound is used when we find children of a deleted object that are not themselves deleted. Andrew Bartlett
This commit is contained in:
Andrew Bartlett
parent
6d1b8ff8a7
commit
31787417ca
@ -25,6 +25,7 @@ import os
|
||||
|
||||
sys.path.insert(0, "bin/python")
|
||||
import samba
|
||||
from samba import dsdb
|
||||
samba.ensure_external_module("testtools", "testtools")
|
||||
samba.ensure_external_module("subunit", "subunit/python")
|
||||
|
||||
@ -85,6 +86,13 @@ class DrsBaseTestCase(samba.tests.BlackboxTestCase):
|
||||
self.assertEquals(len(res), 1)
|
||||
return str(res[0]["dn"])
|
||||
|
||||
def _lost_and_found_dn(self, sam_ldb, nc):
|
||||
wkdn = "<WKGUID=%s,%s>" % (dsdb.DS_GUID_LOSTANDFOUND_CONTAINER, nc)
|
||||
res = sam_ldb.search(base=wkdn,
|
||||
scope=SCOPE_BASE)
|
||||
self.assertEquals(len(res), 1)
|
||||
return str(res[0]["dn"])
|
||||
|
||||
def _make_obj_name(self, prefix):
|
||||
return prefix + time.strftime("%s", time.gmtime())
|
||||
|
||||
|
||||
@ -30,6 +30,8 @@
|
||||
import drs_base
|
||||
import samba.tests
|
||||
|
||||
from ldb import (
|
||||
SCOPE_BASE)
|
||||
|
||||
class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
|
||||
"""Intended as a black box test case for DsReplicaSync
|
||||
@ -42,6 +44,7 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
|
||||
def tearDown(self):
|
||||
# re-enable replication
|
||||
self._enable_inbound_repl(self.dnsname_dc1)
|
||||
self._enable_inbound_repl(self.dnsname_dc2)
|
||||
super(DrsReplicaSyncTestCase, self).tearDown()
|
||||
|
||||
def test_ReplEnabled(self):
|
||||
@ -69,3 +72,301 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
|
||||
self._enable_inbound_repl(self.dnsname_dc1)
|
||||
self._net_drs_replicate(DC=self.dnsname_dc1, fromDC=self.dnsname_dc2, forced=False, local=True, full_sync=True)
|
||||
|
||||
def _create_ou(self, samdb, name):
|
||||
ldif = """
|
||||
dn: %s,%s
|
||||
objectClass: organizationalUnit
|
||||
""" % (name, self.domain_dn)
|
||||
samdb.add_ldif(ldif)
|
||||
res = samdb.search(base="%s,%s" % (name, self.domain_dn),
|
||||
scope=SCOPE_BASE, attrs=["objectGUID"])
|
||||
return self._GUID_string(res[0]["objectGUID"][0])
|
||||
|
||||
def _check_deleted(self, sam_ldb, guid):
|
||||
# search the user by guid as it may be deleted
|
||||
expression = "(objectGUID=%s)" % guid
|
||||
res = sam_ldb.search(base=self.domain_dn,
|
||||
expression=expression,
|
||||
controls=["show_deleted:1"],
|
||||
attrs=["isDeleted", "objectCategory", "ou"])
|
||||
self.assertEquals(len(res), 1)
|
||||
ou_cur = res[0]
|
||||
# Deleted Object base DN
|
||||
dodn = self._deleted_objects_dn(sam_ldb)
|
||||
# now check properties of the user
|
||||
name_cur = ou_cur["ou"][0]
|
||||
self.assertEquals(ou_cur["isDeleted"][0],"TRUE")
|
||||
self.assertTrue(not("objectCategory" in ou_cur))
|
||||
self.assertTrue(dodn in str(ou_cur["dn"]),
|
||||
"OU %s is deleted but it is not located under %s!" % (name_cur, dodn))
|
||||
|
||||
def test_ReplConflictsFullSync(self):
|
||||
"""Tests that objects created in conflict become conflict DNs (honour full sync override)"""
|
||||
self._disable_inbound_repl(self.dnsname_dc1)
|
||||
self._disable_inbound_repl(self.dnsname_dc2)
|
||||
|
||||
# Create conflicting objects on DC1 and DC2, with DC1 object created first
|
||||
ou1 = self._create_ou(self.ldb_dc1, "OU=Test Full Sync")
|
||||
ou2 = self._create_ou(self.ldb_dc2, "OU=Test Full Sync")
|
||||
|
||||
self._enable_inbound_repl(self.dnsname_dc2)
|
||||
self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1, local=True, forced=True, full_sync=True)
|
||||
self._disable_inbound_repl(self.dnsname_dc2)
|
||||
|
||||
# Check that DC2 got the DC1 object, and one or other object was make into conflict
|
||||
res1 = self.ldb_dc2.search(base="<GUID=%s>" % ou1,
|
||||
scope=SCOPE_BASE, attrs=["name"])
|
||||
res2 = self.ldb_dc2.search(base="<GUID=%s>" % ou2,
|
||||
scope=SCOPE_BASE, attrs=["name"])
|
||||
print res1[0]["name"][0]
|
||||
print res2[0]["name"][0]
|
||||
self.assertTrue('CNF:%s' % ou1 in str(res1[0]["name"][0]) or 'CNF:%s' % ou2 in str(res2[0]["name"][0]))
|
||||
self.assertTrue(self._lost_and_found_dn(self.ldb_dc2, self.domain_dn) not in str(res1[0].dn))
|
||||
self.assertTrue(self._lost_and_found_dn(self.ldb_dc2, self.domain_dn) not in str(res2[0].dn))
|
||||
|
||||
# Delete both objects by GUID on DC1
|
||||
|
||||
self.ldb_dc2.delete('<GUID=%s>' % ou1)
|
||||
self.ldb_dc2.delete('<GUID=%s>' % ou2)
|
||||
|
||||
self._enable_inbound_repl(self.dnsname_dc1)
|
||||
self._enable_inbound_repl(self.dnsname_dc2)
|
||||
self._net_drs_replicate(DC=self.dnsname_dc1, fromDC=self.dnsname_dc2, forced=True, full_sync=True)
|
||||
|
||||
self._check_deleted(self.ldb_dc1, ou1)
|
||||
self._check_deleted(self.ldb_dc1, ou2)
|
||||
# Check deleted on DC2
|
||||
self._check_deleted(self.ldb_dc2, ou1)
|
||||
self._check_deleted(self.ldb_dc2, ou2)
|
||||
|
||||
def test_ReplConflictsRemoteWin(self):
|
||||
"""Tests that objects created in conflict become conflict DNs"""
|
||||
self._disable_inbound_repl(self.dnsname_dc1)
|
||||
self._disable_inbound_repl(self.dnsname_dc2)
|
||||
|
||||
# Create conflicting objects on DC1 and DC2, with DC1 object created first
|
||||
ou1 = self._create_ou(self.ldb_dc1, "OU=Test Remote Conflict")
|
||||
ou2 = self._create_ou(self.ldb_dc2, "OU=Test Remote Conflict")
|
||||
|
||||
self._enable_inbound_repl(self.dnsname_dc1)
|
||||
self._net_drs_replicate(DC=self.dnsname_dc1, fromDC=self.dnsname_dc2, forced=True, full_sync=False)
|
||||
self._disable_inbound_repl(self.dnsname_dc1)
|
||||
|
||||
# Check that DC2 got the DC1 object, and one or other object was make into conflict
|
||||
res1 = self.ldb_dc1.search(base="<GUID=%s>" % ou1,
|
||||
scope=SCOPE_BASE, attrs=["name"])
|
||||
res2 = self.ldb_dc1.search(base="<GUID=%s>" % ou2,
|
||||
scope=SCOPE_BASE, attrs=["name"])
|
||||
print res1[0]["name"][0]
|
||||
print res2[0]["name"][0]
|
||||
self.assertTrue('CNF:%s' % ou1 in str(res1[0]["name"][0]) or 'CNF:%s' % ou2 in str(res2[0]["name"][0]))
|
||||
self.assertTrue(self._lost_and_found_dn(self.ldb_dc1, self.domain_dn) not in str(res1[0].dn))
|
||||
self.assertTrue(self._lost_and_found_dn(self.ldb_dc1, self.domain_dn) not in str(res2[0].dn))
|
||||
|
||||
# Delete both objects by GUID on DC1
|
||||
|
||||
self.ldb_dc1.delete('<GUID=%s>' % ou1)
|
||||
self.ldb_dc1.delete('<GUID=%s>' % ou2)
|
||||
|
||||
self._enable_inbound_repl(self.dnsname_dc1)
|
||||
self._enable_inbound_repl(self.dnsname_dc2)
|
||||
self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1, forced=True, full_sync=False)
|
||||
|
||||
self._check_deleted(self.ldb_dc1, ou1)
|
||||
self._check_deleted(self.ldb_dc1, ou2)
|
||||
# Check deleted on DC2
|
||||
self._check_deleted(self.ldb_dc2, ou1)
|
||||
self._check_deleted(self.ldb_dc2, ou2)
|
||||
|
||||
def test_ReplConflictsLocalWin(self):
|
||||
"""Tests that objects created in conflict become conflict DNs"""
|
||||
self._disable_inbound_repl(self.dnsname_dc1)
|
||||
self._disable_inbound_repl(self.dnsname_dc2)
|
||||
|
||||
# Create conflicting objects on DC1 and DC2, with DC2 object created first
|
||||
ou2 = self._create_ou(self.ldb_dc2, "OU=Test Local Conflict")
|
||||
ou1 = self._create_ou(self.ldb_dc1, "OU=Test Local Conflict")
|
||||
|
||||
self._enable_inbound_repl(self.dnsname_dc1)
|
||||
self._net_drs_replicate(DC=self.dnsname_dc1, fromDC=self.dnsname_dc2, forced=True, full_sync=False)
|
||||
self._disable_inbound_repl(self.dnsname_dc1)
|
||||
|
||||
# Check that DC2 got the DC1 object, and one or other object was make into conflict
|
||||
res1 = self.ldb_dc1.search(base="<GUID=%s>" % ou1,
|
||||
scope=SCOPE_BASE, attrs=["name"])
|
||||
res2 = self.ldb_dc1.search(base="<GUID=%s>" % ou2,
|
||||
scope=SCOPE_BASE, attrs=["name"])
|
||||
print res1[0]["name"][0]
|
||||
print res2[0]["name"][0]
|
||||
self.assertTrue('CNF:%s' % ou1 in str(res1[0]["name"][0]) or 'CNF:%s' % ou2 in str(res2[0]["name"][0]))
|
||||
self.assertTrue(self._lost_and_found_dn(self.ldb_dc1, self.domain_dn) not in str(res1[0].dn))
|
||||
self.assertTrue(self._lost_and_found_dn(self.ldb_dc1, self.domain_dn) not in str(res2[0].dn))
|
||||
|
||||
# Delete both objects by GUID on DC1
|
||||
|
||||
self.ldb_dc1.delete('<GUID=%s>' % ou1)
|
||||
self.ldb_dc1.delete('<GUID=%s>' % ou2)
|
||||
|
||||
self._enable_inbound_repl(self.dnsname_dc1)
|
||||
self._enable_inbound_repl(self.dnsname_dc2)
|
||||
self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1, forced=True, full_sync=False)
|
||||
|
||||
self._check_deleted(self.ldb_dc1, ou1)
|
||||
self._check_deleted(self.ldb_dc1, ou2)
|
||||
# Check deleted on DC2
|
||||
self._check_deleted(self.ldb_dc2, ou1)
|
||||
self._check_deleted(self.ldb_dc2, ou2)
|
||||
|
||||
def test_ReplConflictsRenameRemoteWin(self):
|
||||
"""Tests that objects created in conflict become conflict DNs"""
|
||||
self._disable_inbound_repl(self.dnsname_dc1)
|
||||
self._disable_inbound_repl(self.dnsname_dc2)
|
||||
|
||||
# Create conflicting objects on DC1 and DC2, with DC1 object created first
|
||||
ou1 = self._create_ou(self.ldb_dc1, "OU=Test Remote Rename Conflict")
|
||||
ou2 = self._create_ou(self.ldb_dc2, "OU=Test Remote Rename Conflict 2")
|
||||
|
||||
self._enable_inbound_repl(self.dnsname_dc1)
|
||||
self._net_drs_replicate(DC=self.dnsname_dc1, fromDC=self.dnsname_dc2, forced=True, full_sync=False)
|
||||
self._disable_inbound_repl(self.dnsname_dc1)
|
||||
|
||||
self.ldb_dc1.rename("<GUID=%s>" % ou1, "OU=Test Remote Rename Conflict 3,%s" % self.domain_dn)
|
||||
self.ldb_dc2.rename("<GUID=%s>" % ou2, "OU=Test Remote Rename Conflict 3,%s" % self.domain_dn)
|
||||
|
||||
self._enable_inbound_repl(self.dnsname_dc1)
|
||||
self._net_drs_replicate(DC=self.dnsname_dc1, fromDC=self.dnsname_dc2, forced=True, full_sync=False)
|
||||
self._disable_inbound_repl(self.dnsname_dc1)
|
||||
|
||||
# Check that DC2 got the DC1 object, and one or other object was make into conflict
|
||||
res1 = self.ldb_dc1.search(base="<GUID=%s>" % ou1,
|
||||
scope=SCOPE_BASE, attrs=["name"])
|
||||
res2 = self.ldb_dc1.search(base="<GUID=%s>" % ou2,
|
||||
scope=SCOPE_BASE, attrs=["name"])
|
||||
print res1[0]["name"][0]
|
||||
print res2[0]["name"][0]
|
||||
self.assertTrue('CNF:%s' % ou1 in str(res1[0]["name"][0]) or 'CNF:%s' % ou2 in str(res2[0]["name"][0]))
|
||||
self.assertTrue(self._lost_and_found_dn(self.ldb_dc1, self.domain_dn) not in str(res1[0].dn))
|
||||
self.assertTrue(self._lost_and_found_dn(self.ldb_dc1, self.domain_dn) not in str(res2[0].dn))
|
||||
|
||||
# Delete both objects by GUID on DC1
|
||||
|
||||
self.ldb_dc1.delete('<GUID=%s>' % ou1)
|
||||
self.ldb_dc1.delete('<GUID=%s>' % ou2)
|
||||
|
||||
self._enable_inbound_repl(self.dnsname_dc1)
|
||||
self._enable_inbound_repl(self.dnsname_dc2)
|
||||
self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1, forced=True, full_sync=False)
|
||||
|
||||
self._check_deleted(self.ldb_dc1, ou1)
|
||||
self._check_deleted(self.ldb_dc1, ou2)
|
||||
# Check deleted on DC2
|
||||
self._check_deleted(self.ldb_dc2, ou1)
|
||||
self._check_deleted(self.ldb_dc2, ou2)
|
||||
|
||||
def test_ReplConflictsRenameLocalWin(self):
|
||||
"""Tests that objects created in conflict become conflict DNs"""
|
||||
self._disable_inbound_repl(self.dnsname_dc1)
|
||||
self._disable_inbound_repl(self.dnsname_dc2)
|
||||
|
||||
# Create conflicting objects on DC1 and DC2, with DC1 object created first
|
||||
ou1 = self._create_ou(self.ldb_dc1, "OU=Test Rename Local Conflict")
|
||||
ou2 = self._create_ou(self.ldb_dc2, "OU=Test Rename Local Conflict 2")
|
||||
|
||||
self._enable_inbound_repl(self.dnsname_dc1)
|
||||
self._net_drs_replicate(DC=self.dnsname_dc1, fromDC=self.dnsname_dc2, forced=True, full_sync=False)
|
||||
self._disable_inbound_repl(self.dnsname_dc1)
|
||||
|
||||
self.ldb_dc2.rename("<GUID=%s>" % ou2, "OU=Test Rename Local Conflict 3,%s" % self.domain_dn)
|
||||
self.ldb_dc1.rename("<GUID=%s>" % ou1, "OU=Test Rename Local Conflict 3,%s" % self.domain_dn)
|
||||
|
||||
self._enable_inbound_repl(self.dnsname_dc1)
|
||||
self._net_drs_replicate(DC=self.dnsname_dc1, fromDC=self.dnsname_dc2, forced=True, full_sync=False)
|
||||
self._disable_inbound_repl(self.dnsname_dc1)
|
||||
|
||||
# Check that DC2 got the DC1 object, and one or other object was make into conflict
|
||||
res1 = self.ldb_dc1.search(base="<GUID=%s>" % ou1,
|
||||
scope=SCOPE_BASE, attrs=["name"])
|
||||
res2 = self.ldb_dc1.search(base="<GUID=%s>" % ou2,
|
||||
scope=SCOPE_BASE, attrs=["name"])
|
||||
print res1[0]["name"][0]
|
||||
print res2[0]["name"][0]
|
||||
self.assertTrue('CNF:%s' % ou1 in str(res1[0]["name"][0]) or 'CNF:%s' % ou2 in str(res2[0]["name"][0]))
|
||||
self.assertTrue(self._lost_and_found_dn(self.ldb_dc1, self.domain_dn) not in str(res1[0].dn))
|
||||
self.assertTrue(self._lost_and_found_dn(self.ldb_dc1, self.domain_dn) not in str(res2[0].dn))
|
||||
|
||||
# Delete both objects by GUID on DC1
|
||||
|
||||
self.ldb_dc1.delete('<GUID=%s>' % ou1)
|
||||
self.ldb_dc1.delete('<GUID=%s>' % ou2)
|
||||
|
||||
self._enable_inbound_repl(self.dnsname_dc1)
|
||||
self._enable_inbound_repl(self.dnsname_dc2)
|
||||
self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1, forced=True, full_sync=False)
|
||||
|
||||
self._check_deleted(self.ldb_dc1, ou1)
|
||||
self._check_deleted(self.ldb_dc1, ou2)
|
||||
# Check deleted on DC2
|
||||
self._check_deleted(self.ldb_dc2, ou1)
|
||||
self._check_deleted(self.ldb_dc2, ou2)
|
||||
|
||||
def test_ReplLostAndFound(self):
|
||||
"""Tests that objects created under a OU deleted eleswhere end up in lostAndFound"""
|
||||
self._disable_inbound_repl(self.dnsname_dc1)
|
||||
self._disable_inbound_repl(self.dnsname_dc2)
|
||||
|
||||
# Create two OUs on DC2
|
||||
ou1 = self._create_ou(self.ldb_dc2, "OU=Deleted parent")
|
||||
ou2 = self._create_ou(self.ldb_dc2, "OU=Deleted parent 2")
|
||||
|
||||
# replicate them from DC2 to DC1
|
||||
self._enable_inbound_repl(self.dnsname_dc1)
|
||||
self._net_drs_replicate(DC=self.dnsname_dc1, fromDC=self.dnsname_dc2, forced=True, full_sync=False)
|
||||
self._disable_inbound_repl(self.dnsname_dc1)
|
||||
|
||||
# Delete both objects by GUID on DC1
|
||||
|
||||
self.ldb_dc1.delete('<GUID=%s>' % ou1)
|
||||
self.ldb_dc1.delete('<GUID=%s>' % ou2)
|
||||
|
||||
# Create children on DC2
|
||||
ou1_child = self._create_ou(self.ldb_dc2, "OU=Test Child,OU=Deleted parent")
|
||||
ou2_child = self._create_ou(self.ldb_dc2, "OU=Test Child,OU=Deleted parent 2")
|
||||
|
||||
# Replicate from DC2
|
||||
self._enable_inbound_repl(self.dnsname_dc1)
|
||||
self._net_drs_replicate(DC=self.dnsname_dc1, fromDC=self.dnsname_dc2, forced=True, full_sync=False)
|
||||
self._disable_inbound_repl(self.dnsname_dc1)
|
||||
|
||||
# Check the sub-OUs are now in lostAndFound and the first one is a conflict DN
|
||||
|
||||
# Check that DC2 got the DC1 object, and one or other object was make into conflict
|
||||
res1 = self.ldb_dc1.search(base="<GUID=%s>" % ou1_child,
|
||||
scope=SCOPE_BASE, attrs=["name"])
|
||||
res2 = self.ldb_dc1.search(base="<GUID=%s>" % ou2_child,
|
||||
scope=SCOPE_BASE, attrs=["name"])
|
||||
print res1[0]["name"][0]
|
||||
print res2[0]["name"][0]
|
||||
self.assertTrue('CNF:%s' % ou1_child in str(res1[0]["name"][0]) or 'CNF:%s' % ou2_child in str(res2[0]["name"][0]))
|
||||
self.assertTrue(self._lost_and_found_dn(self.ldb_dc1, self.domain_dn) in str(res1[0].dn))
|
||||
self.assertTrue(self._lost_and_found_dn(self.ldb_dc1, self.domain_dn) in str(res2[0].dn))
|
||||
|
||||
# Delete all objects by GUID on DC1
|
||||
|
||||
self.ldb_dc1.delete('<GUID=%s>' % ou1_child)
|
||||
self.ldb_dc1.delete('<GUID=%s>' % ou2_child)
|
||||
|
||||
self._enable_inbound_repl(self.dnsname_dc1)
|
||||
self._enable_inbound_repl(self.dnsname_dc2)
|
||||
self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1, forced=True, full_sync=False)
|
||||
|
||||
|
||||
# Check all deleted on DC1
|
||||
self._check_deleted(self.ldb_dc1, ou1)
|
||||
self._check_deleted(self.ldb_dc1, ou2)
|
||||
self._check_deleted(self.ldb_dc1, ou1_child)
|
||||
self._check_deleted(self.ldb_dc1, ou2_child)
|
||||
# Check all deleted on DC2
|
||||
self._check_deleted(self.ldb_dc2, ou1)
|
||||
self._check_deleted(self.ldb_dc2, ou2)
|
||||
self._check_deleted(self.ldb_dc2, ou1_child)
|
||||
self._check_deleted(self.ldb_dc2, ou2_child)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user