openstack/deb-python-pysaml2
Code Issues Proposed changes

Merge pull request #98 from rhoerbe/master

Browse Source 
added support for RFC 1123 date format
This commit is contained in:
Roland Hedberg
2014-03-21 21:00:08 +01:00
parent c52306c11a 3e993a5a45
commit a8c5cc5194
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/saml2/httpbase.py
View File

@@ -67,11 +67,20 @@ def _since_epoch(cdate):
if len(cdate) < 5:
return utc_now()
cdate = cdate[5:]
cdate = cdate[5:] # assume short weekday, i.e. do not support obsolete RFC 1036 date format
try:
t = time.strptime(cdate, "%d-%b-%Y %H:%M:%S %Z")
t = time.strptime(cdate, "%d-%b-%Y %H:%M:%S %Z") # e.g. 18-Apr-2014 12:30:51 GMT
except ValueError:
t = time.strptime(cdate, "%d-%b-%y %H:%M:%S %Z")
try:
t = time.strptime(cdate, "%d-%b-%y %H:%M:%S %Z") # e.g. 18-Apr-14 12:30:51 GMT
except ValueError:
try:
t = time.strptime(cdate, "%d %b %Y %H:%M:%S %Z") # e.g. 18 Apr 2014 12:30:51 GMT
except ValueError:
raise Exception, 'ValueError: Date "{0}" does not match any of '.format(cdate) + \
'"%d-%b-%Y %H:%M:%S %Z", ' + \
'"%d-%b-%y %H:%M:%S %Z", ' + \
'"%d %b %Y %H:%M:%S %Z".'
#return int(time.mktime(t))
return calendar.timegm(t)