Merge branch 'master' into huangzheng2016-master

# Conflicts:
#	gui/builtinPreferenceViews/pyfaEsiPreferences.py

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)))

service/market.py

@@ -313,6 +313,7 @@ class Market:
             "Tiamat"                      : self.les_grp,  # AT16 prize
             "Raiju"                       : self.les_grp,  # AT17 prize
             "Laelaps"                     : self.les_grp,  # AT17 prize
+            "Boobook"                     : self.les_grp,  # 19th EVE anniversary gift
         }
 
         self.ITEMS_FORCEGROUP_R = self.__makeRevDict(self.ITEMS_FORCEGROUP)

service/settings.py

@@ -375,7 +375,9 @@ class EsiSettings:
             "clientSecret": "",
             "timeout": 60,
             "server": "Tranquility",
-            "exportCharges": True}
+            "exportCharges": True,
+            "enforceJwtExpiration": True
+        }
 
         self.settings = SettingsProvider.getInstance().getSettings(
                 "pyfaServiceEsiSettings",