Move from --enum-share to --dir

Author: y0no

nxc/protocols/smb.py

@@ -904,63 +904,32 @@ def shares(self):
         return permissions
 
 
-    def enum_shares(self):
-        try:
-            shares = self.conn.listShares()
-            self.logger.info(f"Shares returned: {shares}")
-        except SessionError as e:
-            error = get_error_string(e)
-            self.logger.fail(
-                f"Error enumerating shares: {error}",
-                color="magenta" if error in smb_error_status else "red",
-            )
-            return
-        except Exception as e:
-            error = get_error_string(e)
-            self.logger.fail(
-                f"Error enumerating shares: {error}",
-                color="magenta" if error in smb_error_status else "red",
-            )
+    def dir(self):
+        # Seems defined by default, do we have to keep this check ?
+        if not self.args.share:
+            self.logger.error("You must define --share option")
             return
-
-        self.logger.display("Enumerating SMB Shares Directories")
-        for share in shares:
-            share_name = share["shi1_netname"][:-1]
-            depth = 1
-            contents = self.conn.listPath(share_name, "*")
-
-            self.logger.success(share_name)
-
-            if contents and depth == 1:
-                self.logger.highlight(f"{'Perms':<9}{'File Size':<15}{'Date':<30}{'File Path':<45}")
-                self.logger.highlight(f"{'-----':<9}{'---------':<15}{'----':<30}{'---------':<45}")
-            self.list_share(share_name, "")
-
-
-    def list_share(self, share_name, path_dir, depth=1):
-        search_path = ntpath.join(path_dir, "*")
-
-        try:
-            contents = self.conn.listPath(share_name, search_path)
+        
+        search_path = ntpath.join(self.args.dir, "*")
+        try: 
+            contents = self.conn.listPath(self.args.share, search_path)
         except SessionError as e:
             error = get_error_string(e)
             self.logger.fail(
                 f"Error enumerating '{search_path}': {error}",
                 color="magenta" if error in smb_error_status else "red",
             )
             return
+        
+        if not contents:
+            return
 
+        self.logger.highlight(f"{'Perms':<9}{'File Size':<15}{'Date':<30}{'File Path':<45}")
+        self.logger.highlight(f"{'-----':<9}{'---------':<15}{'----':<30}{'---------':<45}")
         for content in contents:
-            path_name = content.get_longname()
-            full_path = ntpath.join(path_dir, path_name)
-
-            if path_name in [".", ".."]:
-                continue
+            full_path = ntpath.join(self.args.dir, content.get_longname())
+            self.logger.highlight(f"{'d' if content.is_directory() else 'f'}{'rw-' if content.is_readonly() > 0 else 'r--':<8}{content.get_filesize():<15}{ctime(float(content.get_mtime_epoch())):<30}{full_path:<45}")
 
-            if path_name != path_dir:
-                self.logger.highlight(f"{'d' if content.is_directory() else 'f'}{'rw-' if content.is_readonly() > 0 else 'r--':<8}{content.get_filesize():<15}{ctime(float(content.get_mtime_epoch())):<30}{full_path:<45}")
-            if content.is_directory() and depth < self.args.enum_shares and path_name not in [ ".", ".."]:
-                self.list_share(share_name, full_path, depth+1)
 
     @requires_admin
     def interfaces(self):

nxc/protocols/smb/proto_args.py

@@ -34,7 +34,7 @@ def proto_args(parser, parents):
 
     mapping_enum_group = smb_parser.add_argument_group("Mapping/Enumeration", "Options for Mapping/Enumerating")
     mapping_enum_group.add_argument("--shares", action="store_true", help="enumerate shares and access")
-    mapping_enum_group.add_argument("--enum-shares", nargs="?", type=int, const=3, help="Authenticate and enumerate exposed shares recursively (default depth: %(const)s)")
+    mapping_enum_group.add_argument("--dir", nargs="?", type=str, const="", help="List the content of a path (default path: '%(const)s')")
     mapping_enum_group.add_argument("--interfaces", action="store_true", help="enumerate network interfaces")
     mapping_enum_group.add_argument("--no-write-check", action="store_true", help="Skip write check on shares (avoid leaving traces when missing delete permissions)")
     mapping_enum_group.add_argument("--filter-shares", nargs="+", help="Filter share by access, option 'read' 'write' or 'read,write'")