Merge pull request #23 from kipparker/master

Fixes Windows specific Unix date formatting bug

Author: pitbulk

src/onelogin/saml2/metadata.py

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

src/onelogin/saml2/settings.py

@@ -8,7 +8,7 @@
 Setting class of OneLogin's Python Toolkit.
 
 """
-from datetime import datetime
+from time import time
 import re
 from os.path import dirname, exists, join, sep
 
@@ -720,7 +720,7 @@ def validate_metadata(self, xml):
                     if valid_until:
                         valid_until = OneLogin_Saml2_Utils.parse_SAML_to_time(valid_until)
                     expire_time = OneLogin_Saml2_Utils.get_expire_time(cache_duration, valid_until)
-                    if expire_time is not None and int(datetime.now().strftime('%s')) > int(expire_time):
+                    if expire_time is not None and int(time()) > int(expire_time):
                         errors.append('expired_xml')
 
         # TODO: Validate Sign