Merge pull request #224 from blockchain-certificates/fix/context-check

fix(Context): limit valid context addresses according to cert-schema preloading

cert_issuer/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1'
+__version__ = '3.0.2'

cert_issuer/models.py

@@ -35,10 +35,6 @@ def validate_context (context, type):
     vc_context_url = 'https://www.w3.org/2018/credentials/v1'
     blockcerts_valid_context_url = [
         'https://www.blockcerts.org/schema/3.0/context.json',
-        'https://blockcerts.org/schema/3.0/context.json',
-        'https://www.w3id.org/blockcerts/schema/3.0/context.json',
-        'https://w3id.org/blockcerts/schema/3.0/context.json',
-        'https://www.w3id.org/blockcerts/v3',
         'https://w3id.org/blockcerts/v3'
     ]
 

tests/v3_certificate_validation/test_unit_context.py

@@ -37,7 +37,7 @@ def test_validate_context_invalid_missing_context (self):
         assert False
 
     def test_validate_context_invalid_last_context (self):
-        candidate_context_url = ['https://www.w3.org/2018/credentials/v1', 'https://www.w3id.org/blockcerts/v3', 'link.to.another.context']
+        candidate_context_url = ['https://www.w3.org/2018/credentials/v1', 'https://w3id.org/blockcerts/v3', 'link.to.another.context']
         candidate_type = ['VerifiableCredential', 'BlockcertsCredential']
         try:
             validate_context(candidate_context_url, candidate_type)
@@ -47,17 +47,6 @@ def test_validate_context_invalid_last_context (self):
 
         assert False
 
-    def test_validate_context_valid_wwww3idcanon (self):
-        candidate_context_url = ['https://www.w3.org/2018/credentials/v1', 'https://www.w3id.org/blockcerts/v3']
-        candidate_type = ['VerifiableCredential', 'BlockcertsCredential']
-        try:
-            validate_context(candidate_context_url, candidate_type)
-        except:
-            assert False
-            return
-
-        assert True
-
     def test_validate_context_valid_w3idcanon (self):
         candidate_context_url = ['https://www.w3.org/2018/credentials/v1', 'https://w3id.org/blockcerts/v3']
         candidate_type = ['VerifiableCredential', 'BlockcertsCredential']
@@ -69,41 +58,8 @@ def test_validate_context_valid_w3idcanon (self):
 
         assert True
 
-    def test_validate_context_valid_wwwblockcerts (self):
-        candidate_context_url = ['https://www.w3.org/2018/credentials/v1', 'https://www.blockcerts.org/schema/3.0/context.json']
-        candidate_type = ['VerifiableCredential', 'BlockcertsCredential']
-        try:
-            validate_context(candidate_context_url, candidate_type)
-        except:
-            assert False
-            return
-
-        assert True
-
     def test_validate_context_valid_blockcerts (self):
-        candidate_context_url = ['https://www.w3.org/2018/credentials/v1', 'https://blockcerts.org/schema/3.0/context.json']
-        candidate_type = ['VerifiableCredential', 'BlockcertsCredential']
-        try:
-            validate_context(candidate_context_url, candidate_type)
-        except:
-            assert False
-            return
-
-        assert True
-
-    def test_validate_context_valid_wwww3id (self):
-        candidate_context_url = ['https://www.w3.org/2018/credentials/v1', 'https://www.w3id.org/blockcerts/schema/3.0/context.json']
-        candidate_type = ['VerifiableCredential', 'BlockcertsCredential']
-        try:
-            validate_context(candidate_context_url, candidate_type)
-        except:
-            assert False
-            return
-
-        assert True
-
-    def test_validate_context_valid_w3id (self):
-        candidate_context_url = ['https://www.w3.org/2018/credentials/v1', 'https://w3id.org/blockcerts/schema/3.0/context.json']
+        candidate_context_url = ['https://www.w3.org/2018/credentials/v1', 'https://www.blockcerts.org/schema/3.0/context.json']
         candidate_type = ['VerifiableCredential', 'BlockcertsCredential']
         try:
             validate_context(candidate_context_url, candidate_type)