Merge pull request #169 from Progress1/bug_ldap

Fixed bugs from last PR

docker/Dockerfile.publishers

@@ -26,6 +26,7 @@ RUN pip install --no-cache-dir ./custom_packages/taranis_ng_shared-*.whl && rm -
 COPY ./src/publishers/requirements.txt /app/requirements.txt
 RUN apk add --no-cache \
     swig\
+    libmagic \
     gnupg 
 
 RUN \

src/core/README.md

@@ -63,4 +63,5 @@ If you prefer to authenticate users with LDAP, you need to set environment varia
 TARANIS_NG_AUTHENTICATOR: "ldap"
 LDAP_SERVER: "ldaps://ldap.example.com"
 LDAP_BASE_DN: "ou=people,dc=example,dc=com"
+LDAP_CA_CERT_PATH: "auth/ldap_ca.pem"
 ```

src/core/auth/ldap_authenticator.py

@@ -20,8 +20,8 @@ class LDAPAuthenticator(BaseAuthenticator):
 
     LDAP_SERVER = os.getenv('LDAP_SERVER')
     LDAP_BASE_DN = os.getenv('LDAP_BASE_DN')
-    LDAP_CA_CERT_PATH = 'auth/ldap_ca.pem'
-    if not os.path.isfile(LDAP_CA_CERT_PATH):
+    LDAP_CA_CERT_PATH = os.getenv('LDAP_CA_CERT_PATH')
+    if LDAP_CA_CERT_PATH is not None and not os.path.isfile(LDAP_CA_CERT_PATH):
         LDAP_CA_CERT_PATH = None
         log_manager.store_auth_error_activity("No LDAP CA certificate found. LDAP authentication might not work.")
 

src/core/managers/auth_manager.py

@@ -38,7 +38,9 @@ def initialize(app):
 
     JWTManager(app)
 
-    which = os.getenv('TARANIS_NG_AUTHENTICATOR').casefold()
+    which = os.getenv('TARANIS_NG_AUTHENTICATOR')
+    if which is not None:
+        which = which.lower()
     if which == 'openid':
         current_authenticator = OpenIDAuthenticator()
     elif which == 'keycloak':
@@ -271,7 +273,7 @@ def wrapper(*args, **kwargs):
         error = ({'error': 'not authorized'}, 401)
 
         # do we have the authorization header?
-        if 'Authorization' not in request.headers.has_key:
+        if 'Authorization' not in request.headers:
             log_manager.store_auth_error_activity("Missing Authorization header for external access")
             return error