Removed DIDs and updated to new signing scheme (#1)

Author: jdkizer9

.gitignore

@@ -143,4 +143,5 @@ cython_debug/
 save/
 myenv/
 sample_vcs/
-did.json
+jwks_private.json
+jwks.json

README.md

@@ -17,31 +17,31 @@ Before you can run scripts, you must first activate your virtual environment. Yo
 source myenv/bin/activate
 ```
 
-## Generate a DID
-To generate a random DID, use the following command:
+## Generate a JWK Set
+To generate a random JWK Set, use the following command:
 
 ```
-python generate_random_did.py did.json
+python generate_random_jwks.py jwks.json jwks_private.json
 ```
 
-This script will generate the necessary JWK formatted keys and create a new DID based on them, saving them `did.json`.
+This script will generate the necessary JWK formatted keys, saving the public keyset in `jwks.json` and the private keyset in `jwks_private.json`.
 
 ## Generate a VC
 To generate a sample VC, use the following command:
 
 ```
-python encode_resource.py did.json ./fixtures/vc-c19-pcr-jwt-payload.json sample_vcs/sample.fhir-backed-vc
+python encode_resource.py jwks_private.json https://commonhealth.org fixtures/vc-c19-pcr-jwt-payload.json sample_vcs/lab_result.smart-health-card
 ```
 
-This script uses the DID config defined in `did.json`, generates a new VC based on `./fixtures/vc-c19-pcr-jwt-payload.json`, and saves that in `sample_vcs/sample.fhir-backed-vc`.
+This script uses the private JWK set defined in `jwks_private.json`, generates a new VC based on `./fixtures/vc-c19-pcr-jwt-payload.json`, and saves that in `sample_vcs/lab_result.smart-health-card`.
 
 ## Verify a VC
 To verifiy a VC, use the following command:
 
 ```
-python decode_resource.py sample_vcs/sample.fhir-backed-vc
+python decode_resource.py sample_vcs/covid19.smart-health-card  
 ```
 
-This script loads the VC from `sample_vcs/sample.fhir-backed-vc`, and verifies it based on the DID encoded in the JWS header.
+This script loads the VC from `sample_vcs/covid19.smart-health-card`, and verifies it based on the issuer and kid information encoded in the JWS.
 
 

decode_inline.py

@@ -1,46 +1,10 @@
-from did.did_service import DIDService
-from did.did import DIDPublicKeyDocument
-from jwcrypto import jwk, jws
-from jwcrypto.common import json_encode
 import json
 import argparse
 import base64
-
-did_service = DIDService()
-
-def get_did_from_header(jws_raw):
-    ##instantiate a JWS object
-    jwstoken = jws.JWS()
-
-    ##import the data into the JWS object
-    jwstoken.deserialize(jws_raw)
-
-    ##based on the JWS header, resolve the public signing key to be used for verification
-    kid = jwstoken.jose_header.get('kid')
-    split = kid.split("#")
-    did = split[0]
-    return did
-
-def decode_vc(jws_raw):
-    ##instantiate a JWS object
-    jwstoken = jws.JWS()
-
-    ##import the data into the JWS object
-    jwstoken.deserialize(jws_raw)
-
-    ##based on the JWS header, resolve the public signing key to be used for verification
-    kid = jwstoken.jose_header.get('kid')
-    key = did_service.resolve_key(kid)
-    
-    ##load the JWK into a useable key
-    verifier_key = jwk.JWK.from_json(json.dumps(key))
-
-    ##verify the payload
-    jwstoken.verify(verifier_key)
-    return jwstoken
+import utils
 
 def main():
-    parser = argparse.ArgumentParser(description='Decodes a vc using the supplied DID config')
+    parser = argparse.ArgumentParser(description='Decodes a vc')
     parser.add_argument('input', help='Input resource')
     args = parser.parse_args()
 
@@ -51,12 +15,7 @@ def main():
         print("Base 64 decoding failed, assuming input is JWS")
         jws_raw = args.input
 
-    # print(jws_raw)
-    decoded_vc = decode_vc(jws_raw)
-    payload_dict = json.loads(decoded_vc.payload)
-
-    ##check that iss matches did in header
-    assert payload_dict['iss'] == get_did_from_header(jws_raw)
+    payload_dict = utils.decode_vc(jws_raw)
 
     print(json.dumps(payload_dict, indent=4))
 

decode_resource.py

@@ -1,55 +1,15 @@
-from did.did_service import DIDService
-from did.did import DIDPublicKeyDocument
-from jwcrypto import jwk, jws
-from jwcrypto.common import json_encode
 import json
 import argparse
-
-did_service = DIDService()
-
-def get_did_from_header(jws_raw):
-    ##instantiate a JWS object
-    jwstoken = jws.JWS()
-
-    ##import the data into the JWS object
-    jwstoken.deserialize(jws_raw)
-
-    ##based on the JWS header, resolve the public signing key to be used for verification
-    kid = jwstoken.jose_header.get('kid')
-    split = kid.split("#")
-    did = split[0]
-    return did
-
-def decode_vc(jws_raw):
-    ##instantiate a JWS object
-    jwstoken = jws.JWS()
-
-    ##import the data into the JWS object
-    jwstoken.deserialize(jws_raw)
-
-    ##based on the JWS header, resolve the public signing key to be used for verification
-    kid = jwstoken.jose_header.get('kid')
-    key = did_service.resolve_key(kid)
-    
-    ##load the JWK into a useable key
-    verifier_key = jwk.JWK.from_json(json.dumps(key))
-
-    ##verify the payload
-    jwstoken.verify(verifier_key)
-    return jwstoken
+import utils
 
 def main():
-    parser = argparse.ArgumentParser(description='Decodes a vc using the supplied DID config')
+    parser = argparse.ArgumentParser(description='Decodes a vc')
     parser.add_argument('input_file', help='Input file')
 
     args = parser.parse_args()
     with open(args.input_file, 'r') as input_file:
         fhir_backed_vc = json.load(input_file).get('verifiableCredential')[0]
-        decoded_vc = decode_vc(fhir_backed_vc)
-        payload_dict = json.loads(decoded_vc.payload)
-
-        ##check that iss matches did in header
-        assert payload_dict['iss'] == get_did_from_header(fhir_backed_vc)
+        payload_dict = utils.decode_vc(fhir_backed_vc)
 
     print(json.dumps(payload_dict, indent=4))
 

decode_resource_local.py

@@ -0,0 +1,18 @@
+import json
+import argparse
+import utils
+
+def main():
+    parser = argparse.ArgumentParser(description='Decodes a vc')
+    parser.add_argument('input_file', help='Input file')
+    parser.add_argument('jwks_file', help='JWKS file')
+
+    args = parser.parse_args()
+    with open(args.input_file, 'r') as input_file:
+        fhir_backed_vc = json.load(input_file).get('verifiableCredential')[0]
+        payload_dict = utils.decode_vc_from_local_issuer(fhir_backed_vc, args.jwks_file)
+
+    print(json.dumps(payload_dict, indent=4))
+
+if __name__ == "__main__":
+    main()