new vastly simplified plugin spec without pydantic

archivebox/plugins_auth/ldap/__init__.py

@@ -0,0 +1,61 @@
+__package__ = 'plugins_auth.ldap'
+__label__ = 'ldap'
+__version__ = '2024.10.14'
+__author__ = 'Nick Sweeting'
+__homepage__ = 'https://github.com/django-auth-ldap/django-auth-ldap'
+# __dependencies__ = ['pip']
+
+import abx
+
+
+@abx.hookimpl
+def get_PLUGIN():
+    return {
+        'ldap': {
+            'PACKAGE': __package__,
+            'LABEL': __label__,
+            'VERSION': __version__,
+            'AUTHOR': __author__,
+            'HOMEPAGE': __homepage__,
+            # 'DEPENDENCIES': __dependencies__,
+        }
+    }
+
+@abx.hookimpl
+def get_CONFIG():
+    from .config import LDAP_CONFIG
+    
+    return {
+        'ldap': LDAP_CONFIG
+    }
+
+@abx.hookimpl
+def get_BINARIES():
+    from .binaries import LDAP_BINARY
+    
+    return {
+        'ldap': LDAP_BINARY,
+    }
+
+
+def create_superuser_from_ldap_user(sender, user=None, ldap_user=None, **kwargs):
+    from django.conf import settings
+    
+    if user is None:
+        return                        # not authenticated at all
+    
+    if not user.id and settings.CONFIGS.ldap.LDAP_CREATE_SUPERUSER:
+        user.is_superuser = True      # authenticated via LDAP, but user is not set up in DB yet
+
+    user.is_staff = True
+    print(f'[!] WARNING: Creating new user {user} based on LDAP user {ldap_user} (is_staff={user.is_staff}, is_superuser={user.is_superuser})')
+
+
+@abx.hookimpl
+def ready():
+    from django.conf import settings
+    
+    if settings.CONFIGS.ldap.LDAP_ENABLED:
+        import django_auth_ldap.backend
+        django_auth_ldap.backend.populate_user.connect(create_superuser_from_ldap_user)
+    

archivebox/plugins_auth/ldap/binaries.py

@@ -1,4 +1,4 @@
-__package__ = 'archivebox.plugins_auth.ldap'
+__package__ = 'plugins_auth.ldap'
 
 
 import inspect
@@ -9,17 +9,14 @@ from pydantic import InstanceOf
 
 from pydantic_pkgr import BinaryOverrides, SemVer
 
-import abx
 
-from abx.archivebox.base_plugin import BasePlugin
-from abx.archivebox.base_hook import BaseHook
 from abx.archivebox.base_binary import BaseBinary, BaseBinProvider, apt
 
-from plugins_pkg.pip.apps import SYS_PIP_BINPROVIDER, VENV_PIP_BINPROVIDER, LIB_PIP_BINPROVIDER, VENV_SITE_PACKAGES, LIB_SITE_PACKAGES, USER_SITE_PACKAGES, SYS_SITE_PACKAGES
-from .settings import LDAP_CONFIG, get_ldap_lib
+from plugins_pkg.pip.binproviders import SYS_PIP_BINPROVIDER, VENV_PIP_BINPROVIDER, LIB_PIP_BINPROVIDER, VENV_SITE_PACKAGES, LIB_SITE_PACKAGES, USER_SITE_PACKAGES, SYS_SITE_PACKAGES
+
+from .config import get_ldap_lib
 
 
-###################### Config ##########################
 
 def get_LDAP_LIB_path(paths=()):
     LDAP_LIB = get_ldap_lib()[0]
@@ -36,10 +33,12 @@ def get_LDAP_LIB_path(paths=()):
             return lib_path
     return None
 
+
 def get_LDAP_LIB_version():
     LDAP_LIB = get_ldap_lib()[0]
     return LDAP_LIB and SemVer(LDAP_LIB.__version__)
 
+
 class LdapBinary(BaseBinary):
     name: str = 'ldap'
     description: str = 'LDAP Authentication'
@@ -69,38 +68,3 @@ class LdapBinary(BaseBinary):
     }
 
 LDAP_BINARY = LdapBinary()
-
-
-def create_superuser_from_ldap_user(sender, user=None, ldap_user=None, **kwargs):
-    if user is None:
-        # not authenticated at all
-        return
-    
-    if not user.id and LDAP_CONFIG.LDAP_CREATE_SUPERUSER:
-        # authenticated via LDAP, but user is not set up in DB yet
-        user.is_superuser = True
-
-    user.is_staff = True
-    print(f'[!] WARNING: Creating new user {user} based on LDAP user {ldap_user} (is_staff={user.is_staff}, is_superuser={user.is_superuser})')
-
-
-class LdapAuthPlugin(BasePlugin):
-    app_label: str = 'ldap'
-    verbose_name: str = 'LDAP Authentication'
-
-    hooks: List[InstanceOf[BaseHook]] = [
-        LDAP_CONFIG,
-        *([LDAP_BINARY] if LDAP_CONFIG.LDAP_ENABLED else []),
-    ]
-    
-    @abx.hookimpl
-    def ready(self):
-        super().ready()
-        
-        if LDAP_CONFIG.LDAP_ENABLED:
-            import django_auth_ldap.backend
-            django_auth_ldap.backend.populate_user.connect(create_superuser_from_ldap_user)
-        
-
-PLUGIN = LdapAuthPlugin()
-DJANGO_APP = PLUGIN.AppConfig

archivebox/plugins_auth/ldap/config.py

@@ -1,4 +1,4 @@
-__package__ = 'archivebox.plugins_auth.ldap'
+__package__ = 'plugins_auth.ldap'
 
 import sys