More functionality

Author: Roland Hedberg

script/jwkutil.py

@@ -94,6 +94,7 @@ def decrypt(msg, keys):
     parser.add_argument('-i', dest="kid", help="key id")
     parser.add_argument('-l', dest="log", help="logfile name")
     parser.add_argument('-t', dest="msgtype", help="JWT message type")
+    parser.add_argument('-u', dest="jwks_url", help="JSON Web Keys URL")
     parser.add_argument("message", nargs="?", help="The message")
 
     args = parser.parse_args()
@@ -118,6 +119,11 @@ def decrypt(msg, keys):
         _k.load_jwks(open(args.jwks).read())
         keys.extend(_k._keys)
 
+    if args.jwks_url:
+        _k = KEYS()
+        _k.load_from_url(args.jwks_url, False)
+        keys.extend(_k._keys)
+
     if not keys:
         exit(-1)
 

script/peek.py

@@ -5,7 +5,7 @@
 
 __author__ = 'roland'
 
-jwt = open(sys.argv[1]).read()
+jwt = sys.argv[1]
 
 _jw = jwe.factory(jwt)
 if _jw: