assemblyline-v4-service 4.4.0.15__py3-none-any.whl → 4.4.0.17__py3-none-any.whl

assemblyline_v4_service/VERSION

@@ -1 +1 @@
-4.4.0.15
+4.4.0.17

assemblyline_v4_service/common/dynamic_service_helper.py

@@ -1913,7 +1913,10 @@ class OntologyResults:
         :return: None
         """
         if self._validate_process(process):
-            self._guid_process_map[process.objectid.guid] = process
+            if isinstance(process.objectid.guid, str):
+                self._guid_process_map[process.objectid.guid.upper()] = process
+            else:
+                self._guid_process_map[process.objectid.guid] = process
             self.set_parent_details(process)
             self.set_child_details(process)
             self.processes.append(process)
@@ -3279,12 +3282,6 @@ def convert_sysmon_processes(
                 else:
                     process["start_time"] = MIN_TIME
                     process["end_time"] = t
-            elif name == "utctime" and event_id in [10]:
-                if "." in text:
-                    text = text[:text.index(".")]
-                t = str(datetime.strptime(text, LOCAL_FMT))
-                process["start_time"] = t
-                process["time_observed"] = t
             elif name == "utctime":
                 if "." in text:
                     text = text[:text.index(".")]

assemblyline_v4_service/common/ontology_helper.py

@@ -174,7 +174,8 @@ class OntologyHelper:
         # Include Ontological data
         ontology_suffix = f"{request.sha256}.ontology"
         ontology_path = os.path.join(working_dir, ontology_suffix)
-        open(ontology_path, 'w').write(json.dumps(ontology))
+        with open(ontology_path, 'w') as f:
+            f.write(json.dumps(ontology))
         attachment_name = f'{request.task.service_name}_{ontology_suffix}'.lower()
         request.add_supplementary(path=ontology_path, name=attachment_name,
                                   description=f"Result Ontology from {request.task.service_name}",

assemblyline_v4_service/common/result.py

@@ -72,7 +72,7 @@ class Heuristic:
                  signature: Optional[str] = None,
                  attack_ids: Optional[List[str]] = None,
                  signatures: Optional[Dict[str, int]] = None,
-                 frequency: Optional[int] = 1,
+                 frequency: int = 1,
                  score_map: Optional[Dict[str, int]] = None):
 
         # Lazy load heuristics
@@ -205,7 +205,7 @@ class Heuristic:
 
 
 class SectionBody:
-    def __init__(self, body_format: BODY_FORMAT, body=None):
+    def __init__(self, body_format, body=None):
         self._format = body_format
         self._data = body
 
@@ -417,7 +417,7 @@ class MultiSectionBody(SectionBody):
     def __init__(self) -> None:
         super().__init__(BODY_FORMAT.MULTI, body=[])
 
-    def add_section_body(self, section_body: SectionBody) -> str:
+    def add_section_body(self, section_body: SectionBody) -> None:
         self._data.append((section_body.format, section_body._data))
 
 
@@ -428,7 +428,7 @@ class DividerSectionBody(SectionBody):
 
 class TimelineSectionBody(SectionBody):
     def __init__(self):
-        return super().__init__(BODY_FORMAT.TIMELINE, body=[])
+        super().__init__(BODY_FORMAT.TIMELINE, body=[])
 
     def add_node(self, title: str, content: str, opposite_content: str,
                  icon: str = None, signatures: List[str] = [], score: int = 0) -> None:
@@ -442,7 +442,7 @@ class ResultSection:
             title_text: Union[str, List],
             body: Optional[Union[str, SectionBody]] = None,
             classification: Optional[Classification] = None,
-            body_format: BODY_FORMAT = BODY_FORMAT.TEXT,
+            body_format=BODY_FORMAT.TEXT,
             heuristic: Optional[Heuristic] = None,
             tags: Optional[Dict[str, List[str]]] = None,
             parent: Optional[Union[ResultSection, Result]] = None,
@@ -463,8 +463,8 @@ class ResultSection:
             self._body_format = body.format
             self._body = body.body
         else:
-            self._body_format: BODY_FORMAT = body_format
-            self._body: str = body
+            self._body_format = body_format
+            self._body = body
         self.classification: Classification = classification or SERVICE_ATTRIBUTES.default_result_classification
         self.depth: int = 0
         self._tags = tags or {}
@@ -577,10 +577,10 @@ class ResultSection:
 
         return True
 
-    def set_body(self, body: Union[str, SectionBody], body_format: BODY_FORMAT = None) -> None:
+    def set_body(self, body: Union[str, SectionBody], body_format=None) -> None:
         if isinstance(body, SectionBody):
             self._body = body.body
-            self._body_format = body.body_format
+            self._body_format = body._format
         else:
             self._body = body
             if body_format:
@@ -635,7 +635,7 @@ class TypeSpecificResultSection(ResultSection):
     def add_lines(self, line_list: List[str]) -> None:
         raise InvalidFunctionException("Do not use default add_lines method in a type specific section.")
 
-    def set_body(self, body: Union[str, SectionBody], body_format: BODY_FORMAT = BODY_FORMAT.TEXT) -> None:
+    def set_body(self, body: Union[str, SectionBody], body_format=BODY_FORMAT.TEXT) -> None:
         raise InvalidFunctionException("Do not use default set_body method in a type specific section.")
 
 
@@ -757,7 +757,7 @@ class ResultMultiSection(TypeSpecificResultSection):
         self.section_body: MultiSectionBody
         super().__init__(title_text,  MultiSectionBody(), **kwargs)
 
-    def add_section_part(self, section_part: SectionBody) -> bool:
+    def add_section_part(self, section_part: SectionBody) -> None:
         self.section_body.add_section_body(section_part)
 
 
@@ -820,8 +820,8 @@ class Result:
         for section in self.sections:
             self._flatten_sections(section)
 
-        for section in self._flattened_sections:
-            heuristic = section.get('heuristic')
+        for flattened_section in self._flattened_sections:
+            heuristic = flattened_section.get('heuristic')
             if heuristic:
                 self._score += heuristic['score']
 

assemblyline_v4_service/updater/updater.py

@@ -51,7 +51,7 @@ SOURCE_STATUS_KEY = 'status'
 UI_SERVER = os.getenv('UI_SERVER', 'https://nginx')
 UI_SERVER_ROOT_CA = os.environ.get('UI_SERVER_ROOT_CA', '/etc/assemblyline/ssl/al_root-ca.crt')
 UPDATER_DIR = os.getenv('UPDATER_DIR', os.path.join(tempfile.gettempdir(), 'updater'))
-UPDATER_API_ROLES = ['signature_import', 'signature_download', 'signature_view', 'safelist_manage', 'apikey_access']
+UPDATER_API_ROLES = ['signature_import', 'signature_download', 'signature_view', 'safelist_manage', 'apikey_access', 'signature_manage']
 STATUS_FILE = '/tmp/status'
 
 classification = forge.get_classification()
@@ -602,8 +602,8 @@ class ServiceUpdater(ThreadedCoreBase):
         uname = 'update_service_account'
         user_data = self.datastore.user.get_if_exists(uname)
         if user_data:
-            if user_data.roles:
-                # User exists and has roles, we're good to go
+            if user_data.roles and user_data.roles == UPDATER_API_ROLES:
+                # User exists and has the expected roles, we're good to go
                 return uname
 
             # User exist but has no roles, let's update the user's roles

{assemblyline_v4_service-4.4.0.15.dist-info → assemblyline_v4_service-4.4.0.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: assemblyline-v4-service
-Version: 4.4.0.15
+Version: 4.4.0.17
 Summary: Assemblyline 4 - Service base
 Home-page: https://github.com/CybercentreCanada/assemblyline-v4-service/
 Author: CCCS Assemblyline development team

{assemblyline_v4_service-4.4.0.15.dist-info → assemblyline_v4_service-4.4.0.17.dist-info}/RECORD

@@ -1,4 +1,4 @@
-assemblyline_v4_service/VERSION,sha256=vRFRtcm2i_-ORh1gwak2zjKqAVyWqa_Cp-JiTBu2eX8,9
+assemblyline_v4_service/VERSION,sha256=AMrDTIq1dFgJddwPkPRMdaVYZPxJe4666y64VwavE54,9
 assemblyline_v4_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_v4_service/healthz.py,sha256=3QGBg0EZuXC6UN411HFwpLNEop9UvS9feFhvBUTP-k4,1576
 assemblyline_v4_service/run_privileged_service.py,sha256=9uTfHetXR5G-EDKMDrgfWUOw34yr64-cj6Cm9eZaCbQ,14547
@@ -6,13 +6,13 @@ assemblyline_v4_service/run_service.py,sha256=RCqxdm-OAwJhl15BnKFkuavpQ5k6eTX3ZG
 assemblyline_v4_service/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 assemblyline_v4_service/common/api.py,sha256=U908p3wlW9fEydx77GgI2E-6wW6T8Nc3R91nNOKU0H0,4453
 assemblyline_v4_service/common/base.py,sha256=STzfZ9dwqvbgbKiFs-aLk05pdhyK6Psz4hZ3_fOmQYM,13039
-assemblyline_v4_service/common/dynamic_service_helper.py,sha256=xIuuJLtf9Wz_mXdoquzCL7TmHtH_trH4a1PfRL9A-GM,147593
+assemblyline_v4_service/common/dynamic_service_helper.py,sha256=vgIAY9z4zCBJA2riG0nGKyLZ1bWhXSSoM01riDEu_cI,147464
 assemblyline_v4_service/common/helper.py,sha256=Fgimk8DhnS23aijTGewA1HwvPoAM61UUbHlrGBnSzL0,3290
 assemblyline_v4_service/common/icap.py,sha256=phT3CT5uII3Qm90Nzi4O-eDkQ2jmr3zHcVVra4sqYSc,5376
 assemblyline_v4_service/common/keytool_parse.py,sha256=e829hrNNG5LFw1kjLsYVZsafCm2S3NpgM6jBc6JKawY,2219
-assemblyline_v4_service/common/ontology_helper.py,sha256=HJdFvZCP6OPNGySjjmXa-fLqTwaa9V-lnhCSv-isztQ,7768
+assemblyline_v4_service/common/ontology_helper.py,sha256=uiwc5cfPDAesEDYKk7etzCMTGQNVwhNrO3mWLdB2520,7793
 assemblyline_v4_service/common/request.py,sha256=p8A9boDZ6KuVxl3EdhvaU1D_5K6_gAVoIbJYDz8TzjA,9711
-assemblyline_v4_service/common/result.py,sha256=LEzZq0YjEoHZvhVZmlMd5AqAhsHE6mKqotX1mdmbTbg,29727
+assemblyline_v4_service/common/result.py,sha256=0_ybxAQ_0W0pYo35Kr2EUgBMujQeGsgHbbbdfiLud88,29651
 assemblyline_v4_service/common/safelist_helper.py,sha256=QHTuG8q52o3U307AADPgrIgug7aYFK2uQE4-EtWG3yQ,3037
 assemblyline_v4_service/common/section_reducer.py,sha256=JJOT7eFfBn4hFJKHY9UeVEbHS-E8FpmQ_dPZC-dWla0,1513
 assemblyline_v4_service/common/tag_helper.py,sha256=om3TVPY_XDeFDqVW2iUA349xbljSAy5tv667jCiA7JI,4186
@@ -45,9 +45,9 @@ assemblyline_v4_service/updater/__main__.py,sha256=9Os-u8Tf7MD73JSrUSPmOaErTgfve
 assemblyline_v4_service/updater/app.py,sha256=Ass5DZtOCr0tdoRbLo7Qn8Ujlw8T8mUDroAaHxx2oMo,3198
 assemblyline_v4_service/updater/gunicorn_config.py,sha256=p3j2KPBeD5jvMw9O5i7vAtlRgPSVVxIG9AO0DfN82J8,1247
 assemblyline_v4_service/updater/helper.py,sha256=JD0gX3KHY-wvsFjTbWkT83F0d5Up3OfubMPinuNzbTQ,9069
-assemblyline_v4_service/updater/updater.py,sha256=7Ep-qeQLuKffnrvOwi9Gb8eFyDxBtLUbFNkUlRpu2Fc,29163
-assemblyline_v4_service-4.4.0.15.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
-assemblyline_v4_service-4.4.0.15.dist-info/METADATA,sha256=cHUPNrUfv5KzFI8ambfJEVW6c4TU0qUecC7mPPBbay0,9328
-assemblyline_v4_service-4.4.0.15.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-assemblyline_v4_service-4.4.0.15.dist-info/top_level.txt,sha256=Ut5IqePObcxlJ8rv2--dOAzYbxzqlllfiV_51cbqjbA,24
-assemblyline_v4_service-4.4.0.15.dist-info/RECORD,,
+assemblyline_v4_service/updater/updater.py,sha256=vbMwxEXphJDeL3TG7sCEzgEgUMWWYa9tPIz-BW7Y4hQ,29237
+assemblyline_v4_service-4.4.0.17.dist-info/LICENCE.md,sha256=NSkYo9EH8h5oOkzg4VhjAHF4339MqPP2cQ8msTPgl-c,1396
+assemblyline_v4_service-4.4.0.17.dist-info/METADATA,sha256=FN1jwGpYC4E4dBGq_mvfMjiGGRBimiCWpXuYVWDfrCQ,9328
+assemblyline_v4_service-4.4.0.17.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+assemblyline_v4_service-4.4.0.17.dist-info/top_level.txt,sha256=Ut5IqePObcxlJ8rv2--dOAzYbxzqlllfiV_51cbqjbA,24
+assemblyline_v4_service-4.4.0.17.dist-info/RECORD,,