review updates

Author: janste63

src/cryptojwt/__init__.py

@@ -21,7 +21,7 @@
 except ImportError:
     pass
 
-__version__ = "1.2.0"
+__version__ = "1.2.1a0"
 
 logger = logging.getLogger(__name__)
 

src/cryptojwt/key_bundle.py

@@ -318,16 +318,21 @@ def do_local_jwk(self, filename):
         Load a JWKS from a local file
 
         :param filename: Name of the file from which the JWKS should be loaded
+        :return: True if load was successful or False if file hasn't been modified
         """
-        LOGGER.info("Reading local JWKS from %s", filename)
-        with open(filename) as input_file:
-            _info = json.load(input_file)
-        if "keys" in _info:
-            self.do_keys(_info["keys"])
+        if self._local_update_required():
+            LOGGER.info("Reading local JWKS from %s", filename)
+            with open(filename) as input_file:
+                _info = json.load(input_file)
+            if "keys" in _info:
+                self.do_keys(_info["keys"])
+            else:
+                self.do_keys([_info])
+            self.last_local = time.time()
+            self.time_out = self.last_local + self.cache_time
+            return True
         else:
-            self.do_keys([_info])
-        self.last_local = time.time()
-        self.time_out = self.last_local + self.cache_time
+            return False
 
     def do_local_der(self, filename, keytype, keyusage=None, kid=""):
         """
@@ -336,29 +341,34 @@ def do_local_der(self, filename, keytype, keyusage=None, kid=""):
         :param filename: Name of the file
         :param keytype: Presently 'rsa' and 'ec' supported
         :param keyusage: encryption ('enc') or signing ('sig') or both
+        :return: True if load was successful or False if file hasn't been modified
         """
-        LOGGER.info("Reading local DER from %s", filename)
-        key_args = {}
-        _kty = keytype.lower()
-        if _kty in ["rsa", "ec"]:
-            key_args["kty"] = _kty
-            _key = import_private_key_from_pem_file(filename)
-            key_args["priv_key"] = _key
-            key_args["pub_key"] = _key.public_key()
-        else:
-            raise NotImplementedError("No support for DER decoding of key type {}".format(_kty))
+        if self._local_update_required():
+            LOGGER.info("Reading local DER from %s", filename)
+            key_args = {}
+            _kty = keytype.lower()
+            if _kty in ["rsa", "ec"]:
+                key_args["kty"] = _kty
+                _key = import_private_key_from_pem_file(filename)
+                key_args["priv_key"] = _key
+                key_args["pub_key"] = _key.public_key()
+            else:
+                raise NotImplementedError("No support for DER decoding of key type {}".format(_kty))
 
-        if not keyusage:
-            key_args["use"] = ["enc", "sig"]
-        else:
-            key_args["use"] = harmonize_usage(keyusage)
+            if not keyusage:
+                key_args["use"] = ["enc", "sig"]
+            else:
+                key_args["use"] = harmonize_usage(keyusage)
 
-        if kid:
-            key_args["kid"] = kid
+            if kid:
+                key_args["kid"] = kid
 
-        self.do_keys([key_args])
-        self.last_local = time.time()
-        self.time_out = self.last_local + self.cache_time
+            self.do_keys([key_args])
+            self.last_local = time.time()
+            self.time_out = self.last_local + self.cache_time
+            return True
+        else:
+            return False
 
     def do_remote(self):
         """
@@ -390,7 +400,10 @@ def do_remote(self):
             LOGGER.error(err)
             raise UpdateFailed(REMOTE_FAILED.format(self.source, str(err)))
 
-        if _http_resp.status_code == 200:  # New content
+        load_successful = _http_resp.status_code == 200
+        not_modified = _http_resp.status_code == 304
+
+        if load_successful:
             self.time_out = time.time() + self.cache_time
 
             self.imp_jwks = self._parse_remote_response(_http_resp)
@@ -408,9 +421,8 @@ def do_remote(self):
             if hasattr(_http_resp, "headers"):
                 headers = getattr(_http_resp, "headers")
                 self.last_remote = headers.get("last-modified") or headers.get("date")
-            res = True
 
-        elif _http_resp.status_code == 304:  # Not modified
+        elif not_modified:
             LOGGER.debug("%s not modified since %s", self.source, self.last_remote)
             self.time_out = time.time() + self.cache_time
             res = False
@@ -426,7 +438,7 @@ def do_remote(self):
 
         self.last_updated = time.time()
         self.ignore_errors_until = None
-        return res
+        return load_successful
 
     def _parse_remote_response(self, response):
         """
@@ -451,21 +463,19 @@ def _parse_remote_response(self, response):
             return None
 
     def _uptodate(self):
-        res = False
         if self.remote or self.local:
             if time.time() > self.time_out:
-                if self.local and not self._local_update_required():
-                    res = True
-                elif self.update():
-                    res = True
-        return res
+                return self.update()
+        return False
 
     def update(self):
         """
         Reload the keys if necessary.
 
         This is a forced update, will happen even if cache time has not elapsed.
         Replaced keys will be marked as inactive and not removed.
+
+        :return: True if update was ok or False if we encountered an error during update.
         """
         if self.source:
             _old_keys = self._keys  # just in case
@@ -476,10 +486,9 @@ def update(self):
             try:
                 if self.local:
                     if self.fileformat in ["jwks", "jwk"]:
-                        self.do_local_jwk(self.source)
+                        updated = self.do_local_jwk(self.source)
                     elif self.fileformat == "der":
-                        self.do_local_der(self.source, self.keytype, self.keyusage)
-                    updated = True
+                        updated = self.do_local_der(self.source, self.keytype, self.keyusage)
                 elif self.remote:
                     updated = self.do_remote()
             except Exception as err: