add authorization for extended attribute

Author: Akol125

lambdas/filenameprocessor/src/constants.py

@@ -23,7 +23,7 @@
 ODS_CODE_TO_SUPPLIER_SYSTEM_HASH_KEY = "ods_code_to_supplier"
 EXTENDED_ATTRIBUTES_FILE_PREFIX = "Vaccination_Extended_Attributes"
 DPS_DESTINATION_PREFIX = "dps_destination/"
-
+VALID_EA_VERSIONS = "v1_5"
 ERROR_TYPE_TO_STATUS_CODE_MAP = {
     VaccineTypePermissionsError: 403,
     InvalidFileKeyError: 400,  # Includes invalid ODS code, therefore unable to identify supplier

lambdas/filenameprocessor/src/file_validation.py

@@ -3,7 +3,7 @@
 from datetime import datetime
 from re import match
 
-from constants import VALID_VERSIONS
+from constants import EXTENDED_ATTRIBUTES_FILE_PREFIX, VALID_EA_VERSIONS, VALID_VERSIONS
 from elasticache import (
     get_supplier_system_from_cache,
     get_valid_vaccine_types_from_cache,
@@ -45,8 +45,22 @@ def validate_extended_attributes_file_key(file_key: str) -> str:
     if not match(r"^[^_.]*_[^_.]*_[^_.]*_[^_.]*_[^_.]*_[^_.]*_[^_.]*", file_key):
         raise InvalidFileKeyError("Initial file validation failed: invalid extended attributes file key format")
 
-    file_key_parts_without_extension, _ = split_file_key(file_key)
+    file_key_parts_without_extension, extension = split_file_key(file_key)
+    file_type = "_".join(file_key_parts_without_extension[:3])
+    version = "_".join(file_key_parts_without_extension[3:5])
     organization_code = file_key_parts_without_extension[5]
+    timestamp = file_key_parts_without_extension[6]
+    supplier = get_supplier_system_from_cache(organization_code)
+
+    if not (
+        file_type == EXTENDED_ATTRIBUTES_FILE_PREFIX
+        and version == VALID_EA_VERSIONS
+        and supplier  # Note that if supplier could be identified, this also implies that ODS code is valid
+        and is_valid_datetime(timestamp)
+        and ((extension == "CSV") or (extension == "DAT"))  # The DAT extension has been added for MESH file processing
+    ):
+        raise InvalidFileKeyError("Initial file validation failed: invalid file key")
+
     return f"{organization_code}_COVID"
 
 

lambdas/filenameprocessor/tests/test_file_key_validation.py

@@ -113,6 +113,8 @@ def test_split_file_key(self, _):
             with self.subTest(f"SubTest for file key: {file_key}"):
                 self.assertEqual(split_file_key(file_key), expected)
 
+    @patch("file_name_processor.get_supplier_system_from_cache", return_value="RAVS")  # supplier now VALID
+    @patch("file_validation.get")
     def test_validate_extended_attributes_file_key(self, _):
         """Tests that validate_extended_attributes_file_key returns organization code and COVID vaccine type if all
         elements pass validation, and raises an exception otherwise"""