Additional monkey patching

VERSION

@@ -1 +1 @@
-2.6
+2.7

spectacles/webapp/VERSION

@@ -1 +1 @@
-2.6
+2.7

spectacles/webapp/auth/openid_login.py

@@ -122,5 +122,5 @@ def oidc_logout():
                 )
 
         oidc.logout()
-    except Exception:
+    except TypeError:
         raise

spectacles/webapp/auth/views.py

@@ -31,17 +31,21 @@ def load_user(user_id):
 def logout():
     logout_user()
 
-    try:
-        from .openid_login import oidc_logout
-
-        oidc_logout()
-    except ImportError:
-        pass
-    except Exception:
-        pass
-
-    # Redirect to login page
-    return redirect(url_for("auth.func_login"))
+    if config.OPENID_LOGIN:
+        try:
+            from .openid_login import oidc_logout
+
+            oidc_logout()
+        except ImportError:
+            pass
+        except TypeError:
+            pass
+
+    if config.PORTAL_URL is not None:
+        return redirect(config.PORTAL_URL)
+    else:
+        # Redirect to login page
+        return redirect(url_for("auth.func_login"))
 
 
 def verify_password(password, password_hash):

spectacles/webapp/config.py

@@ -73,4 +73,6 @@ class Config(object):
     SYSLOG_SERVER = os.getenv("SYSLOG_SERVER", "172.16.1.1")
     SYSLOG_PORT = os.getenv("SYSLOG_PORT", "5140")
 
+    PORTAL_URL = os.getenv("PORTAL_URL", None)
+
     REGISTER_ENABLED = getenv_bool("REGISTER_ENABLED", "False")

wsgi.py

@@ -3,6 +3,14 @@
 
 monkey.patch_all()
 
+# additional monkey patch for allowing self-signed certificates
+import ssl
+
+ctx = ssl.create_default_context()
+ctx.check_hostname = False
+ctx.verify_mode = ssl.CERT_NONE
+ssl._create_default_https_context = ctx
+
 import click
 from flask.cli import with_appcontext
 import logging