summaryrefslogtreecommitdiff
path: root/example
diff options
context:
space:
mode:
authorRoland Hedberg <roland.hedberg@adm.umu.se>2015-02-28 07:26:48 +0100
committerRoland Hedberg <roland.hedberg@adm.umu.se>2015-02-28 07:26:48 +0100
commitdd6d2243b34fd05e6ade789a3adad2e51394d90b (patch)
treefb73cbd7cf589611df592d8ffca5bf1b48df9a03 /example
parent6828283977544b3a674066f30fa088aef138207e (diff)
downloadpysaml2-dd6d2243b34fd05e6ade789a3adad2e51394d90b.tar.gz
Handle b64decode exception. Proposed by Seth Arnold.
Diffstat (limited to 'example')
-rwxr-xr-xexample/idp2/idp.py2
-rwxr-xr-xexample/idp2/idp_uwsgi.py2
-rwxr-xr-xexample/idp2_repoze/idp.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/example/idp2/idp.py b/example/idp2/idp.py
index 48c88895..b2857eeb 100755
--- a/example/idp2/idp.py
+++ b/example/idp2/idp.py
@@ -831,7 +831,7 @@ def info_from_cookie(kaka):
try:
key, ref = base64.b64decode(morsel.value).split(":")
return IDP.cache.uid2user[key], ref
- except KeyError:
+ except (KeyError, TypeError):
return None, None
else:
logger.debug("No idpauthn cookie")
diff --git a/example/idp2/idp_uwsgi.py b/example/idp2/idp_uwsgi.py
index 01d338b6..ac5c82ff 100755
--- a/example/idp2/idp_uwsgi.py
+++ b/example/idp2/idp_uwsgi.py
@@ -777,7 +777,7 @@ def info_from_cookie(kaka):
try:
key, ref = base64.b64decode(morsel.value).split(":")
return IDP.cache.uid2user[key], ref
- except KeyError:
+ except (TypeError, KeyError):
return None, None
else:
logger.debug("No idpauthn cookie")
diff --git a/example/idp2_repoze/idp.py b/example/idp2_repoze/idp.py
index 4729392b..168fd3f6 100755
--- a/example/idp2_repoze/idp.py
+++ b/example/idp2_repoze/idp.py
@@ -758,7 +758,7 @@ def info_from_cookie(kaka):
try:
key, ref = base64.b64decode(morsel.value).split(":")
return IDP.cache.uid2user[key], ref
- except KeyError:
+ except (KeyError, TypeError):
return None, None
else:
logger.debug("No idpauthn cookie")