openstack/deb-python-pysaml2
Code Issues Proposed changes

Merge pull request #194 from dfeinzeig/patch-2

Browse Source 
some IdPs (for example OneLogin seem to exclude the trailing Z in the Is...
This commit is contained in:
Roland Hedberg
2015-03-20 20:33:46 +01:00
parent f32cf2c143 348892465b
commit fcf9e84e70
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/saml2/time_util.py
View File

@@ -16,7 +16,7 @@ from datetime import datetime
TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ" TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
TIME_FORMAT_WITH_FRAGMENT = re.compile( TIME_FORMAT_WITH_FRAGMENT = re.compile(
"^(\d{4,4}-\d{2,2}-\d{2,2}T\d{2,2}:\d{2,2}:\d{2,2})\.\d*Z$") "^(\d{4,4}-\d{2,2}-\d{2,2}T\d{2,2}:\d{2,2}:\d{2,2})(\.\d*)?Z?$")
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# I'm sure this is implemented somewhere else can't find it now though, so I # I'm sure this is implemented somewhere else can't find it now though, so I

4
tests/test_10_time_util.py
View File

@@ -123,7 +123,9 @@ def test_str_to_time():
#TODO: add something to show how this time was arrived at #TODO: add something to show how this time was arrived at
# do this as an external method in the # do this as an external method in the
assert t == 947635200 assert t == 947635200
# some IdPs omit the trailing Z, and SAML spec is unclear if it is actually required
t = calendar.timegm(str_to_time("2000-01-12T00:00:00"))
assert t == 947635200
def test_instant(): def test_instant():
inst = str_to_time(instant()) inst = str_to_time(instant())