Merge branch 'master' into powerdnsplugin_02

2020-03-27 10:45:15 -07:00 · 2020-03-27 10:45:15 -07:00 · 66183e6bdd
parent 2b7e60399c 0c02ddec3c
commit 66183e6bdd
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