More logging

Author: Roland Hedberg

src/jwkest/jws.py

@@ -324,8 +324,11 @@ def headers(self, extra=None):
         return _header
 
     def _get_keys(self):
+        logger.debug("_get_keys(): self._dict.keys={}".format(
+            self._dict.keys()))
+
         if "jwk" in self:
-            return [self["jwk"]]
+            return self["jwk"]
         elif "jku" in self:
             keys = KEYS()
             keys.load_from_url(self["jku"])
@@ -371,7 +374,7 @@ def _pick_keys(self, keys, use="", alg=""):
             _kid = None
 
         logger.debug("Picking key based on alg={}, kid={} and use={}".format(
-            alg, use, _kid))
+            alg, _kid, use))
 
         pkey = []
         for _key in _keys:
@@ -528,15 +531,15 @@ def verify_compact(self, jws, keys=None, allow_none=False, sigalg=None):
         else:
             _keys = self._pick_keys(self._get_keys())
 
-        verifier = SIGNER_ALGS[_alg]
-
         if not _keys:
             if "kid" in self:
                 raise NoSuitableSigningKeys(
                     "No key with kid: %s" % (self["kid"]))
             else:
                 raise NoSuitableSigningKeys("No key for algorithm: %s" % _alg)
 
+        verifier = SIGNER_ALGS[_alg]
+
         for key in _keys:
             try:
                 res = verifier.verify(jwt.sign_input(), jwt.signature(),

tests/test_3_jws.py

@@ -468,9 +468,9 @@ def test_pick():
     keys = KEYS()
     keys.load_dict(JWK2)
     _jws = JWS("foobar", alg="RS256", kid="MnC_VZcATfM5pOYiJHMba9goEKY")
-    _keys = _jws._pick_keys(keys, "sig")
+    _keys = _jws._pick_keys(keys, use="sig")
     assert len(_keys) == 1
 
 
 if __name__ == "__main__":
-    test_pick()
+    test_signer_ps512()