openstack/deb-python-pysaml2
Code Issues Proposed changes

Merge pull request #312 from knaperek/fix-timestamp-validation-error-message

Browse Source 
Fix timestamp validation error message
This commit is contained in:
Roland Hedberg
2016-02-11 09:17:57 +01:00
parent 0e4f5fa48b 9a3b3849df
commit 1220e8580c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/saml2/validate.py
View File

@@ -91,7 +91,7 @@ def validate_on_or_after(not_on_or_after, slack):
nooa = calendar.timegm(time_util.str_to_time(not_on_or_after)) nooa = calendar.timegm(time_util.str_to_time(not_on_or_after))
if now > nooa + slack: if now > nooa + slack:
raise ResponseLifetimeExceed( raise ResponseLifetimeExceed(
"Can't use it, it's too old %d > %d".format(nooa, now)) "Can't use it, it's too old %d > %d".format(now - slack, nooa))
return nooa return nooa
else: else:
return False return False
@@ -102,8 +102,7 @@ def validate_before(not_before, slack):
now = time_util.utc_now() now = time_util.utc_now()
nbefore = calendar.timegm(time_util.str_to_time(not_before)) nbefore = calendar.timegm(time_util.str_to_time(not_before))
if nbefore > now + slack: if nbefore > now + slack:
raise ToEarly("Can't use it yet %d <= %d" % (nbefore, raise ToEarly("Can't use it yet %d <= %d" % (now + slack, nbefore))
now))
return True return True