Skip to content

Commit ed0463e

Browse files
committed
Fixes Windows specific Unix date formatting bug. Use time() instead of datetime.now().strftime('%s')
1 parent 1801488 commit ed0463e

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/onelogin/saml2/metadata.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
1010
"""
1111

12-
from time import gmtime, strftime
12+
from time import gmtime, strftime, time
1313
from datetime import datetime
1414
from defusedxml.minidom import parseString
1515

@@ -54,7 +54,7 @@ def builder(sp, authnsign=False, wsign=False, valid_until=None, cache_duration=N
5454
:type organization: dict
5555
"""
5656
if valid_until is None:
57-
valid_until = int(datetime.now().strftime("%s")) + OneLogin_Saml2_Metadata.TIME_VALID
57+
valid_until = int(time()) + OneLogin_Saml2_Metadata.TIME_VALID
5858
if not isinstance(valid_until, basestring):
5959
if isinstance(valid_until, datetime):
6060
valid_until_time = valid_until.timetuple()

src/onelogin/saml2/settings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
1010
"""
1111

12-
from datetime import datetime
1312
import json
1413
import re
14+
from time import time
1515
from os.path import dirname, exists, join, sep, abspath
1616
from xml.dom.minidom import Document
1717

@@ -735,7 +735,7 @@ def validate_metadata(self, xml):
735735
cache_duration = element.getAttribute('cacheDuration')
736736

737737
expire_time = OneLogin_Saml2_Utils.get_expire_time(cache_duration, valid_until)
738-
if expire_time is not None and int(datetime.now().strftime('%s')) > int(expire_time):
738+
if expire_time is not None and int(time()) > int(expire_time):
739739
errors.append('expired_xml')
740740

741741
# TODO: Validate Sign

0 commit comments

Comments
 (0)