Skip to content

Commit d769bc9

Browse files
committed
Rename no_print_result to silent and improve readability
1 parent 951ad25 commit d769bc9

3 files changed

Lines changed: 36 additions & 40 deletions

File tree

nxc/modules/recyclebin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def on_admin_login(self, context, connection):
4848
"C$",
4949
folder=spider_folder,
5050
regex=[r"(.*)"],
51-
no_print_results=True
51+
silent=True
5252
)
5353

5454
false_positive = (".", "..", "desktop.ini")

nxc/protocols/smb.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1376,7 +1376,7 @@ def spider(
13761376
depth=None,
13771377
content=False,
13781378
only_files=True,
1379-
no_print_results=True
1379+
silent=True
13801380
):
13811381
if exclude_dirs is None:
13821382
exclude_dirs = []
@@ -1385,7 +1385,7 @@ def spider(
13851385
if pattern is None:
13861386
pattern = []
13871387
spider = SMBSpider(self.conn, self.logger)
1388-
if not no_print_results:
1388+
if not silent:
13891389
self.logger.display("Started spidering")
13901390
start_time = time()
13911391
if not share:
@@ -1398,11 +1398,11 @@ def spider(
13981398
self.args.depth,
13991399
self.args.content,
14001400
self.args.only_files,
1401-
self.args.no_print_results
1401+
self.args.silent
14021402
)
14031403
else:
1404-
spider.spider(share, folder, pattern, regex, exclude_dirs, depth, content, only_files, no_print_results)
1405-
if not no_print_results:
1404+
spider.spider(share, folder, pattern, regex, exclude_dirs, depth, content, only_files, silent)
1405+
if not silent:
14061406
self.logger.display(f"Done spidering (Completed in {time() - start_time})")
14071407

14081408
return spider.results

nxc/protocols/smb/smbspider.py

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def __init__(self, smbconnection, logger):
1919
self.onlyfiles = True
2020
self.content = False
2121
self.results = []
22-
self.no_print_results = False
22+
self.silent = False
2323

2424
def spider(
2525
self,
@@ -31,7 +31,7 @@ def spider(
3131
depth=None,
3232
content=False,
3333
onlyfiles=True,
34-
no_print_results = False
34+
silent = False
3535
):
3636
if exclude_dirs is None:
3737
exclude_dirs = []
@@ -50,7 +50,7 @@ def spider(
5050
self.exclude_dirs = exclude_dirs
5151
self.content = content
5252
self.onlyfiles = onlyfiles
53-
self.no_print_results = no_print_results
53+
self.silent = silent
5454

5555
if share == "*":
5656
self.logger.display("Enumerating shares for spidering")
@@ -69,7 +69,7 @@ def spider(
6969
self.logger.fail(f"Error enumerating shares: {e}")
7070
else:
7171
self.share = share
72-
if not self.no_print_results:
72+
if not self.silent:
7373
self.logger.display(f"Spidering {folder}")
7474
self._spider(folder, depth)
7575

@@ -118,40 +118,36 @@ def dir_list(self, files, path):
118118
if self.pattern:
119119
for pattern in self.pattern:
120120
if bytes(result.get_longname().lower(), "utf8").find(bytes(pattern.lower(), "utf8")) != -1:
121-
if not self.onlyfiles and result.is_directory():
122-
if not self.no_print_results:
123-
self.logger.highlight(f"//{self.smbconnection.getRemoteHost()}/{self.share}/{path}{result.get_longname()} [dir]")
124-
else:
125-
if not self.no_print_results:
126-
self.logger.highlight(
127-
"//{}/{}/{}{} [lastm:'{}' size:{}]".format(
128-
self.smbconnection.getRemoteHost(),
129-
self.share,
130-
path,
131-
result.get_longname(),
132-
"n\\a" if not self.get_lastm_time(result) else self.get_lastm_time(result),
133-
result.get_filesize(),
134-
)
121+
if not self.onlyfiles and result.is_directory() and not self.silent:
122+
self.logger.highlight(f"//{self.smbconnection.getRemoteHost()}/{self.share}/{path}{result.get_longname()} [dir]")
123+
elif not self.silent:
124+
self.logger.highlight(
125+
"//{}/{}/{}{} [lastm:'{}' size:{}]".format(
126+
self.smbconnection.getRemoteHost(),
127+
self.share,
128+
path,
129+
result.get_longname(),
130+
"n\\a" if not self.get_lastm_time(result) else self.get_lastm_time(result),
131+
result.get_filesize(),
135132
)
133+
)
136134
self.results.append(f"{path}{result.get_longname()}")
137135
if self.regex:
138136
for regex in self.regex:
139137
if regex.findall(bytes(result.get_longname(), "utf8")):
140-
if not self.onlyfiles and result.is_directory():
141-
if not self.no_print_results:
142-
self.logger.highlight(f"//{self.smbconnection.getRemoteHost()}/{self.share}/{path}{result.get_longname()} [dir]")
143-
else:
144-
if not self.no_print_results:
145-
self.logger.highlight(
146-
"//{}/{}/{}{} [lastm:'{}' size:{}]".format(
147-
self.smbconnection.getRemoteHost(),
148-
self.share,
149-
path,
150-
result.get_longname(),
151-
"n\\a" if not self.get_lastm_time(result) else self.get_lastm_time(result),
152-
result.get_filesize(),
153-
)
138+
if not self.onlyfiles and result.is_directory() and not self.silent:
139+
self.logger.highlight(f"//{self.smbconnection.getRemoteHost()}/{self.share}/{path}{result.get_longname()} [dir]")
140+
elif not self.silent:
141+
self.logger.highlight(
142+
"//{}/{}/{}{} [lastm:'{}' size:{}]".format(
143+
self.smbconnection.getRemoteHost(),
144+
self.share,
145+
path,
146+
result.get_longname(),
147+
"n\\a" if not self.get_lastm_time(result) else self.get_lastm_time(result),
148+
result.get_filesize(),
154149
)
150+
)
155151
self.results.append(f"{path}{result.get_longname()}")
156152

157153
if self.content and not result.is_directory():
@@ -184,7 +180,7 @@ def search_content(self, path, result):
184180
if self.pattern:
185181
for pattern in self.pattern:
186182
if contents.lower().find(bytes(pattern.lower(), "utf8")) != -1:
187-
if not self.no_print_results:
183+
if not self.silent:
188184
self.logger.highlight(
189185
"//{}/{}/{}{} [lastm:'{}' size:{} offset:{} pattern:'{}']".format(
190186
self.smbconnection.getRemoteHost(),
@@ -201,7 +197,7 @@ def search_content(self, path, result):
201197
if self.regex:
202198
for regex in self.regex:
203199
if regex.findall(contents):
204-
if not self.no_print_results:
200+
if not self.silent:
205201
self.logger.highlight(
206202
"//{}/{}/{}{} [lastm:'{}' size:{} offset:{} regex:'{}']".format(
207203
self.smbconnection.getRemoteHost(),

0 commit comments

Comments
 (0)