netcmd: domain: claims: make use of AttributeSchema and ClassSchema models

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>

diff --git a/python/samba/netcmd/domain/claim/base.py b/python/samba/netcmd/domain/claim/base.py
index 2e0dd12e645f2ced6ae9d3c90c84e8b0e4d3b834..b5a7cb2d555c8e7f8c4abce265896447f9922918 100644 (file)
--- a/python/samba/netcmd/domain/claim/base.py
+++ b/python/samba/netcmd/domain/claim/base.py
@@ -20,7 +20,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from ldb import SCOPE_ONELEVEL
 from samba.netcmd import Command
 
 
@@ -30,38 +29,3 @@ class ClaimCommand(Command):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.ldb = None
-
-    def get_attribute_from_schema(self, name):
-        """Find DN by name in attribute schema.
-
-        :raises LookupError: if not found.
-        """
-        if not name:
-            raise ValueError("Attribute name is required.")
-        return self.get_object_from_schema(name, "attributeSchema")
-
-    def get_class_from_schema(self, name):
-        """Find DN by name in class schema.
-
-        :raises LookupError: if not found.
-        """
-        if not name:
-            raise ValueError("Class name is required.")
-        return self.get_object_from_schema(name, "classSchema")
-
-    def get_object_from_schema(self, name, object_class):
-        """Gets a single item from the schema by name and object class.
-
-        :raises LookupError: if not found.
-        """
-        schema_dn = self.ldb.get_schema_basedn()
-
-        res = self.ldb.search(base=schema_dn,
-                              scope=SCOPE_ONELEVEL,
-                              expression=(f"(&(objectClass={object_class})"
-                                          f"(lDAPDisplayName={name}))"))
-
-        if len(res) != 1:
-            raise LookupError(f"Could not locate {name} in {object_class}.")
-
-        return res[0]

diff --git a/python/samba/netcmd/domain/claim/claim_type.py b/python/samba/netcmd/domain/claim/claim_type.py
index 3f92f1a04100a86bd41d8a978dd5f0892cd6cba4..d48ae86a9827a2c52c0e2001cff6672d022f8772 100644 (file)
--- a/python/samba/netcmd/domain/claim/claim_type.py
+++ b/python/samba/netcmd/domain/claim/claim_type.py
@@ -26,7 +26,8 @@ import os
 import samba.getopt as options
 from ldb import LdbError
 from samba.netcmd import CommandError, Option, SuperCommand
-from samba.netcmd.domain.models import ClaimType, ValueType
+from samba.netcmd.domain.models import AttributeSchema, ClassSchema,\
+    ClaimType, ValueType
 
 from .base import ClaimCommand
 
@@ -95,8 +96,7 @@ class cmd_domain_claim_claim_type_create(ClaimCommand):
 
         Uses the LDAP attribute syntax to find the matching claim value type.
         """
-        attribute_syntax = str(attribute["attributeSyntax"])
-        claim_type_cn = SYNTAX_TO_CLAIM_TYPE_CN[attribute_syntax]
+        claim_type_cn = SYNTAX_TO_CLAIM_TYPE_CN[attribute.attribute_syntax]
         return self.claim_value_types[claim_type_cn].claim_value_type
 
     def run(self, ldap_url=None, sambaopts=None, credopts=None, name=None,
@@ -127,8 +127,9 @@ class cmd_domain_claim_claim_type_create(ClaimCommand):
 
         # Lookup attribute and class names in schema.
         try:
-            applies_to = [self.get_class_from_schema(name) for name in class_names]
-            attribute = self.get_attribute_from_schema(attribute_name)
+            applies_to = [ClassSchema.lookup(self.ldb, name)
+                          for name in class_names]
+            attribute = AttributeSchema.lookup(self.ldb, attribute_name)
         except (LookupError, ValueError) as e:
             raise CommandError(e)
 
@@ -140,7 +141,7 @@ class cmd_domain_claim_claim_type_create(ClaimCommand):
 
         # adminDescription should be present but still have a fallback.
         if description is None:
-            description = str(attribute["adminDescription"] or attribute_name)
+            description = attribute.admin_description or display_name
 
         # claim_is_value_space_restricted is always False because we don't
         # yet support creating claims with a restricted possible values list.
@@ -150,7 +151,7 @@ class cmd_domain_claim_claim_type_create(ClaimCommand):
             display_name=display_name,
             enabled=not disable,
             claim_attribute_source=attribute.dn,
-            claim_is_single_valued=str(attribute["isSingleValued"]) == "TRUE",
+            claim_is_single_valued=attribute.is_single_valued,
             claim_is_value_space_restricted=False,
             claim_source_type="AD",
             claim_type_applies_to_class=[obj.dn for obj in applies_to],
@@ -245,7 +246,8 @@ class cmd_domain_claim_claim_type_modify(ClaimCommand):
         # Change class names for claim type.
         if class_names is not None:
             try:
-                applies_to = [self.get_class_from_schema(name) for name in class_names]
+                applies_to = [ClassSchema.lookup(self.ldb, name)
+                              for name in class_names]
             except (LookupError, ValueError) as e:
                 raise CommandError(e)