tkt-78969: Preliminary work to move the AD Domain Controller to a plu…

…gin (#2723)

* Preliminary work to move the AD Domain Controller to a plugin
- Remove oldui / middleware components of the service

docs/api/resources/services.rst

@@ -330,103 +330,6 @@ Update resource
    :statuscode 200: no error
 
 
-Domain Controller
------------------
-
-The Domain Controller resource represents the configuration settings for FreeNAS Domain Controller service.
-
-List resource
-+++++++++++++
-
-.. http:get:: /api/v1.0/services/domaincontroller/
-
-   Returns the Domain Controller settings dictionary.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1.0/services/domaincontroller/ HTTP/1.1
-      Content-Type: application/json
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-        {
-                "dc_dns_backend": "SAMBA_INTERNAL",
-                "dc_dns_forwarder": "",
-                "dc_domain": "",
-                "dc_forest_level": "2003",
-                "dc_passwd": "",
-                "dc_realm": "",
-                "dc_role": "dc",
-                "id": 1
-        }
-
-   :resheader Content-Type: content type of the response
-   :statuscode 200: no error
-
-
-Update resource
-+++++++++++++++
-
-.. http:put:: /api/v1.0/services/domaincontroller/
-
-   Update Domain Controller.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PUT /api/v1.0/services/domaincontroller/ HTTP/1.1
-      Content-Type: application/json
-
-        {
-                "dc_forest_level": "2008",
-                "dc_dns_forwarder": "192.168.1.1",
-                "dc_domain": "example",
-                "dc_kerberos_realm": "",
-                "dc_passwd": "newpasswd",
-                "dc_realm": "example.org"
-
-        }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-        {
-                "dc_dns_backend": "SAMBA_INTERNAL",
-                "dc_dns_forwarder": "192.168.1.1",
-                "dc_domain": "example",
-                "dc_forest_level": "2008",
-                "dc_passwd": "newpasswd",
-                "dc_realm": "example.org",
-                "dc_role": "dc",
-                "id": 1
-        }
-
-   :json string dc_realm: Realm Name, eg EXAMPLE.ORG
-   :json string dc_domain: Domain Name in old format, eg EXAMPLE
-   :json string dc_role: Server Role (dc)
-   :json string dc_dns_backend: DNS Backend (SAMBA_INTERNAL/BIND9_FLATFILE/BIND9_DLZ/NONE)
-   :json string dc_dns_forwarder: DNS Forwarder IP Address
-   :json string dc_forest_level: Domain and Forest Level (2000/2003/2008/2008_R2)
-   :json string dc_passwd: Administrator Password
-   :reqheader Content-Type: the request content type
-   :resheader Content-Type: the response content type
-   :statuscode 200: no error
-
-
 DynamicDNS
 ----------
 

gui/choices.py

@@ -808,7 +808,6 @@ def __iter__(self):
 
 DIRECTORY_SERVICE_CHOICES = (
     ('activedirectory', _('Active Directory')),
-    ('domaincontroller', _('Domain Controller')),
     ('ldap', _('LDAP')),
     ('nis', _('NIS')),
 )
@@ -880,7 +879,6 @@ def __iter__(self):
     # ('auto', 'auto'),
     # ('classic', 'classic primary domain controller'),
     # ('netbios', 'netbios backup domain controller'),
-    ('dc', 'active directory domain controller'),
     # ('sdc', 'active directory secondary domain controller'),
     # ('member', 'member server'),
     # ('standalone', 'standalone')

gui/common/freenascache.py

@@ -33,7 +33,6 @@
     get_freenas_var,
     ldap_enabled,
     activedirectory_enabled,
-    domaincontroller_enabled,
     nis_enabled
 )
 
@@ -69,13 +68,6 @@
 FREENAS_NIS_LOCAL_USERCACHE = os.path.join(FREENAS_NIS_LOCALDIR, ".users")
 FREENAS_NIS_LOCAL_GROUPCACHE = os.path.join(FREENAS_NIS_LOCALDIR, ".groups")
 
-FREENAS_DC_CACHEDIR = os.path.join(FREENAS_CACHEDIR, ".nis")
-FREENAS_DC_USERCACHE = os.path.join(FREENAS_DC_CACHEDIR, ".users")
-FREENAS_DC_GROUPCACHE = os.path.join(FREENAS_DC_CACHEDIR, ".groups")
-FREENAS_DC_LOCALDIR = os.path.join(FREENAS_DC_CACHEDIR, ".local")
-FREENAS_DC_LOCAL_USERCACHE = os.path.join(FREENAS_DC_LOCALDIR, ".users")
-FREENAS_DC_LOCAL_GROUPCACHE = os.path.join(FREENAS_DC_LOCALDIR, ".groups")
-
 FLAGS_CACHE_READ_USER = 0x00000001
 FLAGS_CACHE_WRITE_USER = 0x00000002
 FLAGS_CACHE_READ_GROUP = 0x00000004
@@ -367,58 +359,6 @@ def __init__(self, **kwargs):
         log.debug("FreeNAS_NIS_LocalGroupCache.__init__: leave")
 
 
-class FreeNAS_DomainController_UserCache(FreeNAS_BaseCache):
-    def __init__(self, **kwargs):
-        log.debug("FreeNAS_DomainController_UserCache.__init__: enter")
-
-        cachedir = kwargs.get('cachedir', FREENAS_DC_USERCACHE)
-        dir = kwargs.get('dir', None)
-
-        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
-        super(FreeNAS_DomainController_UserCache, self).__init__(cachedir)
-
-        log.debug("FreeNAS_DomainController_UserCache.__init__: leave")
-
-
-class FreeNAS_DomainController_GroupCache(FreeNAS_BaseCache):
-    def __init__(self, **kwargs):
-        log.debug("FreeNAS_DomainController_GroupCache.__init__: enter")
-
-        cachedir = kwargs.get('cachedir', FREENAS_DC_GROUPCACHE)
-        dir = kwargs.get('dir', None)
-
-        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
-        super(FreeNAS_DomainController_GroupCache, self).__init__(cachedir)
-
-        log.debug("FreeNAS_DomainController_GroupCache.__init__: leave")
-
-
-class FreeNAS_DomainController_LocalUserCache(FreeNAS_BaseCache):
-    def __init__(self, **kwargs):
-        log.debug("FreeNAS_DomainController_LocalUserCache.__init__: enter")
-
-        cachedir = kwargs.get('cachedir', FREENAS_DC_LOCAL_USERCACHE)
-        dir = kwargs.get('dir', None)
-
-        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
-        super(FreeNAS_DomainController_LocalUserCache, self).__init__(cachedir)
-
-        log.debug("FreeNAS_DomainController_LocalUserCache.__init__: leave")
-
-
-class FreeNAS_DomainController_LocalGroupCache(FreeNAS_BaseCache):
-    def __init__(self, **kwargs):
-        log.debug("FreeNAS_DomainController_LocalGroupCache.__init__: enter")
-
-        cachedir = kwargs.get('cachedir', FREENAS_DC_LOCAL_GROUPCACHE)
-        dir = kwargs.get('dir', None)
-
-        cachedir = cachedir if not dir else os.path.join(cachedir, dir)
-        super(FreeNAS_DomainController_LocalGroupCache, self).__init__(cachedir)
-
-        log.debug("FreeNAS_DomainController_LocalGroupCache.__init__: leave")
-
-
 class FreeNAS_Directory_UserCache(FreeNAS_BaseCache):
     def __new__(cls, **kwargs):
         log.debug("FreeNAS_Directory_UserCache.__new__: enter")
@@ -433,9 +373,6 @@ def __new__(cls, **kwargs):
         elif nis_enabled():
             obj = FreeNAS_NIS_UserCache(**kwargs)
 
-        elif domaincontroller_enabled():
-            obj = FreeNAS_DomainController_UserCache(**kwargs)
-
         log.debug("FreeNAS_Directory_UserCache.__new__: leave")
         return obj
 
@@ -454,9 +391,6 @@ def __new__(cls, **kwargs):
         elif nis_enabled():
             obj = FreeNAS_NIS_GroupCache(**kwargs)
 
-        elif domaincontroller_enabled():
-            obj = FreeNAS_DomainController_GroupCache(**kwargs)
-
         log.debug("FreeNAS_Directory_GroupCache.__new__: leave")
         return obj
 
@@ -475,9 +409,6 @@ def __new__(cls, **kwargs):
         elif nis_enabled():
             obj = FreeNAS_NIS_LocalUserCache(**kwargs)
 
-        elif domaincontroller_enabled():
-            obj = FreeNAS_DomainController_LocalUserCache(**kwargs)
-
         log.debug("FreeNAS_Directory_LocalUserCache.__new__: leave")
         return obj
 
@@ -496,9 +427,6 @@ def __new__(cls, **kwargs):
         elif nis_enabled():
             obj = FreeNAS_NIS_LocalGroupCache(**kwargs)
 
-        elif domaincontroller_enabled():
-            obj = FreeNAS_DomainController_LocalGroupCache(**kwargs)
-
         log.debug("FreeNAS_Directory_LocalGroupCache.__new__: leave")
         return obj
 
@@ -509,7 +437,7 @@ def __new__(cls, **kwargs):
 
         obj = None
         if (
-            ldap_enabled() or activedirectory_enabled() or nis_enabled() or domaincontroller_enabled()
+            ldap_enabled() or activedirectory_enabled() or nis_enabled()
         ):
             obj = FreeNAS_Directory_LocalUserCache(**kwargs)
 
@@ -526,7 +454,7 @@ def __new__(cls, **kwargs):
 
         obj = None
         if (
-            ldap_enabled() or activedirectory_enabled() or nis_enabled() or domaincontroller_enabled()
+            ldap_enabled() or activedirectory_enabled() or nis_enabled()
         ):
             obj = FreeNAS_Directory_LocalGroupCache(**kwargs)