Merge branch 'master' into huangzheng2016-master

# Conflicts: # gui/builtinPreferenceViews/pyfaEsiPreferences.py
2022-05-08 12:35:46 -04:00
parent 3c6eb6d054 cceaed8d61
commit 5a6fe373f1
109 changed files with 25968 additions and 6499 deletions
--- a/service/esiAccess.py
+++ b/service/esiAccess.py
@@ -248,7 +248,7 @@ class EsiAccess:
                algorithms=jwk_set["alg"],
                issuer=[self.server_base.sso, "https://%s" % self.server_base.sso],
                # ignore "aud" claim: https://tweetfleet.slack.com/archives/C30KX8UUX/p1648495011905969
-                options={"verify_aud": False}
+                options={"verify_aud": False, "verify_exp": self.settings.get("enforceJwtExpiration")}
            )
        except ExpiredSignatureError as e:
            raise GenericSsoError("The JWT token has expired: {}".format(str(e)))