From dee81534cb2743262e2287da35e9b5970bd9cc12 Mon Sep 17 00:00:00 2001
From: Joe Heck <heckj@mac.com>
Date: Tue, 13 Mar 2012 13:53:40 -0700
Subject: making all use of time follow datetime.utcnow() fixes bug 954057

Change-Id: I14fa475dc03410b8843ab028d30fbc8802c4be30
---
 keystone/token/backends/kvs.py | 2 +-
 keystone/token/backends/sql.py | 2 +-
 keystone/token/core.py         | 4 ++--
 tests/test_backend_memcache.py | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/keystone/token/backends/kvs.py b/keystone/token/backends/kvs.py
index f3eb18a0..71b86f8e 100644
--- a/keystone/token/backends/kvs.py
+++ b/keystone/token/backends/kvs.py
@@ -27,7 +27,7 @@ class Token(kvs.Base, token.Driver):
     def get_token(self, token_id):
         token = self.db.get('token-%s' % token_id)
         if (token and (token['expires'] is None
-                       or token['expires'] > datetime.datetime.now())):
+                       or token['expires'] > datetime.datetime.utcnow())):
             return token
         else:
             raise exception.TokenNotFound(token_id=token_id)
diff --git a/keystone/token/backends/sql.py b/keystone/token/backends/sql.py
index 3be3cd6e..7a9a5515 100644
--- a/keystone/token/backends/sql.py
+++ b/keystone/token/backends/sql.py
@@ -50,7 +50,7 @@ class Token(sql.Base, token.Driver):
     def get_token(self, token_id):
         session = self.get_session()
         token_ref = session.query(TokenModel).filter_by(id=token_id).first()
-        now = datetime.datetime.now()
+        now = datetime.datetime.utcnow()
         if token_ref and (not token_ref.expires or now < token_ref.expires):
             return token_ref.to_dict()
         else:
diff --git a/keystone/token/core.py b/keystone/token/core.py
index d3145885..102d1875 100644
--- a/keystone/token/core.py
+++ b/keystone/token/core.py
@@ -89,8 +89,8 @@ class Driver(object):
     def _get_default_expire_time(self):
         """Determine when a token should expire based on the config.
 
-        :returns: datetime.datetime object
+        :returns: a naive utc datetime.datetime object
 
         """
         expire_delta = datetime.timedelta(seconds=CONF.token.expiration)
-        return datetime.datetime.now() + expire_delta
+        return datetime.datetime.utcnow() + expire_delta
diff --git a/tests/test_backend_memcache.py b/tests/test_backend_memcache.py
index f1281b1d..60112a6f 100644
--- a/tests/test_backend_memcache.py
+++ b/tests/test_backend_memcache.py
@@ -42,7 +42,7 @@ class MemcacheClient(object):
         """Retrieves the value for a key or None."""
         self.check_key(key)
         obj = self.cache.get(key)
-        now = time.mktime(datetime.datetime.now().timetuple())
+        now = time.mktime(datetime.datetime.utcnow().timetuple())
         if obj and (obj[1] == 0 or obj[1] > now):
             return obj[0]
         else:
-- 
cgit