assemblyline-v4-service 4.6.1.dev248__py3-none-any.whl → 4.7.0.dev25__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.6.1.dev248
+4.7.0.dev25

assemblyline_v4_service/common/api.py

@@ -2,8 +2,6 @@ import os
 import time
 
 import requests
-from assemblyline_core.badlist_client import BadlistClient
-from assemblyline_core.safelist_client import SafelistClient
 from assemblyline_v4_service.common.utils import DEVELOPMENT_MODE
 from assemblyline_v4_service.common.helper import get_service_manifest
 
@@ -129,48 +127,3 @@ class ServiceAPI:
                 return None
             else:
                 raise
-
-
-class PrivilegedServiceAPI:
-    def __init__(self, logger):
-        self.log = logger
-        self.badlist_client = BadlistClient()
-        self.safelist_client = SafelistClient()
-
-    def lookup_badlist_tags(self, tag_map):
-        if DEVELOPMENT_MODE or not tag_map:
-            return []
-
-        if not isinstance(tag_map, dict) and not all([isinstance(x, list) for x in tag_map.values()]):
-            raise ValueError("Parameter tag_list should be a dictionary tag_type mapping to a list of tag_values.")
-
-        return self.badlist_client.exists_tags(tag_map)
-
-    def lookup_badlist(self, qhash):
-        if DEVELOPMENT_MODE or qhash is None:
-            return None
-        return self.badlist_client.exists(qhash)
-
-    def lookup_badlist_ssdeep(self, ssdeep):
-        if DEVELOPMENT_MODE or ssdeep is None:
-            return []
-        return self.badlist_client.find_similar_ssdeep(ssdeep)
-
-    def lookup_badlist_tlsh(self, tlsh):
-        if DEVELOPMENT_MODE or tlsh is None:
-            return []
-        return self.badlist_client.find_similar_tlsh(tlsh)
-
-    def get_safelist(self, tag_list=None):
-        if DEVELOPMENT_MODE:
-            return {}
-
-        if tag_list and not isinstance(tag_list, list):
-            raise ValueError("Parameter tag_list should be a list of strings.")
-
-        return self.safelist_client.get_safelisted_tags(tag_list)
-
-    def lookup_safelist(self, qhash):
-        if DEVELOPMENT_MODE:
-            return None
-        return self.safelist_client.exists(qhash)

assemblyline_v4_service/common/base.py

@@ -17,7 +17,7 @@ from assemblyline.common import exceptions, log, version
 from assemblyline.common.digests import get_sha256_for_file
 from assemblyline.odm.messages.task import Task as ServiceTask
 from assemblyline_v4_service.common import helper
-from assemblyline_v4_service.common.api import PrivilegedServiceAPI, ServiceAPI
+from assemblyline_v4_service.common.api import ServiceAPI
 from assemblyline_v4_service.common.ontology_helper import OntologyHelper
 from assemblyline_v4_service.common.ocr import update_ocr_config
 from assemblyline_v4_service.common.request import ServiceRequest
@@ -28,7 +28,6 @@ warnings.filterwarnings("ignore")
 
 UPDATES_DIR = os.environ.get('UPDATES_DIR', '/updates')
 UPDATES_CA = os.environ.get('UPDATES_CA', '/etc/assemblyline/ssl/al_root-ca.crt')
-PRIVILEGED = os.environ.get('PRIVILEGED', 'false') == 'true'
 MIN_SECONDS_BETWEEN_UPDATES = float(os.environ.get('MIN_SECONDS_BETWEEN_UPDATES', '10.0'))
 SIGNATURES_META_FILENAME = "signatures_meta.json"
 
@@ -143,10 +142,7 @@ class ServiceBase:
 
     def get_api_interface(self):
         if not self._api_interface:
-            if PRIVILEGED:
-                self._api_interface = PrivilegedServiceAPI(self.log)
-            else:
-                self._api_interface = ServiceAPI(self.service_attributes, self.log)
+            self._api_interface = ServiceAPI(self.service_attributes, self.log)
 
         return self._api_interface
 

assemblyline_v4_service/common/ontology_helper.py

@@ -32,6 +32,7 @@ def validate_tags(tag_map: Dict[str, List[str]]) -> Dict[str, List[str]]:
     tag_map = flatten(tag_map.as_primitives(strip_null=True))
     return tag_map
 
+
 # Merge tags
 def merge_tags(tag_a: Dict[str, List[str]], tag_b: Dict[str, List[str]]) -> Dict[str, List[str]]:
     if not tag_a:
@@ -43,6 +44,7 @@ def merge_tags(tag_a: Dict[str, List[str]], tag_b: Dict[str, List[str]]) -> Dict
     all_keys = list(tag_a.keys()) + list(tag_b.keys())
     return {key: list(set(tag_a.get(key, []) + tag_b.get(key, []))) for key in all_keys}
 
+
 class OntologyHelper:
     def __init__(self, logger, service_name) -> None:
         self.log = logger

assemblyline_v4_service/common/request.py

@@ -1,9 +1,9 @@
 import hashlib
 import logging
 import tempfile
-from typing import Any, Dict, List, Optional, TextIO, Union
+from typing import Any, Dict, List, Optional, TextIO
 
-from assemblyline_v4_service.common.api import PrivilegedServiceAPI, ServiceAPI
+from assemblyline_v4_service.common.api import ServiceAPI
 from assemblyline_v4_service.common.ocr import ocr_detections
 from assemblyline_v4_service.common.result import Heuristic, Result, ResultKeyValueSection
 from assemblyline_v4_service.common.task import PARENT_RELATION, MaxExtractedExceeded, Task
@@ -31,7 +31,7 @@ class ServiceRequest:
 
     def add_extracted(self, path: str, name: str, description: str,
                       classification: Optional[Classification] = None,
-                      safelist_interface: Optional[Union[ServiceAPI, PrivilegedServiceAPI]] = None,
+                      safelist_interface: Optional[ServiceAPI] = None,
                       allow_dynamic_recursion: bool = False, parent_relation: str = PARENT_RELATION.EXTRACTED) -> bool:
         """
         Add an extracted file for additional processing.
@@ -148,7 +148,7 @@ class ServiceRequest:
             self, path: str, name: str, description: str,
             classification: Optional[Classification] = None,
             parent_relation: str = PARENT_RELATION.INFORMATION
-        ) -> bool:
+    ) -> bool:
         """
         Add a supplementary file.
 
@@ -159,7 +159,6 @@ class ServiceRequest:
         :param parent_relation: File relation to parent, if any.
         :return: None
         """
-
         return self.task.add_supplementary(
             path, name, description, classification, parent_relation=parent_relation
         )