swisskyrepo
/
NetExec
mirror of https://github.com/swisskyrepo/NetExec.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #220 from Pennyw0rth/marshall-proto-print-fix 

Fix: module names 8-10 chars being cut off
main
Alex 2024-03-22 01:23:24 +01:00 committed by GitHub
parent 0608628aff 590a4e2536
commit fb8c4bcdcd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
nxc/logger.py
View File

@ -16,13 +16,11 @@ class NXCAdapter(logging.LoggerAdapter):
logging.basicConfig( logging.basicConfig(
format="%(message)s", format="%(message)s",
datefmt="[%X]", datefmt="[%X]",
handlers=[ handlers=[RichHandler(
RichHandler( console=nxc_console,
console=nxc_console, rich_tracebacks=True,
rich_tracebacks=True, tracebacks_show_locals=False
tracebacks_show_locals=False, )],
)
],
) )
self.logger = logging.getLogger("nxc") self.logger = logging.getLogger("nxc")
self.extra = extra self.extra = extra
@ -40,30 +38,21 @@ class NXCAdapter(logging.LoggerAdapter):
if self.extra is None: if self.extra is None:
return f"{msg}", kwargs return f"{msg}", kwargs
if "module_name" in self.extra and len(self.extra["module_name"]) > 8: if "module_name" in self.extra and len(self.extra["module_name"]) > 11:
self.extra["module_name"] = self.extra["module_name"][:8] + "..." self.extra["module_name"] = self.extra["module_name"][:8] + "..."
# If the logger is being called when hooking the 'options' module function # If the logger is being called when hooking the 'options' module function
if len(self.extra) == 1 and ("module_name" in self.extra): if len(self.extra) == 1 and ("module_name" in self.extra):
return ( return (f"{colored(self.extra['module_name'], 'cyan', attrs=['bold']):<64} {msg}", kwargs)
f"{colored(self.extra['module_name'], 'cyan', attrs=['bold']):<64} {msg}",
kwargs,
)
# If the logger is being called from nxcServer # If the logger is being called from nxcServer
if len(self.extra) == 2 and ("module_name" in self.extra) and ("host" in self.extra): if len(self.extra) == 2 and ("module_name" in self.extra) and ("host" in self.extra):
return ( return (f"{colored(self.extra['module_name'], 'cyan', attrs=['bold']):<24} {self.extra['host']:<39} {msg}", kwargs)
f"{colored(self.extra['module_name'], 'cyan', attrs=['bold']):<24} {self.extra['host']:<39} {msg}",
kwargs,
)
# If the logger is being called from a protocol # If the logger is being called from a protocol
module_name = colored(self.extra["module_name"], "cyan", attrs=["bold"]) if "module_name" in self.extra else colored(self.extra["protocol"], "blue", attrs=["bold"]) module_name = colored(self.extra["module_name"], "cyan", attrs=["bold"]) if "module_name" in self.extra else colored(self.extra["protocol"], "blue", attrs=["bold"])
return ( return (f"{module_name:<24} {self.extra['host']:<15} {self.extra['port']:<6} {self.extra['hostname'] if self.extra['hostname'] else 'NONE':<16} {msg}", kwargs)
f"{module_name:<24} {self.extra['host']:<15} {self.extra['port']:<6} {self.extra['hostname'] if self.extra['hostname'] else 'NONE':<16} {msg}",
kwargs,
)
def display(self, msg, *args, **kwargs): def display(self, msg, *args, **kwargs):
"""Display text to console, formatted for nxc""" """Display text to console, formatted for nxc"""
@ -104,17 +93,7 @@ class NXCAdapter(logging.LoggerAdapter):
if len(self.logger.handlers): if len(self.logger.handlers):
try: try:
for handler in self.logger.handlers: for handler in self.logger.handlers:
handler.handle( handler.handle(LogRecord("nxc", 20, "", kwargs, msg=text, args=args, exc_info=None))
LogRecord(
"nxc",
20,
"",
kwargs,
msg=text,
args=args,
exc_info=None,
)
)
except Exception as e: except Exception as e:
self.logger.fail(f"Issue while trying to custom print handler: {e}") self.logger.fail(f"Issue while trying to custom print handler: {e}")
else: else: