Merge branch 'master' into dependabot/pip/bleach-3.1.2

2020-03-27 10:44:54 -07:00 · 2020-03-27 10:44:54 -07:00 · 88b14d6ad6
commit 88b14d6ad6
parent 8ba9ae1148 0c02ddec3c
1 changed files with 2 additions and 1 deletions
--- a/lemur/certificates/models.py
+++ b/lemur/certificates/models.py
@ -321,7 +321,8 @@ class Certificate(db.Model):

    @hybrid_property
    def expired(self):
-        if self.not_after <= arrow.utcnow():
+        # can't compare offset-naive and offset-aware datetimes
+        if arrow.Arrow.fromdatetime(self.not_after) <= arrow.utcnow():
            return True

    @expired.expression