More cleanup

freeipa · Jun 11, 2021 · cd29444 · cd29444
1 parent c16022e
commit cd29444
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 32 deletions.
diff --git a/ipaserver/custodia/server/config.py b/ipaserver/custodia/server/config.py
@@ -7,8 +7,6 @@
 import socket
 from urllib.parse import quote as url_escape
 
-import six
-
 
 class CustodiaConfig:
     CONFIG_SPECIALS = ['authenticators', 'authorizers', 'consumers', 'stores']

diff --git a/ipaserver/secrets/service.py b/ipaserver/secrets/service.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2017  IPA Project Contributors, see COPYING for license
 import argparse
 
-import custodia.server  # pylint: disable=relative-import
+import ipaserver.custodia.server  # pylint: disable=relative-import
 
 
 argparser = argparse.ArgumentParser(
@@ -23,7 +23,7 @@
 
 
 def main():
-    return custodia.server.main(argparser)
+    return ipaserver.custodia.server.main(argparser)
 
 
 if __name__ == '__main__':

diff --git a/ipaserver/setup.py b/ipaserver/setup.py
@@ -23,30 +23,6 @@
 from os.path import abspath, dirname
 import sys
 
-custodia_authenticators = [
-    'IPAInterface = ipaserver.custodia.ipa.interface:IPAInterface',
-    ('SimpleCredsAuth = '
-     'ipaserver.custodia.httpd.authenticators:SimpleCredsAuth'),
-]
-
-custodia_authorizers = [
-    'SimplePathAuthz = ipaserver.custodia.httpd.authorizers:SimplePathAuthz',
-    'UserNameSpace = ipaserver.custodia.httpd.authorizers:UserNameSpace',
-    'KEMKeysStore = ipaserver.custodia.message.kem:KEMKeysStore',
-    'IPAKEMKeys = ipaserver.secrets.kem:IPAKEMKeys',
-]
-
-custodia_clients = [
-    'KEMClient = ipaserver.custodia.client:CustodiaKEMClient',
-    'SimpleClient = ipaserver.custodia.client:CustodiaSimpleClient',
-]
-
-custodia_consumers = [
-    'Forwarder = ipaserver.custodia.forwarder:Forwarder',
-    'Secrets = ipaserver.custodia.secrets:Secrets',
-    'Root = ipaserver.custodia.root:Root',
-]
-
 
 if __name__ == '__main__':
     # include ../ for ipasetup.py
@@ -95,10 +71,25 @@
             "python-ldap",
         ],
         entry_points={
-            'ipaserver.custodia.authenticators': custodia_authenticators,
-            'ipaserver.custodia.authorizers': custodia_authorizers,
-            'ipaserver.custodia.clients': custodia_clients,
-            'ipaserver.custodia.consumers': custodia_consumers,
+            'ipaserver.custodia.authenticators': [
+                ('SimpleCredsAuth = '
+                 'ipaserver.custodia.httpd.authenticators:SimpleCredsAuth'),
+                ('SimpleHeaderAuth = '
+                 'custodia.httpd.authenticators:SimpleHeaderAuth'),
+            ],
+            'ipaserver.custodia.authorizers': [
+                'IPAKEMKeys = ipaserver.secrets.kem:IPAKEMKeys',
+            ],
+            'ipaserver.custodia.clients': [
+                'KEMClient = ipaserver.custodia.client:CustodiaKEMClient',
+                ('SimpleClient = '
+                 'ipaserver.custodia.client:CustodiaSimpleClient'),
+            ],
+            'ipaserver.custodia.consumers': [
+                'Forwarder = ipaserver.custodia.forwarder:Forwarder',
+                'Secrets = ipaserver.custodia.secrets:Secrets',
+                'Root = ipaserver.custodia.root:Root',
+            ],
             'ipaserver.custodia.stores': [
                 'IPASecStore = ipaserver.secrets.store:IPASecStore',
             ],