Skip to content

Commit 80dc132

Browse files
committed
Fixes Windows specific Unix date formatting bug
1 parent b04444a commit 80dc132

2 files changed

Lines changed: 4 additions & 3 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

1515
from onelogin.saml2 import compat
@@ -61,7 +61,7 @@ def builder(sp, authnsign=False, wsign=False, valid_until=None, cache_duration=N
6161
:type organization: dict
6262
"""
6363
if valid_until is None:
64-
valid_until = int(datetime.now().strftime("%s")) + OneLogin_Saml2_Metadata.TIME_VALID
64+
valid_until = int(time()) + OneLogin_Saml2_Metadata.TIME_VALID
6565
if not isinstance(valid_until, basestring):
6666
if isinstance(valid_until, datetime):
6767
valid_until_time = valid_until.timetuple()

src/onelogin/saml2/settings.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
1010
"""
1111
from datetime import datetime
12+
from time import time
1213
import re
1314
from os.path import dirname, exists, join, sep
1415

@@ -720,7 +721,7 @@ def validate_metadata(self, xml):
720721
if valid_until:
721722
valid_until = OneLogin_Saml2_Utils.parse_SAML_to_time(valid_until)
722723
expire_time = OneLogin_Saml2_Utils.get_expire_time(cache_duration, valid_until)
723-
if expire_time is not None and int(datetime.now().strftime('%s')) > int(expire_time):
724+
if expire_time is not None and int(time()) > int(expire_time):
724725
errors.append('expired_xml')
725726

726727
# TODO: Validate Sign

0 commit comments

Comments
 (0)