Merge pull request #4 from L1ghtn1ng/dev

few tidy ups
bats3c · Jan 19, 2021 · 2cfd45b · 2cfd45b
2 parents e506720 + e744979
commit 2cfd45b
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 15 deletions.
diff --git a/lib/commands/cat.py b/lib/commands/cat.py
@@ -17,15 +17,16 @@
 ERROR = False
 error_list = ""
 
-# let argparse error and exit nice
+
 def error(message):
     global ERROR, error_list
     ERROR = True
     error_list += f"\033[0;31m{message}\033[0m\n"
 
 
 def exit(status=0, message=None): 
-    if message != None: print(message)
+    if message != None:
+        print(message)
     return
 
 
@@ -53,8 +54,8 @@ def main(shad0w, args):
 
     # init the parser
     parse = argparse.ArgumentParser(prog='cat',
-                                formatter_class=argparse.RawDescriptionHelpFormatter,
-                                epilog=usage_examples)
+                                    formatter_class=argparse.RawDescriptionHelpFormatter,
+                                    epilog=usage_examples)
 
     # keep it behaving nice
     parse.exit = exit

diff --git a/lib/commands/elevate.py b/lib/commands/elevate.py
@@ -172,3 +172,4 @@ def main(shad0w, args):
 
     if RAN_COMMAND == False:
         parse.print_help()
+        return
diff --git a/lib/commands/help.py b/lib/commands/help.py
@@ -25,7 +25,8 @@ def usage(shad0w):
 
     for num, command in enumerate(cmd.Shad0wLexer.commands):
         mod = importlib.import_module("lib.commands." + command)
-        if shad0w.debugv: importlib.reload(mod)
+        if shad0w.debugv:
+            importlib.reload(mod)
 
         try:
             description = mod.__description__

diff --git a/lib/commands/ls.py b/lib/commands/ls.py
@@ -9,7 +9,7 @@
 __author__ = "@_batsec_"
 __type__ = "file system"
 
-EXEC_ID   = 0x4000
+EXEC_ID = 0x4000
 OPCODE_LS = 0x1000
 
 ERROR = False
@@ -23,7 +23,8 @@ def error(message):
 
 
 def exit(status=0, message=None): 
-    if message != None: print(message)
+    if message is not None:
+        print(message)
     return
 
 
@@ -97,7 +98,7 @@ def main(shad0w, args):
     dir = get_list_directory(raw_args, args)
 
     # make the json
-    data = {"op" : OPCODE_LS, "args": dir}
+    data = {"op": OPCODE_LS, "args": dir}
     data = json.dumps(data)
 
     # set a task for the current beacon to do

diff --git a/lib/commands/psh.py b/lib/commands/psh.py
@@ -36,7 +36,8 @@ def error(message):
 
 
 def exit(status=0, message=None):
-    if message != None: print(message)
+    if message is not None:
+        print(message)
     return
 
 

diff --git a/lib/commands/pwd.py b/lib/commands/pwd.py
@@ -25,7 +25,7 @@ def main(shad0w, args):
         return
 
     # make the json
-    data = {"op" : OPCODE_PWD, "args": "null"}
+    data = {"op": OPCODE_PWD, "args": "null"}
     data = json.dumps(data)
 
     # set a task for the current beacon to do

diff --git a/lib/commands/rm.py b/lib/commands/rm.py
@@ -9,7 +9,7 @@
 __author__ = "@_batsec_"
 __type__ = "file system"
 
-EXEC_ID   = 0x4000
+EXEC_ID = 0x4000
 OPCODE_RM = 0x4000
 
 ERROR = False
@@ -23,7 +23,8 @@ def error(message):
 
 
 def exit(status=0, message=None): 
-    if message != None: print(message)
+    if message is not None:
+        print(message)
     return
 
 
@@ -75,7 +76,7 @@ def main(shad0w, args):
     del_file = ' '.join(args.name).replace('\\', "\\\\").replace('"', '')
 
     # make the json
-    data = {"op" : OPCODE_RM, "args": del_file}
+    data = {"op": OPCODE_RM, "args": del_file}
     data = json.dumps(data)
 
     # set a task for the current beacon to do

diff --git a/lib/commands/rubeus.py b/lib/commands/rubeus.py
@@ -52,8 +52,8 @@ def run(self, shad0w):
 
 
 def rubeus_callback(shad0w, data):
-        print(data)
-        return ""
+    print(data)
+    return ""
 
 
 def main(shad0w, args):