socx 2.2__tar.gz → 2.4.0__tar.gz

{socx-2.2 → socx-2.4.0}/PKG-INFO

@@ -1,14 +1,30 @@
 Metadata-Version: 2.4
 Name: socx
-Version: 2.2
+Version: 2.4.0
 Summary: A set of useful tools for a security operations center
 Author-email: Enlace <enlace.aman@gmail.com>
+License: MIT
+Project-URL: Homepage, https://github.com/yourusername/socx
+Project-URL: Repository, https://github.com/yourusername/socx
+Project-URL: Issues, https://github.com/yourusername/socx/issues
+Keywords: soc,security,operations,automation
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
+Classifier: Intended Audience :: Information Technology
+Classifier: Topic :: Security
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+Requires-Dist: keyring>=25.6.0
+Requires-Dist: pandas>=2.3.3
+Requires-Dist: requests>=2.32.5
 
-# socx
+# SOCX
 A collection of helpful tools for a SOC analyst. Easily search for IPs, domains, and find files on the system.
 
 ## Installing
@@ -30,21 +46,26 @@ or
     python socx.py [universal options] [function] [arguments]
 
 Examples:
+
     socx --help
 
     socx info -h
-
+    
     socx info -ip 1.2.3.4
-
+    
     socx -v 3 info -d google.com
-
+    
     socx find -f filename.txt -i
-
+    
     socx find -f fold.*name -r
-
+    
     socx unwrap --url "https://urldefense.com/v3/__https:/..."
-
+    
     socx combine --csvs 5
+    
+    socx awake --minutes 90
+    
+    socx awake --restart
 
 ## Other Information
 

{socx-2.2 → socx-2.4.0}/README.md

@@ -1,4 +1,4 @@
-# socx
+# SOCX
 A collection of helpful tools for a SOC analyst. Easily search for IPs, domains, and find files on the system.
 
 ## Installing
@@ -20,21 +20,26 @@ or
     python socx.py [universal options] [function] [arguments]
 
 Examples:
+
     socx --help
 
     socx info -h
-
+    
     socx info -ip 1.2.3.4
-
+    
     socx -v 3 info -d google.com
-
+    
     socx find -f filename.txt -i
-
+    
     socx find -f fold.*name -r
-
+    
     socx unwrap --url "https://urldefense.com/v3/__https:/..."
-
+    
     socx combine --csvs 5
+    
+    socx awake --minutes 90
+    
+    socx awake --restart
 
 ## Other Information
 

socx-2.4.0/pyproject.toml

@@ -0,0 +1,42 @@
+[build-system]
+requires = ["setuptools>=42"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "socx"
+version = "2.4.0"  # ← Added .0 for PEP 440 compliance
+description = "A set of useful tools for a security operations center"
+readme = "README.md"
+authors = [
+    { name = "Enlace", email = "enlace.aman@gmail.com" }
+]
+requires-python = ">=3.8"
+license = { text = "MIT" }  # ← Recommended: add license
+keywords = ["soc", "security", "operations", "automation"]  # ← Helps discoverability
+
+dependencies = [
+    "keyring>=25.6.0",
+    "pandas>=2.3.3",
+    "requests>=2.32.5",
+]
+
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Intended Audience :: Information Technology",
+    "Topic :: Security",
+]
+
+[project.urls]
+Homepage = "https://github.com/yourusername/socx"  # ← Optional but recommended
+Repository = "https://github.com/yourusername/socx"
+Issues = "https://github.com/yourusername/socx/issues"
+
+[project.scripts]
+socx = "socx:main"  # ← CLI entry point

{socx-2.2 → socx-2.4.0}/src/socx/socx.py

@@ -66,6 +66,8 @@ Examples:
     {PROGRAM_NAME} find -f fold.*name -r
     {PROGRAM_NAME} unwrap --url "https://urldefense.com/v3/__https:/..."
     {PROGRAM_NAME} combine --csvs 5
+    {PROGRAM_NAME} awake --minutes 90
+    {PROGRAM_NAME} awake --restart
 """
 verbosity = 1
 environmental_variables = {
@@ -87,7 +89,9 @@ def p(*args_, v=1, end="\n", sep=" ", file=None):
 def unwrap_url(url):
     pp_decoder = util.URLDefenseDecoder()
     if "safelinks" in url:
-        url = unquote(url.split("url=")[1])
+        url = [t for t in re.split(r"&|\?", url) if t.startswith("url=")][0]
+        url = url.split("=")[1]
+        url = unquote(url)
     url = pp_decoder.decode(url)
     return url
 
@@ -444,18 +448,23 @@ def do_browser_history(user="~"):
                         p(f"Error with {name} - {e}", v=3)
 
 
-def do_combine_csvs(csvs=0, skip_og_filename_column=False, directory=os.getcwd()):
+def do_combine_csvs(
+    csvs=0, skip_og_filename_column=False, directory=os.getcwd(), remove_dupes=False
+):
     p("Starting combine CSVs", v=5)
     p("The current directory will be used to find the CSVs.", v=1)
     paths = sorted(Path(directory).iterdir(), key=os.path.getmtime)
     paths.reverse()
+    paths = [p for p in paths if str(p).endswith(".csv")]
+    if len(paths) == 0:
+        p("There are no csvs in this directory", v=1)
+        return
     if csvs < 2:
         accum = 1
         p("File Paths", v=3)
         for path in paths:
-            if str(path).endswith(".csv"):
-                p(f"{accum} - {path}")
-                accum += 1
+            p(f"{accum} - {path}")
+            accum += 1
         csvs = int(input("Enter the index of the last CSV to include:"))
     file_paths = []
     for path in paths:
@@ -472,6 +481,11 @@ def do_combine_csvs(csvs=0, skip_og_filename_column=False, directory=os.getcwd()
             df["Original CSV Filename"] = os.path.basename(path)
         dfs.append(df)
     df = pd.concat(dfs)
+    if remove_dupes:
+        # Remove dupes by all but df['Original CSV Filename']
+        df = df.drop_duplicates(
+            subset=[col for col in df.columns if col != "Original CSV Filename"]
+        )
     df.to_csv("COMBINED_FILE.csv", index=False)
     p("Outputed to COMBINED_FILE.csv", v=3)
 
@@ -490,7 +504,7 @@ def do_command_history(user="~"):
     p("Command history gathered", v=3)
 
 
-def awake(minutes=60):
+def awake(minutes=60, restart=False):
     interval = 10  # seconds
     iterations = (minutes * 60) / interval
 
@@ -509,6 +523,13 @@ def awake(minutes=60):
         for line in proc.stdout:
             print(line, end="")
 
+    if restart:
+        p("Restarting device...")
+        cmd = ["shutdown", "/r", "/t", "0"]
+        proc = subprocess.Popen(
+            cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True
+        )
+
 
 #############
 # Arguments #
@@ -522,13 +543,6 @@ FUNCTIONS = [
         "function": lambda: do_config(),
         "arguments": [],
     },
-    {
-        "name": "Interactive mode",
-        "command": "interactive",
-        "help": "",
-        "function": lambda: interactive_mode(),
-        "arguments": [],
-    },
     {
         "name": "Stay Awake",
         "command": "awake",
@@ -545,6 +559,16 @@ FUNCTIONS = [
                 "required": False,
                 "help": "Keeps device awake for this many minutes",
             },
+            {
+                "name": "restart",
+                "flag": "--restart",
+                "short_flag": "-r",
+                "type": bool,
+                "action": "store_true",
+                "default": False,
+                "required": False,
+                "help": "Restart computer once done keeping device awake",
+            },
         ],
     },
     {
@@ -576,11 +600,22 @@ FUNCTIONS = [
                 "name": "skip_og_filename_column",
                 "flag": "--skip_og_filename_column",
                 "short_flag": "-sname",
+                "action": "store_true",
                 "type": bool,
                 "default": False,
                 "required": False,
                 "help": "Include a column with the OG file name",
             },
+            {
+                "name": "remove_dupes",
+                "flag": "--deduplicate",
+                "short_flag": "-dedupe",
+                "action": "store_true",
+                "type": bool,
+                "default": False,
+                "required": False,
+                "help": "Remove duplicate rows (excludes OG file name column)",
+            },
         ],
     },
     {
@@ -701,6 +736,7 @@ FUNCTIONS = [
                 "short_flag": "-ss",
                 "type": bool,
                 "default": False,
+                "action": "store_true",
                 "required": False,
                 "help": "Do smart search (try directory then user folder then C: then D:)",
             },
@@ -742,6 +778,14 @@ FUNCTIONS = [
             }
         ],
     },
+    # INTERACTIVE MODE MUST BE LAST OR INDEX IS OFF!
+    {
+        "name": "Interactive mode",
+        "command": "interactive",
+        "help": "",
+        "function": lambda: interactive_mode(),
+        "arguments": [],
+    },
 ]
 
 ####################

{socx-2.2 → socx-2.4.0}/src/socx.egg-info/PKG-INFO

@@ -1,14 +1,30 @@
 Metadata-Version: 2.4
 Name: socx
-Version: 2.2
+Version: 2.4.0
 Summary: A set of useful tools for a security operations center
 Author-email: Enlace <enlace.aman@gmail.com>
+License: MIT
+Project-URL: Homepage, https://github.com/yourusername/socx
+Project-URL: Repository, https://github.com/yourusername/socx
+Project-URL: Issues, https://github.com/yourusername/socx/issues
+Keywords: soc,security,operations,automation
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
+Classifier: Intended Audience :: Information Technology
+Classifier: Topic :: Security
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+Requires-Dist: keyring>=25.6.0
+Requires-Dist: pandas>=2.3.3
+Requires-Dist: requests>=2.32.5
 
-# socx
+# SOCX
 A collection of helpful tools for a SOC analyst. Easily search for IPs, domains, and find files on the system.
 
 ## Installing
@@ -30,21 +46,26 @@ or
     python socx.py [universal options] [function] [arguments]
 
 Examples:
+
     socx --help
 
     socx info -h
-
+    
     socx info -ip 1.2.3.4
-
+    
     socx -v 3 info -d google.com
-
+    
     socx find -f filename.txt -i
-
+    
     socx find -f fold.*name -r
-
+    
     socx unwrap --url "https://urldefense.com/v3/__https:/..."
-
+    
     socx combine --csvs 5
+    
+    socx awake --minutes 90
+    
+    socx awake --restart
 
 ## Other Information
 

{socx-2.2 → socx-2.4.0}/src/socx.egg-info/SOURCES.txt

@@ -7,5 +7,6 @@ src/socx.egg-info/PKG-INFO
 src/socx.egg-info/SOURCES.txt
 src/socx.egg-info/dependency_links.txt
 src/socx.egg-info/entry_points.txt
+src/socx.egg-info/requires.txt
 src/socx.egg-info/top_level.txt
 tests/tests.py

socx-2.4.0/src/socx.egg-info/requires.txt

@@ -0,0 +1,3 @@
+keyring>=25.6.0
+pandas>=2.3.3
+requests>=2.32.5

socx-2.2/pyproject.toml

@@ -1,19 +0,0 @@
-[build-system]
-requires = ["setuptools>=42"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "socx"
-version = "2.2"
-authors = [
-  { name="Enlace", email="enlace.aman@gmail.com" },
-]
-description = "A set of useful tools for a security operations center"
-readme = "README.md"
-requires-python = ">=3.8"
-classifiers = [
-    "Programming Language :: Python :: 3",
-    "Operating System :: OS Independent",
-]
-[project.scripts]
-socx = "socx:main"