Revert "Merge pull request Pennyw0rth#729 from haytechy/refactor_SMBSpider"

This reverts commit 4137704, reversing
changes made to e11898b.

Author: NeffIsBack

nxc/modules/spider_plus.py

@@ -9,6 +9,7 @@
 from impacket.smbconnection import SessionError
 from impacket.nmb import NetBIOSTimeout
 
+
 CHUNK_SIZE = 4096
 
 

nxc/protocols/smb.py

@@ -1503,39 +1503,46 @@ def wmi(self, wmi_query=None, namespace=None):
             dcom.disconnect()
         return records if records else False
 
-    def spider(self):
-        if self.args.regex:
-            try:
-                self.args.regex = [re.compile(bytes(rx, "utf8")) for rx in self.args.regex]
-            except Exception as e:
-                self.logger.fail(f"Regex compilation error: {e}")
-        elif self.args.pattern is None:
-            self.args.pattern = [""]
-        if self.args.exclude_folders is None:
-            self.args.exclude_folders = []
-
-        spidering = SMBSpider(
-                self.conn,
-                self.logger,
+    def spider(
+        self,
+        share=None,
+        folder=".",
+        pattern=None,
+        regex=None,
+        exclude_dirs=None,
+        depth=None,
+        content=False,
+        only_files=True,
+        silent=True
+    ):
+        if exclude_dirs is None:
+            exclude_dirs = []
+        if regex is None:
+            regex = []
+        if pattern is None:
+            pattern = []
+        spider = SMBSpider(self.conn, self.logger)
+        if not silent:
+            self.logger.display("Started spidering")
+        start_time = time()
+        if not share:
+            spider.spider(
                 self.args.spider,
                 self.args.spider_folder,
                 self.args.pattern,
                 self.args.regex,
-                self.args.exclude_folders,
+                self.args.exclude_dirs,
                 self.args.depth,
                 self.args.content,
                 self.args.only_files,
-                self.args.only_folders,
-                self.args.spider_all
+                self.args.silent
             )
+        else:
+            spider.spider(share, folder, pattern, regex, exclude_dirs, depth, content, only_files, silent)
+        if not silent:
+            self.logger.display(f"Done spidering (Completed in {time() - start_time})")
 
-        self.logger.display("Started spidering")
-        start_time = time()
-        spidering.spider()
-        self.logger.display(f"Done spidering (Completed in {round(time() - start_time, 3)} seconds)")
-
-    def spider_all(self):
-        self.spider()
+        return spider.results
 
     def rid_brute(self, max_rid=None):
         entries = []

nxc/protocols/smb/proto_args.py

@@ -62,19 +62,16 @@ def proto_args(parser, parents):
     wmi_group.add_argument("--wmi-namespace", metavar="NAMESPACE", default="root\\cimv2", help="WMI Namespace")
 
     spidering_group = smb_parser.add_argument_group("Spidering", "Options for spidering shares")
-    spidering_group_type = spidering_group.add_mutually_exclusive_group()
-    spidering_group_type.add_argument("--spider", nargs="+", metavar="SHARE", type=str, help="Share to spider")
-    spidering_group_type.add_argument("--spider-all", action="store_true", help="Spider all the readable shares")
-    spidering_group.add_argument("--spider-folder", metavar="FOLDER", default="/", type=str, help="Folder to spider")
-    spidering_group.add_argument("--content", action="store_true", help="Enable file content searching")
-    spidering_group.add_argument("--exclude-folders", nargs="+", type=str, metavar="DIR_LIST", help="Directories to exclude from spidering")
-    spidering_group.add_argument("--depth", type=int, help="Max spider recursion depth")
-    spidering_group_search = spidering_group.add_mutually_exclusive_group()
-    spidering_group_search.add_argument("--pattern", nargs="+", help="Pattern(s) to search for in folders, filenames and file content")
-    spidering_group_search.add_argument("--regex", nargs="+", help="Regex(s) to search for in folders, filenames and file content")
-    spidering_group_filter = spidering_group.add_mutually_exclusive_group()
-    spidering_group_filter.add_argument("--only-files", action="store_true", help="Only spider files")
-    spidering_group_filter.add_argument("--only-folders", action="store_true", help="Only spider folders")
+    spidering_group.add_argument("--spider", metavar="SHARE", type=str, help="share to spider")
+    spidering_group.add_argument("--spider-folder", metavar="FOLDER", default=".", type=str, help="folder to spider")
+    spidering_group.add_argument("--content", action="store_true", help="enable file content searching")
+    spidering_group.add_argument("--exclude-dirs", type=str, metavar="DIR_LIST", default="", help="directories to exclude from spidering")
+    spidering_group.add_argument("--depth", type=int, help="max spider recursion depth")
+    spidering_group.add_argument("--only-files", action="store_true", help="only spider files")
+    spidering_group.add_argument("--silent", action="store_true", help="Do not print found files/directories", default=False)
+    segroup = spidering_group.add_mutually_exclusive_group()
+    segroup.add_argument("--pattern", nargs="+", help="pattern(s) to search for in folders, filenames and file content")
+    segroup.add_argument("--regex", nargs="+", help="regex(s) to search for in folders, filenames and file content")
 
     files_group = smb_parser.add_argument_group("Files", "Options for remote file interaction")
     files_group.add_argument("--put-file", action="append", nargs=2, metavar="FILE", help="Put a local file into remote target, ex: whoami.txt \\\\Windows\\\\Temp\\\\whoami.txt")