admin/SuperMega
1
0
Fork 0
mirror of https://github.com/dobin/SuperMega synced 2026-06-03 01:27:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: make string a bit nicer

Browse Source
This commit is contained in:
Dobin
2024-03-28 20:50:57 +00:00
parent ed9647920b
commit 32f89a1b20
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
helper.py
+24 -12
View File
@@ -50,33 +50,45 @@ def run_process_checkret(args, check=True):
logger.warn(f"An error occurred: {e}") logger.warn(f"An error occurred: {e}")
# Handle other exceptions # Handle other exceptions
stdout_s = ""
stdout_b = b""
if ret.stdout != None:
stdout_b = ret.stdout
stdout_s = ret.stdout.decode('utf-8')
stderr_s = ""
stderr_b = b""
if ret.stderr != None:
stderr_b = ret.stderr
stderr_s = ret.stderr.decode('utf-8')
# write directly to logs/ dir
with open(f"{logs_dir}/cmdoutput.log", "ab") as f: with open(f"{logs_dir}/cmdoutput.log", "ab") as f:
cmd = "------------------------------------\n" cmd = "------------------------------------\n"
cmd += "--- " + " ".join(args) + "\n" cmd += "--- " + " ".join(args) + "\n"
f.write(cmd.encode('utf-8')) f.write(cmd.encode('utf-8'))
if ret.stdout != None: observer.add_cmd_output(stdout_s)
observer.add_cmd_output(ret.stdout.decode('utf-8')) f.write(stdout_b)
f.write(ret.stdout) observer.add_cmd_output(stderr_s)
if ret.stderr != None: f.write(stderr_b)
observer.add_cmd_output(ret.stderr.decode('utf-8'))
f.write(ret.stderr)
# check return code (optional)
if ret.returncode != 0 and check: if ret.returncode != 0 and check:
logger.info("----! FAILED Command: {}".format(" ".join(args))) logger.info("----! FAILED Command: {}".format(" ".join(args)))
if ret.stdout != None: if ret.stdout != None:
observer.add_cmd_output(ret.stdout.decode('utf-8')) observer.add_cmd_output(stdout_s)
logger.info(ret.stdout.decode('utf-8')) logger.info(stdout_s)
if ret.stderr != None: if ret.stderr != None:
observer.add_cmd_output(ret.stderr.decode('utf-8')) observer.add_cmd_output(stderr_s)
logger.info(ret.stderr.decode('utf-8')) logger.info(stderr_s)
raise Exception("Command failed: " + " ".join(args)) raise Exception("Command failed: " + " ".join(args))
# debug: show command output
if config.ShowCommandOutput: if config.ShowCommandOutput:
logger.info("> " + " ".join(args)) logger.info("> " + " ".join(args))
if ret.stdout != None: if ret.stdout != None:
logger.info(ret.stdout.decode('utf-8')) logger.info(stdout_s)
if ret.stderr != None: if ret.stderr != None:
logger.info(ret.stderr.decode('utf-8')) logger.info(stderr_s)
def try_start_shellcode(shc_file): def try_start_shellcode(shc_file):