Change signature check to covpass

remove invalid samples
rename image files to fit schema

Author: chrloch

.github/workflows/dgc-testdata-verification.yml

@@ -43,20 +43,22 @@ jobs:
     - name: Validate DCC QA Pull Request
       if: ${{ github.event_name != 'workflow_dispatch' }}
       env:
-        DCC_KID_LIST: ${{ secrets.DCC_KID_LIST }}
-        DCC_CERT_LIST: ${{ secrets.DCC_CERT_LIST }}
+        #DCC_KID_LIST: ${{ secrets.DCC_KID_LIST }}
+        #DCC_CERT_LIST: ${{ secrets.DCC_CERT_LIST }}
         DCC_VALUESET_LIST_ALT: ${{ secrets.DCC_VALUESET_LIST_ALT }}
+        DSC_LIST: https://de.test.dscg.ubirch.com/trustList/DSC/
         # Not official reference, just used for quick check of pull requests
         DCC_VALUESET_LIST: https://distribution-cff4f7147260.dcc-rules.de/valuesets
         DCC_SCHEMA_BASE_URI: https://raw.githubusercontent.com/ehn-dcc-development/ehn-dcc-schema/release/
       run: |
-        pytest --tb=short --no-signature-check -rfEx --md-report --md-report-verbose=1 --md-report-zeros=number --html=dgc_testdata_report.html --self-contained-html --junit-xml=pytest.xml
+        pytest --tb=short -rfEx --md-report --md-report-verbose=1 --md-report-zeros=number --html=dgc_testdata_report.html --self-contained-html --junit-xml=pytest.xml
     - name: Validate DCC QA Workflow Dispatch
       if: ${{ github.event_name == 'workflow_dispatch' }}
       env:
-        DCC_KID_LIST: ${{ secrets.DCC_KID_LIST }}
-        DCC_CERT_LIST: ${{ secrets.DCC_CERT_LIST }}
+        #DCC_KID_LIST: ${{ secrets.DCC_KID_LIST }}
+        #DCC_CERT_LIST: ${{ secrets.DCC_CERT_LIST }}
         DCC_VALUESET_LIST: ${{ secrets.DCC_VALUESET_LIST }}
+        DSC_LIST: https://de.test.dscg.ubirch.com/trustList/DSC/
         DCC_VALUESET_LIST_ALT: ${{ secrets.DCC_VALUESET_LIST_ALT }}
         DCC_SCHEMA_BASE_URI: ${{ secrets.DCC_SCHEMA_BASE_URI }}
       run: |

FR/1.3.0/BL_UE_DCC1 revoked.PNG FR/1.3.0/VAC_BL_UE_DCC1 revoked.PNGFR/1.3.0/BL_UE_DCC1 revoked.PNG renamed to FR/1.3.0/VAC_BL_UE_DCC1 revoked.PNG

@@ -1,13 +1,13 @@
 # KR: Republic of Korea(South Korea)
 
+Signer key has been removed from testing environment.
+QR codes have become invalid.
+
 ## Vaccination
 
-![VAC_KR.png](VAC_KR.png)
 
 ## Test
 
-![TEST_KR.png](TEST_KR.png)
 
 ## Recovery
 
-![REC_KR.png](REC_KR.png)

FR/1.3.0/BL_UE_DCC2 revoked.PNG FR/1.3.0/VAC_BL_UE_DCC2 revoked.PNGFR/1.3.0/BL_UE_DCC2 revoked.PNG renamed to FR/1.3.0/VAC_BL_UE_DCC2 revoked.PNG

@@ -11,8 +11,9 @@
 # URLs
 
 # Former hard coded URLs are now deprecated and may be taken out of order in the future
-ACC_KID_LIST = os.environ['DCC_KID_LIST']
-ACC_CERT_LIST = os.environ['DCC_CERT_LIST']
+#ACC_KID_LIST = os.environ['DCC_KID_LIST']
+#ACC_CERT_LIST = os.environ['DCC_CERT_LIST']
+DSC_LIST = os.environ['DSC_LIST']
 VALUESET_LIST = os.environ['DCC_VALUESET_LIST']
 VALUESET_LIST_ALTERNATIVE = os.environ['DCC_VALUESET_LIST_ALT']
 SCHEMA_BASE_URI = os.environ['DCC_SCHEMA_BASE_URI']

FR/1.3.0/BL_UE_DCC3 revoked.PNG FR/1.3.0/VAC_BL_UE_DCC3 revoked.PNGFR/1.3.0/BL_UE_DCC3 revoked.PNG renamed to FR/1.3.0/VAC_BL_UE_DCC3 revoked.PNG

@@ -67,8 +67,22 @@ def valuesets_from_environment():
     return valuesets
 
 @filecache(HOUR)
-def certificates_from_environment():
-    "Downloads and caches the certificates from the acceptance environment"
+def certificates_from_environment(): 
+    """Downloads and caches the certificates from the acceptance environment
+        using  API for CovPass Check app"""
+    response = requests.get(constants.DSC_LIST)
+    if not response.ok:
+        pytest.fail("DSC list not reachable")
+    
+    dsc_list = json.loads(response.text[response.text.find('\n'):])
+    kid_dict = { dsc['kid'] : dsc['rawData'] for dsc in dsc_list['certificates'] }
+    return kid_dict
+
+
+@filecache(HOUR)
+def _certificates_from_environment(): # Uses API of demo implementation for verifier app
+    """Downloads and caches the certificates from the acceptance environment
+        using  API for template verifier app"""
     def get_key_id_dict():
         response = requests.get(constants.ACC_KID_LIST)
         if not response.ok: