samba-tool dsacl: Create common superclass for dsacl commands

Created a base class for dsacl commands providing print_acl and some fixed command line options to
reduce code duplication.

Signed-off-by: Christian Merten <christian@merten.dev>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/python/samba/netcmd/dsacl.py b/python/samba/netcmd/dsacl.py
index 7a9f960d6bf7ed30065021ce96ecd09a912b0def..02be8fd982bc0fd7b3cfee7f74d5d97b2cd4185a 100644 (file)
--- a/python/samba/netcmd/dsacl.py
+++ b/python/samba/netcmd/dsacl.py
@@ -74,11 +74,10 @@ def get_domain_sid(samdb):
     return ndr_unpack(security.dom_sid, res[0]["objectSid"][0])
 
 
-class cmd_dsacl_set(Command):
-    """Modify access list on a directory object."""
+class cmd_dsacl_base(Command):
+    """Base class for DSACL commands."""
 
     synopsis = "%prog [options]"
-    car_help = """ The access control right to allow or deny """
 
     takes_optiongroups = {
         "sambaopts": options.SambaOptions,
@@ -86,6 +85,18 @@ class cmd_dsacl_set(Command):
         "versionopts": options.VersionOptions,
     }
 
+    def print_acl(self, samdb, object_dn, prefix=''):
+        desc = read_descriptor(samdb, object_dn)
+        desc_sddl = desc.as_sddl(get_domain_sid(samdb))
+        self.outf.write("%sdescriptor for %s:\n" % (prefix, object_dn))
+        self.outf.write(desc_sddl + "\n")
+
+
+class cmd_dsacl_set(cmd_dsacl_base):
+    """Modify access list on a directory object."""
+
+    car_help = """ The access control right to allow or deny """
+
     takes_options = [
         Option("-H", "--URL", help="LDB URL for database or target server",
                type=str, metavar="URL", dest="H"),
@@ -134,15 +145,6 @@ class cmd_dsacl_set(Command):
             desc = security.descriptor.from_sddl(desc_sddl, get_domain_sid(samdb))
             modify_descriptor(samdb, object_dn, desc)
 
-    def print_acl(self, samdb, object_dn, new=False):
-        desc = read_descriptor(samdb, object_dn)
-        desc_sddl = desc.as_sddl(get_domain_sid(samdb))
-        if new:
-            self.outf.write("new descriptor for %s:\n" % object_dn)
-        else:
-            self.outf.write("old descriptor for %s:\n" % object_dn)
-        self.outf.write(desc_sddl + "\n")
-
     def run(self, car, action, objectdn, trusteedn, sddl,
             H=None, credopts=None, sambaopts=None, versionopts=None):
         lp = sambaopts.get_loadparm()
@@ -178,22 +180,14 @@ class cmd_dsacl_set(Command):
         else:
             raise CommandError("Wrong argument '%s'!" % action)
 
-        self.print_acl(samdb, objectdn)
+        self.print_acl(samdb, objectdn, prefix='old ')
         self.add_ace(samdb, objectdn, new_ace)
-        self.print_acl(samdb, objectdn, new=True)
+        self.print_acl(samdb, objectdn, prefix='new ')
 
 
-class cmd_dsacl_get(Command):
+class cmd_dsacl_get(cmd_dsacl_base):
     """Print access list on a directory object."""
 
-    synopsis = "%prog [options]"
-
-    takes_optiongroups = {
-        "sambaopts": options.SambaOptions,
-        "credopts": options.CredentialsOptions,
-        "versionopts": options.VersionOptions,
-        }
-
     takes_options = [
         Option("-H", "--URL", help="LDB URL for database or target server",
                type=str, metavar="URL", dest="H"),
@@ -201,12 +195,6 @@ class cmd_dsacl_get(Command):
             type="string"),
         ]
 
-    def print_acl(self, samdb, object_dn):
-        desc = read_descriptor(samdb, object_dn)
-        desc_sddl = desc.as_sddl(get_domain_sid(samdb))
-        self.outf.write("descriptor for %s:\n" % object_dn)
-        self.outf.write(desc_sddl + "\n")
-
     def run(self, objectdn,
             H=None, credopts=None, sambaopts=None, versionopts=None):
         lp = sambaopts.get_loadparm()
@@ -217,17 +205,9 @@ class cmd_dsacl_get(Command):
         self.print_acl(samdb, objectdn)
 
 
-class cmd_dsacl_delete(Command):
+class cmd_dsacl_delete(cmd_dsacl_base):
     """Delete an access list entry on a directory object."""
 
-    synopsis = "%prog [options]"
-
-    takes_optiongroups = {
-        "sambaopts": options.SambaOptions,
-        "credopts": options.CredentialsOptions,
-        "versionopts": options.VersionOptions,
-        }
-
     takes_options = [
         Option("-H", "--URL", help="LDB URL for database or target server",
                type=str, metavar="URL", dest="H"),
@@ -237,15 +217,6 @@ class cmd_dsacl_delete(Command):
                type="string"),
         ]
 
-    def print_acl(self, samdb, object_dn, new=False):
-        desc = read_descriptor(samdb, object_dn)
-        desc_sddl = desc.as_sddl(get_domain_sid(samdb))
-        if new:
-            self.outf.write("new descriptor for %s:\n" % object_dn)
-        else:
-            self.outf.write("old descriptor for %s:\n" % object_dn)
-        self.outf.write(desc_sddl + "\n")
-
     def run(self, objectdn, sddl, H=None, credopts=None, sambaopts=None, versionopts=None):
         lp = sambaopts.get_loadparm()
         creds = credopts.get_credentials(lp)
@@ -256,9 +227,9 @@ class cmd_dsacl_delete(Command):
         samdb = SamDB(url=H, session_info=system_session(),
                       credentials=creds, lp=lp)
 
-        self.print_acl(samdb, objectdn)
+        self.print_acl(samdb, objectdn, prefix='old ')
         self.delete_ace(samdb, objectdn, sddl)
-        self.print_acl(samdb, objectdn, new=True)
+        self.print_acl(samdb, objectdn, prefix='new ')
 
     def delete_ace(self, samdb, object_dn, delete_aces):
         """Delete ace explicitly."""