s4:python Fix the reprovision test by deleting 'deleted' objects too.
[ira/wip.git] / source4 / scripting / python / samba / __init__.py
index 131d1a3ac6be36c06953a69e2c0f261795ca79af..69a0320be78546a53688b5b5cba8fba257eaa960 100644 (file)
@@ -42,7 +42,6 @@ else:
 
 
 import ldb
-import credentials
 import glue
 
 class Ldb(ldb.Ldb):
@@ -53,21 +52,22 @@ class Ldb(ldb.Ldb):
     not necessarily the Sam database. For Sam-specific helper 
     functions see samdb.py.
     """
-    def __init__(self, url=None, session_info=None, credentials=None, 
-                 modules_dir=None, lp=None, options=None):
-        """Open a Samba Ldb file. 
+    def __init__(self, url=None, lp=None, modules_dir=None, session_info=None,
+                 credentials=None, flags=0, options=None):
+        """Opens a Samba Ldb file.
 
         :param url: Optional LDB URL to open
+        :param lp: Optional loadparm object
+        :param modules_dir: Optional modules directory
         :param session_info: Optional session information
         :param credentials: Optional credentials, defaults to anonymous.
-        :param modules_dir: Modules directory, if not the default.
-        :param lp: Loadparm object, optional.
+        :param flags: Optional LDB flags
+        :param options: Additional options (optional)
 
         This is different from a regular Ldb file in that the Samba-specific
         modules-dir is used by default and that credentials and session_info 
         can be passed through (required by some modules).
         """
-        super(Ldb, self).__init__(options=options)
 
         if modules_dir is not None:
             self.set_modules_dir(modules_dir)
@@ -76,23 +76,35 @@ class Ldb(ldb.Ldb):
         elif lp is not None:
             self.set_modules_dir(os.path.join(lp.get("modules dir"), "ldb"))
 
-        if credentials is not None:
-            self.set_credentials(credentials)
-
         if session_info is not None:
             self.set_session_info(session_info)
 
-        glue.ldb_register_samba_handlers(self)
+        if credentials is not None:
+            self.set_credentials(credentials)
 
         if lp is not None:
             self.set_loadparm(lp)
 
+        # This must be done before we load the schema, as these handlers for
+        # objectSid and objectGUID etc must take precedence over the 'binary
+        # attribute' declaration in the schema
+        glue.ldb_register_samba_handlers(self)
+
+        # TODO set debug
         def msg(l,text):
             print text
         #self.set_debug(msg)
 
+        glue.ldb_set_utf8_casefold(self)
+
+        # Allow admins to force non-sync ldb for all databases
+        if lp is not None:
+            nosync_p = lp.get("nosync", "ldb")
+            if nosync_p is not None and nosync_p == true:
+                flags |= FLG_NOSYNC
+
         if url is not None:
-            self.connect(url, options=options)
+            self.connect(url, flags, options)
 
     def set_credentials(self, credentials):
         glue.ldb_set_credentials(self, credentials)
@@ -120,62 +132,75 @@ class Ldb(ldb.Ldb):
         assert len(values) == 1
         return self.schema_format_value(attribute, values.pop())
 
+    def erase_except_schema_controlled(self):
+        """Erase this ldb, removing all records, except those that are controlled by Samba4's schema."""
+        basedn = ""
+        # Delete the 'visible' records, and the invisble 'deleted' records (if this DB supports it)
+        for msg in self.search(basedn, ldb.SCOPE_SUBTREE, 
+                               "(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))",
+                               [], controls=["show_deleted:0"]):
+            try:
+                self.delete(msg.dn)
+            except ldb.LdbError, (ldb.ERR_NO_SUCH_OBJECT, _):
+                # Ignore no such object errors
+                pass
+            
+        res = self.search(basedn, ldb.SCOPE_SUBTREE, 
+                          "(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))",
+                          [], controls=["show_deleted:0"])
+        assert len(res) == 0
+
+        # delete the specials
+        for attr in ["@SUBCLASSES", "@MODULES", 
+                     "@OPTIONS", "@PARTITION", "@KLUDGEACL"]:
+            try:
+                self.delete(attr)
+            except ldb.LdbError, (ldb.ERR_NO_SUCH_OBJECT, _):
+                # Ignore missing dn errors
+                pass
+
     def erase(self):
         """Erase this ldb, removing all records."""
+        
+        self.erase_except_schema_controlled()
+
         # delete the specials
-        for attr in ["@INDEXLIST", "@ATTRIBUTES", "@SUBCLASSES", "@MODULES", 
-                     "@OPTIONS", "@PARTITION", "@KLUDGEACL"]:
+        for attr in ["@INDEXLIST", "@ATTRIBUTES"]:
             try:
                 self.delete(attr)
             except ldb.LdbError, (ldb.ERR_NO_SUCH_OBJECT, _):
                 # Ignore missing dn errors
                 pass
 
-        basedn = ""
-        # and the rest
-        for msg in self.search(basedn, ldb.SCOPE_SUBTREE, 
-                "(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", 
-                ["distinguishedName"]):
+    def erase_partitions(self):
+        """Erase an ldb, removing all records."""
+
+        def erase_recursive(self, dn):
             try:
-                self.delete(msg.dn)
+                res = self.search(base=dn, scope=ldb.SCOPE_ONELEVEL, attrs=[], 
+                                  controls=["show_deleted:0"])
             except ldb.LdbError, (ldb.ERR_NO_SUCH_OBJECT, _):
                 # Ignore no such object errors
+                return
                 pass
+            
+            for msg in res:
+                erase_recursive(self, msg.dn)
 
-        res = self.search(basedn, ldb.SCOPE_SUBTREE, "(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", ["distinguishedName"])
-        assert len(res) == 0
+            try:
+                self.delete(dn)
+            except ldb.LdbError, (ldb.ERR_NO_SUCH_OBJECT, _):
+                # Ignore no such object errors
+                pass
 
-    def erase_partitions(self):
-        """Erase an ldb, removing all records."""
         res = self.search("", ldb.SCOPE_BASE, "(objectClass=*)", 
                          ["namingContexts"])
         assert len(res) == 1
         if not "namingContexts" in res[0]:
             return
         for basedn in res[0]["namingContexts"]:
-            previous_remaining = 1
-            current_remaining = 0
-
-            k = 0
-            while ++k < 10 and (previous_remaining != current_remaining):
-                # and the rest
-                try:
-                    res2 = self.search(basedn, ldb.SCOPE_SUBTREE, "(|(objectclass=*)(distinguishedName=*))", ["distinguishedName"])
-                except ldb.LdbError, (ldb.ERR_NO_SUCH_OBJECT, _):
-                    # Ignore missing dn errors
-                    return
-
-                previous_remaining = current_remaining
-                current_remaining = len(res2)
-                for msg in res2:
-                    try:
-                        self.delete(msg.dn)
-                    # Ignore no such object errors
-                    except ldb.LdbError, (ldb.ERR_NO_SUCH_OBJECT, _):
-                        pass
-                    # Ignore not allowed on non leaf errors
-                    except ldb.LdbError, (ldb.ERR_NOT_ALLOWED_ON_NON_LEAF, _):
-                        pass
+            # Try and erase from the bottom-up in the tree
+            erase_recursive(self, basedn)
 
     def load_ldif_file_add(self, ldif_path):
         """Load a LDIF file.
@@ -201,6 +226,37 @@ class Ldb(ldb.Ldb):
         for changetype, msg in self.parse_ldif(ldif):
             self.modify(msg)
 
+    def set_domain_sid(self, sid):
+        """Change the domain SID used by this LDB.
+
+        :param sid: The new domain sid to use.
+        """
+        glue.samdb_set_domain_sid(self, sid)
+
+    def set_schema_from_ldif(self, pf, df):
+        glue.dsdb_set_schema_from_ldif(self, pf, df)
+
+    def set_schema_from_ldb(self, ldb):
+        glue.dsdb_set_schema_from_ldb(self, ldb)
+
+    def convert_schema_to_openldap(self, target, mapping):
+        return glue.dsdb_convert_schema_to_openldap(self, target, mapping)
+
+    def set_invocation_id(self, invocation_id):
+        """Set the invocation id for this SamDB handle.
+        
+        :param invocation_id: GUID of the invocation id.
+        """
+        glue.dsdb_set_ntds_invocation_id(self, invocation_id)
+
+    def set_opaque_integer(self, name, value):
+        """Set an integer as an opaque (a flag or other value) value on the database
+        
+        :param name: The name for the opaque value
+        :param value: The integer value
+        """
+        glue.dsdb_set_opaque_integer(self, name, value)
+
 
 def substitute_var(text, values):
     """substitute strings of the form ${NAME} in str, replacing
@@ -243,6 +299,16 @@ def valid_netbios_name(name):
             return False
     return True
 
+
+def dom_sid_to_rid(sid_str):
+    """Converts a domain SID to the relative RID.
+
+    :param sid_str: The domain SID formatted as string
+    """
+
+    return glue.dom_sid_to_rid(sid_str)
+
+
 version = glue.version
 
 DS_BEHAVIOR_WIN2000 = glue.DS_BEHAVIOR_WIN2000