From 62257fb5a174570ee6c46c92cb8c132c00e9209e Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Jan 18 2016 10:25:08 +0000 Subject: Make sure we compare datetime to datetime Signed-off-by: Patrick Uiterwijk --- diff --git a/pagure/__init__.py b/pagure/__init__.py index ff5a00e..f2617a8 100644 --- a/pagure/__init__.py +++ b/pagure/__init__.py @@ -103,7 +103,11 @@ def admin_session_timedout(): timedout = False if not authenticated(): return True - if (datetime.datetime.utcnow() - flask.g.fas_user.login_time) > \ + login_time = flask.g.fas_user.login_time + # This is because flask_fas_openid will store this as a posix timestamp + if not isinstance(login_time, datetime.datetime): + login_time = datetime.datetime.utcfromtimestamp(login_time) + if (datetime.datetime.utcnow() - login_time) > \ APP.config.get('ADMIN_SESSION_LIFETIME', datetime.timedelta(minutes=15)): timedout = True