Merge pull request #28 from CybercentreCanada/update/black

Update/black [dev]
CybercentreCanada · Jun 19, 2023 · 5dc7116 · 5dc7116
2 parents 9bc7ce6 + 7771437
commit 5dc7116
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 27 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -23,7 +23,7 @@
         "120",
         "--experimental"
     ],
-    "python.formatting.provider": "autopep8",
+    "python.formatting.provider": "black",
     "python.formatting.blackArgs": [
         "--line-length=120"
     ],

diff --git a/assemblyline_service_utilities/common/dynamic_service_helper.py b/assemblyline_service_utilities/common/dynamic_service_helper.py
@@ -27,8 +27,6 @@
 from assemblyline.odm.models.ontology.results import Process as ProcessModel
 from assemblyline.odm.models.ontology.results import Sandbox as SandboxModel
 from assemblyline.odm.models.ontology.results import Signature as SignatureModel
-from assemblyline_service_utilities.common.safelist_helper import URL_REGEX, is_tag_safelisted
-from assemblyline_service_utilities.common.tag_helper import add_tag
 from assemblyline_v4_service.common.base import ServiceBase
 from assemblyline_v4_service.common.request import ServiceRequest
 from assemblyline_v4_service.common.result import (
@@ -40,6 +38,9 @@
 )
 from assemblyline_v4_service.common.task import MaxExtractedExceeded
 
+from assemblyline_service_utilities.common.safelist_helper import URL_REGEX, is_tag_safelisted
+from assemblyline_service_utilities.common.tag_helper import add_tag
+
 al_log.init_logging("service.service_base.dynamic_service_helper")
 log = getLogger("assemblyline.service.service_base.dynamic_service_helper")
 

diff --git a/assemblyline_service_utilities/common/section_reducer.py b/assemblyline_service_utilities/common/section_reducer.py
@@ -1,6 +1,7 @@
-from assemblyline_service_utilities.common.tag_reducer import REDUCE_MAP
 from assemblyline_v4_service.common.result import Result, ResultSection
 
+from assemblyline_service_utilities.common.tag_reducer import REDUCE_MAP
+
 
 def reduce(al_result: Result) -> Result:
     """

diff --git a/assemblyline_service_utilities/common/tag_helper.py b/assemblyline_service_utilities/common/tag_helper.py
@@ -4,9 +4,10 @@
 from assemblyline.common.net import is_valid_domain, is_valid_ip
 from assemblyline.common.str_utils import safe_str
 from assemblyline.odm.base import DOMAIN_ONLY_REGEX, DOMAIN_REGEX, FULL_URI, IP_REGEX, URI_PATH
-from assemblyline_service_utilities.common.safelist_helper import is_tag_safelisted
 from assemblyline_v4_service.common.result import ResultSection
 
+from assemblyline_service_utilities.common.safelist_helper import is_tag_safelisted
+
 
 def add_tag(
     result_section: ResultSection,

diff --git a/assemblyline_service_utilities/testing/regenerate_results.py b/assemblyline_service_utilities/testing/regenerate_results.py
@@ -1,6 +1,7 @@
 import os
 
 from assemblyline.common.importing import load_module_by_path
+
 from assemblyline_service_utilities.testing.helper import TestHelper
 
 required_env = [

diff --git a/test/test_section_reducer.py b/test/test_section_reducer.py
@@ -1,6 +1,9 @@
 import os
 
 import pytest
+from assemblyline_v4_service.common.result import Result, ResultSection
+
+from assemblyline_service_utilities.common.section_reducer import _reduce_specific_tags, _section_traverser, reduce
 
 SERVICE_CONFIG_NAME = "service_manifest.yml"
 TEMP_SERVICE_CONFIG_PATH = os.path.join("/tmp", SERVICE_CONFIG_NAME)
@@ -20,8 +23,6 @@ def teardown_module():
 class TestSectionReducer:
     @staticmethod
     def test_reduce():
-        from assemblyline_service_utilities.common.section_reducer import reduce
-        from assemblyline_v4_service.common.result import Result, ResultSection
         res = Result()
         result_section = ResultSection("blah")
         res.add_section(result_section)
@@ -37,8 +38,6 @@ def test_reduce():
                                   "https://google.com?query=coco"]},
                                {"network.dynamic.uri": ["https://google.com?query=${ALPHA}"]},), ])
     def test_section_traverser(tags, correct_tags):
-        from assemblyline_service_utilities.common.section_reducer import _section_traverser
-        from assemblyline_v4_service.common.result import ResultSection
         section = ResultSection("blah")
         subsection = ResultSection("subblah")
         for t_type, t_values in tags.items():
@@ -67,5 +66,4 @@ def test_section_traverser(tags, correct_tags):
                               ({"attribution.actor": ["MALICIOUS_ACTOR"]},
                                {"attribution.actor": ["MALICIOUS_ACTOR"]}), ])
     def test_reduce_specific_tags(tags, correct_reduced_tags):
-        from assemblyline_service_utilities.common.section_reducer import _reduce_specific_tags
         assert _reduce_specific_tags(tags) == correct_reduced_tags
diff --git a/test/test_tag_helper.py b/test/test_tag_helper.py
@@ -1,6 +1,10 @@
 import os
 
 import pytest
+from assemblyline.odm.base import DOMAIN_ONLY_REGEX, FULL_URI, IP_REGEX, URI_PATH
+from assemblyline_v4_service.common.result import ResultSection
+
+from assemblyline_service_utilities.common.tag_helper import _get_regex_for_tag, add_tag
 
 SERVICE_CONFIG_NAME = "service_manifest.yml"
 TEMP_SERVICE_CONFIG_PATH = os.path.join("/tmp", SERVICE_CONFIG_NAME)
@@ -28,8 +32,6 @@ def teardown_module():
     ]
 )
 def test_add_tag(value, expected_tags, tags_were_added):
-    from assemblyline_service_utilities.common.tag_helper import add_tag
-    from assemblyline_v4_service.common.result import ResultSection
     res_sec = ResultSection("blah")
     tag = "blah"
     safelist = {"match": {"domain": ["blah.ca"]}}
@@ -38,8 +40,6 @@ def test_add_tag(value, expected_tags, tags_were_added):
 
 
 def test_get_regex_for_tag():
-    from assemblyline.odm.base import DOMAIN_ONLY_REGEX, FULL_URI, IP_REGEX, URI_PATH
-    from assemblyline_service_utilities.common.tag_helper import _get_regex_for_tag
     assert _get_regex_for_tag("network.dynamic.domain") == DOMAIN_ONLY_REGEX
     assert _get_regex_for_tag("network.dynamic.ip") == IP_REGEX
     assert _get_regex_for_tag("network.dynamic.uri") == FULL_URI
@@ -81,8 +81,6 @@ def test_get_regex_for_tag():
     ]
 )
 def test_validate_tag(tag, value, expected_tags, added_tag):
-    from assemblyline_service_utilities.common.tag_helper import add_tag
-    from assemblyline_v4_service.common.result import ResultSection
     res_sec = ResultSection("blah")
     safelist = {"match": {"domain": ["blah.ca"]}}
     assert add_tag(res_sec, tag, value, safelist) == added_tag

diff --git a/test/test_tag_reducer.py b/test/test_tag_reducer.py
@@ -1,17 +1,21 @@
 import pytest
+from regex import compile
+
+from assemblyline_service_utilities.common.tag_reducer import (
+    ALPHA_REGEX,
+    ALPHANUM_REGEX,
+    BASE64_REGEX,
+    DO_NOT_REDUCE,
+    NUMBER_REGEX,
+    _get_placeholder,
+    _turn_back_into_uri,
+    reduce_uri_tags,
+)
 
 
 class TestTagReducer:
     @staticmethod
     def test_constants():
-        from assemblyline_service_utilities.common.tag_reducer import (
-            ALPHA_REGEX,
-            ALPHANUM_REGEX,
-            BASE64_REGEX,
-            DO_NOT_REDUCE,
-            NUMBER_REGEX,
-        )
-        from regex import compile
         assert NUMBER_REGEX == compile("[0-9]*")
         assert ALPHA_REGEX == compile("[a-zA-Z]*")
         assert ALPHANUM_REGEX == compile("[a-zA-Z0-9]*")
@@ -31,7 +35,6 @@ def test_constants():
         ]
     )
     def test_get_placeholder(val, correct_placeholder):
-        from assemblyline_service_utilities.common.tag_reducer import _get_placeholder
         assert _get_placeholder(val) == correct_placeholder
 
     @staticmethod
@@ -46,7 +49,6 @@ def test_get_placeholder(val, correct_placeholder):
            "fragment": "fragment"},
           "scheme://domain/path;params#fragment"), ])
     def test_turn_back_into_uri(uri_parts, correct_uri):
-        from assemblyline_service_utilities.common.tag_reducer import _turn_back_into_uri
         assert _turn_back_into_uri(uri_parts) == correct_uri
 
     @staticmethod
@@ -101,5 +103,4 @@ def test_turn_back_into_uri(uri_parts, correct_uri):
            "https://hello.com/path?query=THISISATESTTHISISATEST1&rnd=567", ],
           ["https://hello.com/path?query=THISISATESTTHISISATEST1&rnd=${NUMBER}"],), ])
     def test_reduce_uri_tags(uris, correct_tags):
-        from assemblyline_service_utilities.common.tag_reducer import reduce_uri_tags
         assert set(reduce_uri_tags(uris)) == set(correct_tags)