Skip to content

Commit c6ffc93

Browse files
authored
Merge pull request #28 from jabra-/error-return-false
if a python module fails, 'False' will be returned
2 parents 6c80cf1 + 117656c commit c6ffc93

File tree

7 files changed

+33
-33
lines changed

7 files changed

+33
-33
lines changed

Bofbelt/bofbelt.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ def bofbelt_report( demonID, bof_output ):
716716
#print(json.dumps(report, indent=2))
717717
except Exception as e:
718718
demon.ConsoleWrite( demon.CONSOLE_ERROR, f"Failed to parse BOF data: {e}" )
719-
return True
719+
return False
720720

721721
# OS
722722

InvokeAssembly/invokeassembly.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def InvokeAssembly( demonID, *param ):
1717

1818
if len( param ) < 2:
1919
demon.ConsoleWrite(demon.CONSOLE_ERROR, "Not enough arguments")
20-
return
20+
return False
2121

2222
try:
2323
Assembly = open( param[ 0 ], 'rb' )
@@ -29,7 +29,7 @@ def InvokeAssembly( demonID, *param ):
2929

3030
except OSError:
3131
demon.ConsoleWrite( demon.CONSOLE_ERROR, "Failed to open assembly file: " + param[ 0 ] )
32-
return
32+
return False
3333

3434
arg = packer.getbuffer()
3535

Jump-exec/ScShell/scshell.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ def scshell( demonID, *params ):
1515

1616
if len(params) < 2:
1717
demon.ConsoleWrite( demon.CONSOLE_ERROR, "Not enough arguments" )
18-
return
18+
return False
1919
else:
2020
Host = params[ 0 ]
2121
SvcName = params[ 1 ]
2222
SvcPath = params[ 2 ]
2323

2424
if exists( SvcPath ) == False:
2525
demon.ConsoleWrite( demon.CONSOLE_ERROR, f"Service executable not found: {SvcPath}" )
26-
return
26+
return False
2727
else:
2828
SvcBinary = open( SvcPath, 'rb' ).read()
2929
if len(SvcBinary) == 0:
3030
demon.ConsoleWrite( demon.CONSOLE_ERROR, "Specified service executable is empty" )
31-
return
31+
return False
3232

3333
TaskID = demon.ConsoleWrite( demon.CONSOLE_TASK, f"Tasked demon to execute {SvcPath} on {Host} using scshell" )
3434

PowerPick/powerpick.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def PowerPick(demonID, *param):
1414

1515
if len( param ) < 1:
1616
demon.ConsoleWrite( demon.CONSOLE_ERROR, "Not enough arguments" )
17-
return
17+
return False
1818

1919
TaskID = demon.ConsoleWrite( demon.CONSOLE_TASK, "Tasked demon to execute unmanaged powershell commands" )
2020

SamDump/samdump.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def samdump(demonID, *params):
1919

2020
if num_params != 1:
2121
demon.ConsoleWrite( demon.CONSOLE_ERROR, "missing the path" )
22-
return True
22+
return False
2323

2424
path = params[ 0 ]
2525

mimidrv/mimidrv.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ def mimidrv( demonID, *params ):
1212

1313
if num_params < 1:
1414
demon.ConsoleWrite( demon.CONSOLE_ERROR, "Not enough parameters" )
15-
return True
15+
return False
1616
elif num_params == 1:
1717
pid = params[ 0 ]
1818
elif num_params > 1:
1919
demon.ConsoleWrite( demon.CONSOLE_ERROR, "Too many parameters" )
20-
return True
20+
return False
2121

2222
try:
2323
pid = int( pid )
2424
except Exception as e:
2525
demon.ConsoleWrite( demon.CONSOLE_ERROR, "Invalid PID" )
26-
return True
26+
return False
2727

2828
packer.adduint32(pid)
2929

nanorobeus/nanorobeus.py

+22-22
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def sessions( demonID, *param ):
5050

5151
if num_params > 2:
5252
demon.ConsoleWrite( demon.CONSOLE_ERROR, "Too many arguments" )
53-
return
53+
return False
5454
elif num_params == 2:
5555
arg1 = param[ 1 ]
5656
arg2 = param[ 2 ]
@@ -64,7 +64,7 @@ def sessions( demonID, *param ):
6464
arg1 = param[ 1 ]
6565
if arg1 != '/all':
6666
demon.ConsoleWrite( demon.CONSOLE_ERROR, f"Invalid first argument: {arg1}" )
67-
return
67+
return False
6868

6969
TaskID = demon.ConsoleWrite( demon.CONSOLE_TASK, f"Tasked demon to execute sessions" )
7070

@@ -94,21 +94,21 @@ def klist( demonID, *param ):
9494

9595
if num_params > 2:
9696
demon.ConsoleWrite( demon.CONSOLE_ERROR, "Too many arguments" )
97-
return
97+
return False
9898
elif num_params == 2:
9999
arg1 = param[ 1 ]
100100
arg2 = param[ 2 ]
101101
if arg1 != '/luid':
102102
demon.ConsoleWrite( demon.CONSOLE_ERROR, f"Invalid first argument: {arg1}" )
103-
return
103+
return False
104104
if not is_hex_number(arg2):
105105
demon.ConsoleWrite( demon.CONSOLE_ERROR, f"Invalid second argument: {arg2}" )
106-
return
106+
return False
107107
elif num_params == 1:
108108
arg1 = param[ 1 ]
109109
if arg1 != '/all':
110110
demon.ConsoleWrite( demon.CONSOLE_ERROR, f"Invalid first argument: {arg1}" )
111-
return
111+
return False
112112

113113
TaskID = demon.ConsoleWrite( demon.CONSOLE_TASK, f"Tasked demon to execute klist" )
114114

@@ -138,21 +138,21 @@ def dump( demonID, *param ):
138138

139139
if num_params > 2:
140140
demon.ConsoleWrite( demon.CONSOLE_ERROR, "Too many arguments" )
141-
return
141+
return False
142142
elif num_params == 2:
143143
arg1 = param[ 1 ]
144144
arg2 = param[ 2 ]
145145
if arg1 != '/luid':
146146
demon.ConsoleWrite( demon.CONSOLE_ERROR, f"Invalid first argument: {arg1}" )
147-
return
147+
return False
148148
if not is_hex_number(arg2):
149149
demon.ConsoleWrite( demon.CONSOLE_ERROR, f"Invalid second argument: {arg2}" )
150-
return
150+
return False
151151
elif num_params == 1:
152152
arg1 = param[ 1 ]
153153
if arg1 != '/all':
154154
demon.ConsoleWrite( demon.CONSOLE_ERROR, f"Invalid first argument: {arg1}" )
155-
return
155+
return False
156156

157157
TaskID = demon.ConsoleWrite( demon.CONSOLE_TASK, f"Tasked demon to execute dump" )
158158

@@ -182,30 +182,30 @@ def ptt( demonID, *param ):
182182

183183
if num_params > 3:
184184
demon.ConsoleWrite( demon.CONSOLE_ERROR, "Too many arguments" )
185-
return
185+
return False
186186
if num_params < 1:
187187
demon.ConsoleWrite( demon.CONSOLE_ERROR, "Not enough arguments" )
188-
return
188+
return False
189189

190190
arg1 = param[ 1 ]
191191
if not is_base64(arg1):
192192
demon.ConsoleWrite( demon.CONSOLE_ERROR, f"Invalid first argument: {arg1}" )
193-
return
193+
return False
194194

195195
if num_params == 2:
196196
arg2 = param[ 2 ]
197197
if arg2 != '/all':
198198
demon.ConsoleWrite( demon.CONSOLE_ERROR, f"Invalid second argument: {arg2}" )
199-
return
199+
return False
200200
elif num_params == 3:
201201
arg2 = param[ 2 ]
202202
arg3 = param[ 3 ]
203203
if arg2 != '/luid':
204204
demon.ConsoleWrite( demon.CONSOLE_ERROR, f"Invalid second argument: {arg2}" )
205-
return
205+
return False
206206
if not is_hex_number(arg3):
207207
demon.ConsoleWrite( demon.CONSOLE_ERROR, f"Invalid third argument: {arg3}" )
208-
return
208+
return False
209209

210210
TaskID = demon.ConsoleWrite( demon.CONSOLE_TASK, f"Tasked demon to execute ptt" )
211211

@@ -235,20 +235,20 @@ def purge( demonID, *param ):
235235

236236
if num_params > 2:
237237
demon.ConsoleWrite( demon.CONSOLE_ERROR, "Too many arguments" )
238-
return
238+
return False
239239
elif num_params == 2:
240240
arg1 = param[ 1 ]
241241
arg2 = param[ 2 ]
242242
if arg1 != '/luid':
243243
demon.ConsoleWrite( demon.CONSOLE_ERROR, f"Invalid first argument: {arg1}" )
244-
return
244+
return False
245245
if not is_hex_number(arg2):
246246
demon.ConsoleWrite( demon.CONSOLE_ERROR, f"Invalid second argument: {arg2}" )
247-
return
247+
return False
248248
elif num_params == 1:
249249
arg1 = param[ 1 ]
250250
demon.ConsoleWrite( demon.CONSOLE_ERROR, f"Invalid first argument: {arg1}" )
251-
return
251+
return False
252252

253253
TaskID = demon.ConsoleWrite( demon.CONSOLE_TASK, f"Tasked demon to execute purge" )
254254

@@ -278,7 +278,7 @@ def tgtdeleg( demonID, *param ):
278278

279279
if num_params != 1:
280280
demon.ConsoleWrite( demon.CONSOLE_ERROR, "One argument must be entered" )
281-
return
281+
return False
282282

283283
arg1 = param[ 1 ]
284284

@@ -310,7 +310,7 @@ def kerberoast( demonID, *param ):
310310

311311
if num_params != 1:
312312
demon.ConsoleWrite( demon.CONSOLE_ERROR, "One argument must be entered" )
313-
return
313+
return False
314314

315315
arg1 = param[ 0 ]
316316

0 commit comments

Comments
 (0)