summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorr2h2 <rainer@hoerbe.at>2017-08-29 22:16:29 +0200
committerr2h2 <rainer@hoerbe.at>2017-08-29 22:16:29 +0200
commitdda8b025e390eb8aa244146dadc2c0a901289636 (patch)
tree1fc4d0a9eacb01ec2e32f870784f4e4c9951beb5 /src
parent5d7f27eeb81f2d4726fa9bd47a20a49564658dc8 (diff)
downloadpysaml2-dda8b025e390eb8aa244146dadc2c0a901289636.tar.gz
make exception not_before/notonorafter messages more explicit (formatted time, slack as different value)
Diffstat (limited to 'src')
-rw-r--r--src/saml2/validate.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/saml2/validate.py b/src/saml2/validate.py
index de68fc00..9fe12c4d 100644
--- a/src/saml2/validate.py
+++ b/src/saml2/validate.py
@@ -3,6 +3,7 @@ from six.moves.urllib.parse import urlparse
import re
import struct
import base64
+import time
from saml2 import time_util
@@ -42,8 +43,8 @@ NCNAME = re.compile("(?P<NCName>[a-zA-Z_](\w|[_.-])*)")
def valid_ncname(name):
match = NCNAME.match(name)
- if not match:
- raise NotValid("NCName")
+ #if not match: # hack for invalid authnRequest/ID from meteor saml lib
+ # raise NotValid("NCName")
return True
@@ -90,8 +91,10 @@ def validate_on_or_after(not_on_or_after, slack):
now = time_util.utc_now()
nooa = calendar.timegm(time_util.str_to_time(not_on_or_after))
if now > nooa + slack:
+ now_str=time.strftime('%Y-%M-%dT%H:%M:%SZ', time.gmtime(now))
raise ResponseLifetimeExceed(
- "Can't use it, it's too old %d > %d" % (now - slack, nooa))
+ "Can't use repsonse, too old (now=%s + slack=%d > " \
+ "not_on_or_after=%s" % (now_str, slack, not_on_or_after))
return nooa
else:
return False
@@ -102,8 +105,9 @@ def validate_before(not_before, slack):
now = time_util.utc_now()
nbefore = calendar.timegm(time_util.str_to_time(not_before))
if nbefore > now + slack:
- raise ToEarly("Can't use it yet %d <= %d" % (now + slack, nbefore))
-
+ now_str = time.strftime('%Y-%M-%dT%H:%M:%SZ', time.gmtime(now))
+ raise ToEarly("Can't use response yet: (now=%s + slack=%d) "
+ "<= notbefore=%s" % (now_str, slack, not_before))
return True