Fallback to empty list when block type is not present on cache.json

mozilla · Nov 13, 2024 · 9710511 · 9710511
1 parent 94d9124
commit 9710511
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/olympia/blocklist/mlbf.py b/src/olympia/blocklist/mlbf.py
@@ -114,15 +114,15 @@ def __init__(self, storage: SafeStorage):
 
     @cached_property
     def blocked_items(self) -> List[str]:
-        return self._data.get(self.data_type_key(MLBFDataType.BLOCKED))
+        return self._data.get(self.data_type_key(MLBFDataType.BLOCKED), [])
 
     @cached_property
     def soft_blocked_items(self) -> List[str]:
-        return self._data.get(self.data_type_key(MLBFDataType.SOFT_BLOCKED))
+        return self._data.get(self.data_type_key(MLBFDataType.SOFT_BLOCKED), [])
 
     @cached_property
     def not_blocked_items(self) -> List[str]:
-        return self._data.get(self.data_type_key(MLBFDataType.NOT_BLOCKED))
+        return self._data.get(self.data_type_key(MLBFDataType.NOT_BLOCKED), [])
 
 
 class MLBFDataBaseLoader(BaseMLBFLoader):

diff --git a/src/olympia/blocklist/tests/test_mlbf.py b/src/olympia/blocklist/tests/test_mlbf.py
@@ -133,6 +133,16 @@ def test_loads_data_from_file(self):
         loader = MLBFStorageLoader(self.storage)
         assert loader._raw == self._data
 
+    def test_fallback_to_empty_list_for_missing_key(self):
+        for key in self._data.keys():
+            new_data = self._data.copy()
+            new_data.pop(key)
+            with self.storage.open('cache.json', 'w') as f:
+                json.dump(new_data, f)
+            loader = MLBFStorageLoader(self.storage)
+            assert loader._raw == {**new_data, key: []}
+
+
 
 class TestMLBFDataBaseLoader(_MLBFBase):
     def test_load_returns_expected_data(self):