Skip to content

Commit 739791e

Browse files
authored
Merge pull request Pennyw0rth#392 from Pennyw0rth/neff-fix-spider_plus
Fix spider_plus bug where len was applied to the count not an array
2 parents e982a68 + 1292f0f commit 739791e

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

nxc/modules/spider_plus.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from os.path import abspath, join, split, exists, splitext, getsize, sep
44
from os import makedirs, remove, stat
55
import time
6-
import traceback
76
from nxc.paths import TMP_PATH
87
from nxc.protocols.smb.remotefile import RemoteFile
98
from impacket.smb3structs import FILE_READ_DATA
@@ -159,8 +158,8 @@ def read_chunk(self, remote_file, chunk_size=CHUNK_SIZE):
159158
remote_file.__smbConnection = self.smb.conn
160159
return self.read_chunk(remote_file)
161160

162-
except Exception:
163-
traceback.print_exc()
161+
except Exception as e:
162+
self.logger.exception(e)
164163
break
165164

166165
return chunk
@@ -214,13 +213,13 @@ def spider_shares(self):
214213
# Start the spider at the root of the share folder
215214
self.results[share_name] = {}
216215
self.spider_folder(share_name, "")
217-
except SessionError:
218-
traceback.print_exc()
216+
except SessionError as e:
217+
self.logger.exception(e)
219218
self.logger.fail("Got a session error while spidering.")
220219
self.reconnect()
221220

222221
except Exception as e:
223-
traceback.print_exc()
222+
self.logger.exception(e)
224223
self.logger.fail(f"Error enumerating shares: {e!s}")
225224

226225
# Save the metadata.
@@ -412,8 +411,7 @@ def print_stats(self):
412411
self.logger.display(f"Total folders found: {num_folders}")
413412
num_folders_filtered = self.stats.get("num_folders_filtered", 0)
414413
if num_folders_filtered:
415-
num_filtered_folders = len(num_folders_filtered)
416-
self.logger.display(f"Folders Filtered: {num_filtered_folders}")
414+
self.logger.display(f"Folders Filtered: {num_folders_filtered}")
417415

418416
# File statistics.
419417
num_files = self.stats.get("num_files", 0)

nxc/netexec.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ def main():
142142

143143
protocol_object = getattr(p_loader.load_protocol(protocol_path), args.protocol)
144144
nxc_logger.debug(f"Protocol Object: {protocol_object}, type: {type(protocol_object)}")
145-
nxc_logger.debug(f"Protocol Object dir: {dir(protocol_object)}")
146145
protocol_db_object = p_loader.load_protocol(protocol_db_path).database
147146
nxc_logger.debug(f"Protocol DB Object: {protocol_db_object}")
148147

0 commit comments

Comments
 (0)