Handle b64decode exception. Proposed by Seth Arnold.

Author: Roland Hedberg

example/idp2/idp.py

@@ -449,18 +449,22 @@ def ecp(self):
         try:
             authz_info = self.environ["HTTP_AUTHORIZATION"]
             if authz_info.startswith("Basic "):
-                _info = base64.b64decode(authz_info[6:])
-                logger.debug("Authz_info: %s" % _info)
                 try:
-                    (user, passwd) = _info.split(":")
-                    if PASSWD[user] != passwd:
-                        resp = Unauthorized()
-                    self.user = user
-                    self.environ[
-                        "idp.authn"] = AUTHN_BROKER.get_authn_by_accr(
-                        PASSWORD)
-                except ValueError:
+                    _info = base64.b64decode(authz_info[6:])
+                except TypeError:
                     resp = Unauthorized()
+                else:
+                    logger.debug("Authz_info: %s" % _info)
+                    try:
+                        (user, passwd) = _info.split(":")
+                        if PASSWD[user] != passwd:
+                            resp = Unauthorized()
+                        self.user = user
+                        self.environ[
+                            "idp.authn"] = AUTHN_BROKER.get_authn_by_accr(
+                            PASSWORD)
+                    except ValueError:
+                        resp = Unauthorized()
             else:
                 resp = Unauthorized()
         except KeyError:

example/idp2/idp_uwsgi.py

@@ -419,18 +419,22 @@ def ecp(self):
         try:
             authz_info = self.environ["HTTP_AUTHORIZATION"]
             if authz_info.startswith("Basic "):
-                _info = base64.b64decode(authz_info[6:])
-                logger.debug("Authz_info: %s" % _info)
                 try:
-                    (user, passwd) = _info.split(":")
-                    if PASSWD[user] != passwd:
-                        resp = Unauthorized()
-                    self.user = user
-                    self.environ[
-                        "idp.authn"] = AUTHN_BROKER.get_authn_by_accr(
-                            PASSWORD)
-                except ValueError:
+                    _info = base64.b64decode(authz_info[6:])
+                except TypeError:
                     resp = Unauthorized()
+                else:
+                    logger.debug("Authz_info: %s" % _info)
+                    try:
+                        (user, passwd) = _info.split(":")
+                        if PASSWD[user] != passwd:
+                            resp = Unauthorized()
+                        self.user = user
+                        self.environ[
+                            "idp.authn"] = AUTHN_BROKER.get_authn_by_accr(
+                            PASSWORD)
+                    except ValueError:
+                        resp = Unauthorized()
             else:
                 resp = Unauthorized()
         except KeyError:

example/idp2_repoze/idp.py

@@ -406,15 +406,19 @@ def ecp(self):
         try:
             authz_info = self.environ["HTTP_AUTHORIZATION"]
             if authz_info.startswith("Basic "):
-                _info = base64.b64decode(authz_info[6:])
-                logger.debug("Authz_info: %s" % _info)
                 try:
-                    (user, passwd) = _info.split(":")
-                    if PASSWD[user] != passwd:
-                        resp = Unauthorized()
-                    self.user = user
-                except ValueError:
+                    _info = base64.b64decode(authz_info[6:])
+                except TypeError:
                     resp = Unauthorized()
+                else:
+                    logger.debug("Authz_info: %s" % _info)
+                    try:
+                        (user, passwd) = _info.split(":")
+                        if PASSWD[user] != passwd:
+                            resp = Unauthorized()
+                        self.user = user
+                    except (ValueError, TypeError):
+                        resp = Unauthorized()
             else:
                 resp = Unauthorized()
         except KeyError: