Merge a82747b into 0d6c4c5

uc-cdis · Feb 24, 2022 · 75e82fe · 75e82fe
2 parents 0d6c4c5 + a82747b
commit 75e82fe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/fence/auth.py b/fence/auth.py
@@ -194,8 +194,8 @@ def wrapper(*args, **kwargs):
                 ]
             else:
                 # fall back on "providers"
-                enable_shib = "shibboleth" in config.get(
-                    "ENABLED_IDENTITY_PROVIDERS", {}
+                enable_shib = "shibboleth" in (
+                    config.get("ENABLED_IDENTITY_PROVIDERS") or {}
                 ).get("providers", {})
 
             if enable_shib and "SHIBBOLETH_HEADER" in config:

diff --git a/fence/blueprints/login/__init__.py b/fence/blueprints/login/__init__.py
@@ -178,7 +178,7 @@ def get_login_providers_info():
     # default login option
     if config.get("DEFAULT_LOGIN_IDP"):
         default_idp = config["DEFAULT_LOGIN_IDP"]
-    elif "default" in config.get("ENABLED_IDENTITY_PROVIDERS", {}):
+    elif "default" in (config.get("ENABLED_IDENTITY_PROVIDERS") or {}):
         # fall back on ENABLED_IDENTITY_PROVIDERS.default
         default_idp = config["ENABLED_IDENTITY_PROVIDERS"]["default"]
     else:
@@ -188,7 +188,7 @@ def get_login_providers_info():
     # other login options
     if config["LOGIN_OPTIONS"]:
         login_options = config["LOGIN_OPTIONS"]
-    elif "providers" in config.get("ENABLED_IDENTITY_PROVIDERS", {}):
+    elif "providers" in (config.get("ENABLED_IDENTITY_PROVIDERS") or {}):
         # fall back on "providers" and convert to "login_options" format
         enabled_providers = config["ENABLED_IDENTITY_PROVIDERS"]["providers"]
         login_options = [

diff --git a/fence/blueprints/oauth2.py b/fence/blueprints/oauth2.py
@@ -78,8 +78,8 @@ def authorize(*args, **kwargs):
 
     login_url = None
     if not idp:
-        if not config.get("DEFAULT_LOGIN_IDP") and "default" not in config.get(
-            "ENABLED_IDENTITY_PROVIDERS", {}
+        if not config.get("DEFAULT_LOGIN_IDP") and "default" not in (
+            config.get("ENABLED_IDENTITY_PROVIDERS") or {}
         ):
             # fall back on deprecated DEFAULT_LOGIN_URL
             login_url = config.get("DEFAULT_LOGIN_URL")