Allow additional properties for extra EU countries in validation script

Author: mkubicek-dtc

tests/constants.py

@@ -3,6 +3,7 @@
 DCC_TYPES = {'v': "VAC", 't': "TEST", 'r': "REC"}
 EXTENDED_KEY_USAGE_OIDs = {'t':'1.3.6.1.4.1.0.1847.2021.1.1','v':'1.3.6.1.4.1.0.1847.2021.1.2','r':'1.3.6.1.4.1.0.1847.2021.1.3',
                            'T':'1.3.6.1.4.1.1847.2021.1.1',  'V':'1.3.6.1.4.1.1847.2021.1.2',  'R':'1.3.6.1.4.1.1847.2021.1.3'}
+EU_COUNTRIES = ['BE', 'EL', 'GR', 'LT', 'PT', 'BG', 'ES', 'LU', 'RO', 'CZ', 'FR', 'HU', 'SI', 'DK', 'HR', 'MT', 'SK', 'DE', 'IT', 'NL', 'FI', 'EE', 'CY', 'AT', 'SE', 'IE', 'LV', 'PL'] # Greece included as EL and GR
 
 # URLs
 ACC_KID_LIST = 'https://dgca-verifier-service-eu-acc.cfapps.eu10.hana.ondemand.com/signercertificateStatus'

tests/test_qrqualitycheck.py

@@ -144,7 +144,7 @@ def test_payload_version_matches_path_version( dccQrCode ):
 
 
 @filecache(DAY)
-def get_json_schema(version):
+def get_json_schema(version, extra_eu):
     ''' Get the json schema depending on the version of the DCC data. 
         Schema code is obtained from https://raw.githubusercontent.com/ehn-dcc-development/ehn-dcc-schema/
     '''
@@ -174,17 +174,26 @@ def __call__(self, uri, **kwargs):
     rewritingLoader = RewritingLoader({'https://id.uvci.eu/' : versioned_path,
                                        "\"properties\"":  "\"additionalProperties\": false, \"properties\""} )
 
+    rewritingLoaderExtraEU = RewritingLoader({'https://id.uvci.eu/' : versioned_path,
+                                       "\"properties\"":  "\"additionalProperties\": true, \"properties\""} )
+    
     print(f'Loading HCERT schema {version} ...')
     try: 
         schema = jsonref.load_uri(f'{versioned_path}{main_file}', loader=rewritingLoader )
+        schemaExtraEU = jsonref.load_uri(f'{versioned_path}{main_file}', loader=rewritingLoaderExtraEU )
     except: 
         raise LookupError(f'Could not load schema definition for {version}')
+    
+    if extra_eu:
+        return schemaExtraEU
     return schema
 
 @pytest.mark.filterwarnings("ignore::DeprecationWarning")
 def test_json_schema( dccQrCode ):
     "Performs a schema validation against the ehn-dcc-development/ehn-dcc-schema definition"
-    schema = get_json_schema( dccQrCode.payload[constants.PAYLOAD_HCERT][1]['ver'] )
+    extra_eu = dccQrCode.get_path_country() not in constants.EU_COUNTRIES
+    schema = get_json_schema( dccQrCode.payload[constants.PAYLOAD_HCERT][1]['ver'], extra_eu)
+
     jsonschema.validate( dccQrCode.payload[constants.PAYLOAD_HCERT][1], schema )