From 00d82f7f006b74a67f48342a06cc00dbd75b33b4 Mon Sep 17 00:00:00 2001 From: Nex Date: Sat, 13 Aug 2022 17:50:00 +0200 Subject: [PATCH] Enforcing line lenght --- mvt/common/command.py | 11 +++++----- mvt/common/indicators.py | 44 ++++++++++++++++++++++------------------ mvt/common/module.py | 8 ++++---- mvt/common/updates.py | 11 +++++----- 4 files changed, 40 insertions(+), 34 deletions(-) diff --git a/mvt/common/command.py b/mvt/common/command.py index 024dae3..1f903c9 100644 --- a/mvt/common/command.py +++ b/mvt/common/command.py @@ -59,7 +59,8 @@ class Command: file_handler = logging.FileHandler(os.path.join(self.results_path, "command.log")) - formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s") + formatter = logging.Formatter("%(asctime)s - %(name)s - " + "%(levelname)s - %(message)s") file_handler.setLevel(logging.DEBUG) file_handler.setFormatter(formatter) logger.addHandler(file_handler) @@ -120,12 +121,12 @@ class Command: with open(file_path, "rb") as handle: sha256.update(handle.read()) except FileNotFoundError: - self.log.error("Failed to hash the file %s: might be a symlink", - file_path) + self.log.error("Failed to hash the file %s: might " + "be a symlink", file_path) continue except PermissionError: - self.log.error("Failed to hash the file %s: permission denied", - file_path) + self.log.error("Failed to hash the file %s: " + "permission denied", file_path) continue info["hashes"].append({ diff --git a/mvt/common/indicators.py b/mvt/common/indicators.py index 1de6227..a07fd2d 100644 --- a/mvt/common/indicators.py +++ b/mvt/common/indicators.py @@ -47,8 +47,8 @@ class Indicators: if os.path.isfile(path): self.parse_stix2(path) else: - self.log.error("Path specified with env MVT_STIX2 is not a valid file: %s", - path) + self.log.error("Path specified with env MVT_STIX2 is not " + "a valid file: %s", path) def _new_collection(self, cid: str = "", name: str = "", description: str = "", file_name: str = "", @@ -130,7 +130,8 @@ class Indicators: data = json.load(handle) except json.decoder.JSONDecodeError: self.log.critical("Unable to parse STIX2 indicator file. " - "The file is corrupted or in the wrong format!") + "The file is corrupted or in the wrong " + "format!") return malware = {} @@ -264,14 +265,16 @@ class Indicators: # If nothing matched, we can quit here. return None - # If all parsing worked, we start walking through available domain indicators. + # If all parsing worked, we start walking through available domain + # indicators. for ioc in self.get_iocs("domains"): # First we check the full domain. if final_url.domain.lower() == ioc["value"]: if orig_url.is_shortened and orig_url.url != final_url.url: - self.log.warning("Found a known suspicious domain %s shortened as %s matching " - "indicators from \"%s\"", - final_url.url, orig_url.url, ioc["name"]) + self.log.warning("Found a known suspicious domain %s " + "shortened as %s matching indicators " + "from \"%s\"", final_url.url, orig_url.url, + ioc["name"]) else: self.log.warning("Found a known suspicious domain %s " "matching indicators from \"%s\"", @@ -282,12 +285,13 @@ class Indicators: # Then we just check the top level domain. if final_url.top_level.lower() == ioc["value"]: if orig_url.is_shortened and orig_url.url != final_url.url: - self.log.warning("Found a sub-domain with suspicious top level %s shortened " - "as %s matching indicators from \"%s\"", - final_url.url, orig_url.url, ioc["name"]) + self.log.warning("Found a sub-domain with suspicious top " + "level %s shortened as %s matching " + "indicators from \"%s\"", final_url.url, + orig_url.url, ioc["name"]) else: - self.log.warning("Found a sub-domain with a suspicious top level %s matching " - "indicators from \"%s\"", + self.log.warning("Found a sub-domain with a suspicious top " + "level %s matching indicators from \"%s\"", final_url.url, ioc["name"]) return ioc @@ -334,9 +338,9 @@ class Indicators: if len(proc_name) == 16: if ioc["value"].startswith(proc_name): - self.log.warning("Found a truncated known suspicious process name \"%s\" " - "matching indicators from \"%s\"", - process, ioc["name"]) + self.log.warning("Found a truncated known suspicious " + "process name \"%s\" matching indicators " + "from \"%s\"", process, ioc["name"]) return ioc return None @@ -464,8 +468,8 @@ class Indicators: for ioc in self.get_iocs("files_sha256"): if file_hash.lower() == ioc["value"].lower(): - self.log.warning("Found a known suspicious file with hash \"%s\" matching " - "indicators from \"%s\"", + self.log.warning("Found a known suspicious file with hash " + "\"%s\" matching indicators from \"%s\"", file_hash, ioc["name"]) return ioc @@ -485,9 +489,9 @@ class Indicators: for ioc in self.get_iocs("app_ids"): if app_id.lower() == ioc["value"].lower(): - self.log.warning("Found a known suspicious app with ID \"%s\" matching " - "indicators from \"%s\"", - app_id, ioc["name"]) + self.log.warning("Found a known suspicious app with ID \"%s\" " + "matching indicators from \"%s\"", app_id, + ioc["name"]) return ioc return None diff --git a/mvt/common/module.py b/mvt/common/module.py index b28e157..44e0127 100644 --- a/mvt/common/module.py +++ b/mvt/common/module.py @@ -158,8 +158,8 @@ def run_module(module: Callable) -> None: try: module.run() except NotImplementedError: - module.log.exception("The run() procedure of module %s was not implemented yet!", - module.__class__.__name__) + module.log.exception("The run() procedure of module %s was not " + "implemented yet!", module.__class__.__name__) except InsufficientPrivileges as exc: module.log.info("Insufficient privileges for module %s: %s", module.__class__.__name__, exc) @@ -176,8 +176,8 @@ def run_module(module: Callable) -> None: try: module.check_indicators() except NotImplementedError: - module.log.info("The %s module does not support checking for indicators", - module.__class__.__name__) + module.log.info("The %s module does not support checking for " + "indicators", module.__class__.__name__) else: if module.indicators and not module.detected: module.log.info("The %s module produced no detections!", diff --git a/mvt/common/updates.py b/mvt/common/updates.py index 8aa3e7e..e06a325 100644 --- a/mvt/common/updates.py +++ b/mvt/common/updates.py @@ -88,8 +88,8 @@ class IndicatorsUpdates: self.index_branch, self.index_path) res = requests.get(url) if res.status_code != 200: - log.error("Failed to retrieve indicators index located at %s (error %d)", - url, res.status_code) + log.error("Failed to retrieve indicators index located at %s " + "(error %d)", url, res.status_code) return None return yaml.safe_load(res.content) @@ -131,8 +131,8 @@ class IndicatorsUpdates: ioc_url = ioc.get("download_url", "") if not ioc_url: - log.error("Could not find a way to download indicator file for %s", - ioc.get("name")) + log.error("Could not find a way to download indicator file " + "for %s", ioc.get("name")) continue ioc_local_path = self.download_remote_ioc(ioc_url) @@ -162,7 +162,8 @@ class IndicatorsUpdates: latest_commit = details[0] latest_commit_date = latest_commit.get("commit", {}).get("author", {}).get("date", None) if not latest_commit_date: - log.error("Failed to retrieve date of latest update to indicators index file") + log.error("Failed to retrieve date of latest update to indicators " + "index file") return -1 latest_commit_dt = datetime.strptime(latest_commit_date,