diff --git a/archivebox/__init__.py b/archivebox/__init__.py index 30d7f5e7..ff70177f 100755 --- a/archivebox/__init__.py +++ b/archivebox/__init__.py @@ -56,7 +56,7 @@ from .config.paths import PACKAGE_DIR, DATA_DIR, ARCHIVE_DIR # noqa from .config.version import VERSION # noqa __version__ = VERSION -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __license__ = 'MIT' ASCII_ICON = """ diff --git a/archivebox/plugins_auth/ldap/__init__.py b/archivebox/plugins_auth/ldap/__init__.py index 5c6136f2..66d5ad88 100644 --- a/archivebox/plugins_auth/ldap/__init__.py +++ b/archivebox/plugins_auth/ldap/__init__.py @@ -1,9 +1,10 @@ __package__ = 'plugins_auth.ldap' -__label__ = 'ldap' +__id__ = 'ldap' +__label__ = 'LDAP' __version__ = '2024.10.14' -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __homepage__ = 'https://github.com/django-auth-ldap/django-auth-ldap' -# __dependencies__ = ['pip'] +__dependencies__ = ['pip'] import abx @@ -11,22 +12,24 @@ import abx @abx.hookimpl def get_PLUGIN(): return { - 'ldap': { - 'PACKAGE': __package__, - 'LABEL': __label__, - 'VERSION': __version__, - 'AUTHOR': __author__, - 'HOMEPAGE': __homepage__, - # 'DEPENDENCIES': __dependencies__, + __id__: { + 'id': __id__, + '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 + __id__: LDAP_CONFIG } @abx.hookimpl @@ -39,6 +42,11 @@ def get_BINARIES(): def create_superuser_from_ldap_user(sender, user=None, ldap_user=None, **kwargs): + """ + Invoked after LDAP authenticates a user, but before they have a local User account created. + ArchiveBox requires staff/superuser status to view the admin at all, so we must create a user + + set staff and superuser when LDAP authenticates a new person. + """ from django.conf import settings if user is None: @@ -53,9 +61,12 @@ def create_superuser_from_ldap_user(sender, user=None, ldap_user=None, **kwargs) @abx.hookimpl def ready(): + """ + Called at AppConfig.ready() time (settings + models are all loaded) + """ from django.conf import settings if settings.CONFIGS.ldap.LDAP_ENABLED: + # tell django-auth-ldap to call our function when a user is authenticated via LDAP import django_auth_ldap.backend django_auth_ldap.backend.populate_user.connect(create_superuser_from_ldap_user) - \ No newline at end of file diff --git a/archivebox/plugins_extractor/archivedotorg/__init__.py b/archivebox/plugins_extractor/archivedotorg/__init__.py index 1ff672b2..a5c24932 100644 --- a/archivebox/plugins_extractor/archivedotorg/__init__.py +++ b/archivebox/plugins_extractor/archivedotorg/__init__.py @@ -1,7 +1,7 @@ __package__ = 'plugins_extractor.archivedotorg' __label__ = 'archivedotorg' __version__ = '2024.10.14' -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __homepage__ = 'https://archive.org' __dependencies__ = [] diff --git a/archivebox/plugins_extractor/chrome/__init__.py b/archivebox/plugins_extractor/chrome/__init__.py index e33fe9b4..f24d1380 100644 --- a/archivebox/plugins_extractor/chrome/__init__.py +++ b/archivebox/plugins_extractor/chrome/__init__.py @@ -1,7 +1,7 @@ __package__ = 'plugins_extractor.chrome' __label__ = 'chrome' __version__ = '2024.10.14' -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __homepage__ = 'https://github.com/ArchiveBox/ArchiveBox/tree/main/archivebox/plugins_extractor/chrome' __dependencies__ = [] diff --git a/archivebox/plugins_extractor/curl/__init__.py b/archivebox/plugins_extractor/curl/__init__.py index 9cc1861c..99af0107 100644 --- a/archivebox/plugins_extractor/curl/__init__.py +++ b/archivebox/plugins_extractor/curl/__init__.py @@ -1,7 +1,7 @@ __package__ = 'plugins_extractor.curl' __label__ = 'curl' __version__ = '2024.10.14' -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __homepage__ = 'https://github.com/curl/curl' __dependencies__ = [] diff --git a/archivebox/plugins_extractor/favicon/__init__.py b/archivebox/plugins_extractor/favicon/__init__.py index 3cbab126..3fa84560 100644 --- a/archivebox/plugins_extractor/favicon/__init__.py +++ b/archivebox/plugins_extractor/favicon/__init__.py @@ -1,7 +1,7 @@ __package__ = 'plugins_extractor.favicon' __label__ = 'favicon' __version__ = '2024.10.14' -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __homepage__ = 'https://github.com/ArchiveBox/archivebox' __dependencies__ = [] diff --git a/archivebox/plugins_extractor/git/__init__.py b/archivebox/plugins_extractor/git/__init__.py index 2e8d69d9..db18919f 100644 --- a/archivebox/plugins_extractor/git/__init__.py +++ b/archivebox/plugins_extractor/git/__init__.py @@ -1,7 +1,7 @@ __package__ = 'plugins_extractor.git' __label__ = 'git' __version__ = '2024.10.14' -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __homepage__ = 'https://github.com/git/git' __dependencies__ = [] diff --git a/archivebox/plugins_extractor/mercury/__init__.py b/archivebox/plugins_extractor/mercury/__init__.py index d974a7bb..10aca671 100644 --- a/archivebox/plugins_extractor/mercury/__init__.py +++ b/archivebox/plugins_extractor/mercury/__init__.py @@ -1,7 +1,7 @@ __package__ = 'plugins_extractor.mercury' __label__ = 'mercury' __version__ = '2024.10.14' -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __homepage__ = 'https://github.com/postlight/mercury-parser' __dependencies__ = ['npm'] diff --git a/archivebox/plugins_extractor/readability/__init__.py b/archivebox/plugins_extractor/readability/__init__.py index 48a6f17f..2ef1a1a8 100644 --- a/archivebox/plugins_extractor/readability/__init__.py +++ b/archivebox/plugins_extractor/readability/__init__.py @@ -1,7 +1,7 @@ __package__ = 'plugins_extractor.readability' __label__ = 'readability' __version__ = '2024.10.14' -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __homepage__ = 'https://github.com/ArchiveBox/readability-extractor' __dependencies__ = ['npm'] diff --git a/archivebox/plugins_extractor/singlefile/__init__.py b/archivebox/plugins_extractor/singlefile/__init__.py index 007135b9..cd72adb8 100644 --- a/archivebox/plugins_extractor/singlefile/__init__.py +++ b/archivebox/plugins_extractor/singlefile/__init__.py @@ -1,7 +1,7 @@ __package__ = 'plugins_extractor.singlefile' __label__ = 'singlefile' __version__ = '2024.10.14' -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __homepage__ = 'https://github.com/gildas-lormeau/singlefile' __dependencies__ = ['npm'] diff --git a/archivebox/plugins_extractor/wget/__init__.py b/archivebox/plugins_extractor/wget/__init__.py index b0306f00..506ad7bf 100644 --- a/archivebox/plugins_extractor/wget/__init__.py +++ b/archivebox/plugins_extractor/wget/__init__.py @@ -1,7 +1,7 @@ __package__ = 'plugins_extractor.wget' __label__ = 'wget' __version__ = '2024.10.14' -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __homepage__ = 'https://github.com/ArchiveBox/ArchiveBox/tree/main/archivebox/plugins_extractor/wget' __dependencies__ = [] diff --git a/archivebox/plugins_extractor/ytdlp/__init__.py b/archivebox/plugins_extractor/ytdlp/__init__.py index 7afa2c93..26157c24 100644 --- a/archivebox/plugins_extractor/ytdlp/__init__.py +++ b/archivebox/plugins_extractor/ytdlp/__init__.py @@ -1,7 +1,7 @@ __package__ = 'plugins_extractor.ytdlp' __label__ = 'YT-DLP' __version__ = '2024.10.14' -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __homepage__ = 'https://github.com/yt-dlp/yt-dlp' import abx diff --git a/archivebox/plugins_pkg/npm/__init__.py b/archivebox/plugins_pkg/npm/__init__.py index 4ab692d2..60b418eb 100644 --- a/archivebox/plugins_pkg/npm/__init__.py +++ b/archivebox/plugins_pkg/npm/__init__.py @@ -1,7 +1,7 @@ __package__ = 'plugins_pkg.npm' __label__ = 'npm' __version__ = '2024.10.14' -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __homepage__ = 'https://www.npmjs.com/' import abx diff --git a/archivebox/plugins_pkg/pip/__init__.py b/archivebox/plugins_pkg/pip/__init__.py index 7d86322e..c1be27b1 100644 --- a/archivebox/plugins_pkg/pip/__init__.py +++ b/archivebox/plugins_pkg/pip/__init__.py @@ -1,7 +1,7 @@ __package__ = 'plugins_pkg.pip' __label__ = 'pip' __version__ = '2024.10.14' -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __homepage__ = 'https://github.com/pypa/pip' import abx diff --git a/archivebox/plugins_pkg/playwright/__init__.py b/archivebox/plugins_pkg/playwright/__init__.py index 2102cb93..0f66f42c 100644 --- a/archivebox/plugins_pkg/playwright/__init__.py +++ b/archivebox/plugins_pkg/playwright/__init__.py @@ -1,7 +1,7 @@ __package__ = 'plugins_pkg.playwright' __label__ = 'playwright' __version__ = '2024.10.14' -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __homepage__ = 'https://github.com/microsoft/playwright-python' import abx diff --git a/archivebox/plugins_pkg/puppeteer/__init__.py b/archivebox/plugins_pkg/puppeteer/__init__.py index 1f38f766..7acc5b1b 100644 --- a/archivebox/plugins_pkg/puppeteer/__init__.py +++ b/archivebox/plugins_pkg/puppeteer/__init__.py @@ -1,7 +1,7 @@ __package__ = 'plugins_pkg.puppeteer' __label__ = 'puppeteer' __version__ = '2024.10.14' -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __homepage__ = 'https://github.com/puppeteer/puppeteer' __dependencies__ = ['npm'] diff --git a/archivebox/plugins_search/ripgrep/__init__.py b/archivebox/plugins_search/ripgrep/__init__.py index 9a269eba..ac1e417c 100644 --- a/archivebox/plugins_search/ripgrep/__init__.py +++ b/archivebox/plugins_search/ripgrep/__init__.py @@ -1,7 +1,7 @@ __package__ = 'plugins_search.ripgrep' __label__ = 'ripgrep' __version__ = '2024.10.14' -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __homepage__ = 'https://github.com/BurntSushi/ripgrep' __dependencies__ = [] diff --git a/archivebox/plugins_search/sonic/__init__.py b/archivebox/plugins_search/sonic/__init__.py index 59792a99..4b81b0be 100644 --- a/archivebox/plugins_search/sonic/__init__.py +++ b/archivebox/plugins_search/sonic/__init__.py @@ -1,7 +1,7 @@ __package__ = 'plugins_search.sonic' __label__ = 'sonic' __version__ = '2024.10.14' -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __homepage__ = 'https://github.com/valeriansaliou/sonic' __dependencies__ = [] diff --git a/archivebox/plugins_search/sqlitefts/__init__.py b/archivebox/plugins_search/sqlitefts/__init__.py index ecb34be8..63fb1b12 100644 --- a/archivebox/plugins_search/sqlitefts/__init__.py +++ b/archivebox/plugins_search/sqlitefts/__init__.py @@ -1,7 +1,7 @@ __package__ = 'plugins_search.sqlitefts' __label__ = 'sqlitefts' __version__ = '2024.10.14' -__author__ = 'Nick Sweeting' +__author__ = 'ArchiveBox' __homepage__ = 'https://github.com/ArchiveBox/archivebox' __dependencies__ = []