GUI-2879 added more error checking and logging when oidc credentials …

…ini file is badly constructed
eucalyptus · Mar 24, 2017 · 0d4785b · 0d4785b
1 parent 1a22744
commit 0d4785b
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/eucaconsole/views/login.py b/eucaconsole/views/login.py
@@ -390,15 +390,23 @@ def load_oidc_credentials(settings):
             logging.error("missing the oidc.client.ini file, refer to this setting in the console.ini")
             return None
         else:
-            ini = ConfigParser.ConfigParser()
-            with open(source) as f:
-                ini.readfp(f)
-
-        Creds =  collections.namedtuple('oidc_creds', 'client_id client_secret')
-        return Creds(
-            client_id=ini.get('general', 'oidc.client.id'),
-            client_secret=ini.get('general', 'oidc.client.secret')
-        )
+            try:
+                ini = ConfigParser.ConfigParser()
+                with open(source) as f:
+                    ini.readfp(f)
+            except ConfigParser.Error as err:
+                logging.error("Error parsing the oidc.client.ini file: " + err.message)
+                return None
+
+        try:
+            Creds = collections.namedtuple('oidc_creds', 'client_id client_secret')
+            return Creds(
+                client_id=ini.get('general', 'oidc.client.id'),
+                client_secret=ini.get('general', 'oidc.client.secret')
+            )
+        except ConfigParser.Error as err:
+            logging.error("Error reading the oidc.client.ini file: " + err.message)
+            return None
 
 
 class LogoutView(BaseView):