print to display in helpers/modules, restored version print in cli

even6_parser, pfx, get-network
Database-related modules left alone

Author: danwroy

build_collector.py

@@ -7,28 +7,27 @@
 from pathlib import Path
 
 from shiv.bootstrap import Environment
+
 from shiv.builder import create_archive
 from shiv.cli import __version__ as VERSION
 
-from nxc.logger import nxc_logger
-
 
 def build_nxc():
-    nxc_logger.print_msg("Building nxc")
+    print("Building nxc")
     try:
         shutil.rmtree("bin")
         shutil.rmtree("build")
     except FileNotFoundError:
         pass
     except Exception as e:
-        nxc_logger.print_msg(f"Exception while removing bin & build: {e}")
+        print(f"Exception while removing bin & build: {e}")
 
     try:
         os.mkdir("build")
         os.mkdir("bin")
         shutil.copytree("nxc", "build/nxc")
     except Exception as e:
-        nxc_logger.print_msg(f"Exception while creating bin and build directories: {e}")
+        print(f"Exception while creating bin and build directories: {e}")
         return
 
     subprocess.run(
@@ -66,7 +65,7 @@ def build_nxc():
 
 
 def build_nxcdb():
-    nxc_logger.print_msg("building nxcdb")
+    print("building nxcdb")
     env = Environment(
         built_at=datetime.utcfromtimestamp(int(time.time())).strftime("%Y-%m-%d %H:%M:%S"),
         entry_point="nxc.nxcdb:main",

nxc/cli.py

@@ -125,7 +125,7 @@ def gen_cli_args():
         sys.exit(1)
 
     if args.version:
-        nxc_logger.display(f"{VERSION} - {CODENAME} - {COMMIT} - {DISTANCE}")
+        print(f"{VERSION} - {CODENAME} - {COMMIT} - {DISTANCE}")
         sys.exit(1)
 
     # Multiply output_tries by 10 to enable more fine granural control, see exec methods

nxc/database.py

@@ -27,7 +27,7 @@ def open_config(config_path):
         config = configparser.ConfigParser()
         config.read(config_path)
     except Exception as e:
-        nxc_logger.display(f"[-] Error reading nxc.conf: {e}")
+        print(f"[-] Error reading nxc.conf: {e}")
         sys.exit(1)
     return config
 
@@ -40,7 +40,7 @@ def set_workspace(config_path, workspace_name):
     config = open_config(config_path)
     config.set("nxc", "workspace", workspace_name)
     write_configfile(config, config_path)
-    nxc_logger.display(f"[*] Workspace set to {workspace_name}")
+    print(f"[*] Workspace set to {workspace_name}")
 
 
 def get_db(config):
@@ -63,9 +63,7 @@ def init_protocol_dbs(workspace_name, p_loader=None):
         proto_db_path = path_join(WORKSPACE_DIR, workspace_name, f"{protocol}.db")
 
         if not exists(proto_db_path):
-            nxc_logger.display(
-                f"[*] Initializing {protocol.upper()} protocol database"
-            )
+            print(f"[*] Initializing {protocol.upper()} protocol database")
             conn = connect(proto_db_path)
             c = conn.cursor()
 
@@ -93,17 +91,17 @@ def create_workspace(workspace_name, p_loader=None):
         None
     """
     if exists(path_join(WORKSPACE_DIR, workspace_name)):
-        nxc_logger.display(f"[-] Workspace {workspace_name} already exists")
+        print(f"[-] Workspace {workspace_name} already exists")
     else:
-        nxc_logger.display(f"[*] Creating {workspace_name} workspace")
+        print(f"[*] Creating {workspace_name} workspace")
         mkdir(path_join(WORKSPACE_DIR, workspace_name))
 
     init_protocol_dbs(workspace_name, p_loader)
 
 
 def delete_workspace(workspace_name):
     shutil.rmtree(path_join(WORKSPACE_DIR, workspace_name))
-    nxc_logger.display(f"[*] Workspace {workspace_name} deleted")
+    print(f"[*] Workspace {workspace_name} deleted")
 
 
 def initialize_db():

nxc/helpers/even6_parser.py

@@ -4,6 +4,7 @@
 import uuid
 
 from datetime import datetime
+from nxc.logger import nxc_logger
 
 
 class Substitution:
@@ -45,7 +46,7 @@ def xml(self, template=None):
         elif self._type == 0xf:
             return str(uuid.UUID(bytes_le=value.data))
         else:
-            print("Unknown value type", hex(value.type))
+            nxc_logger.display(f"Unknown value type {hex(value.type)}")
 
 
 class Value:
@@ -70,7 +71,7 @@ def __init__(self, buf, offset):
         elif next_token[0] == 0x0e:
             self._value = Substitution(buf, offset + 1 + self._name.length)
         else:
-            print("Unknown attribute next_token", hex(next_token[0]), hex(offset + 1 + self._name.length))
+            nxc_logger.display(f"Unknown attribute next_token {hex(next_token[0])} {hex(offset + 1 + self._name.length)}")
 
         self.length = 1 + self._name.length + self._value.length
 
@@ -123,7 +124,7 @@ def __init__(self, buf, offset):
                     elif next_token == 0x0e or next_token == 0x0d:
                         element = Substitution(buf, ofs)
                     else:
-                        print("Unknown intern next_token", hex(next_token), hex(ofs))
+                        nxc_logger.display(f"Unknown intern next_token {hex(next_token)} {hex(ofs)}")
                         break
 
                     self._children.append(element)
@@ -135,7 +136,7 @@ def __init__(self, buf, offset):
                 ofs += 1
                 break
             else:
-                print("Unknown element next_token", hex(next_token), hex(ofs))
+                nxc_logger.display(f"Unknown element next_token {hex(next_token)} {hex(ofs)}")
                 break
 
         self.length = ofs - offset
@@ -181,7 +182,7 @@ def __init__(self, buf, offset):
 
             self.length = 22 + self._xml.length + 5 + num_values * 4 + values_length
         else:
-            print("Unknown template token", hex(next_token))
+            nxc_logger.display(f"Unknown template token {hex(next_token)}")
 
     def xml(self, template=None):
         return self._xml.xml(self)
@@ -196,7 +197,7 @@ def __init__(self, buf, offset):
         elif next_token == 0x01 or next_token == 0x41:
             self._element = Element(buf, offset + 4)
         else:
-            print("Unknown binxml token", hex(next_token))
+            nxc_logger.display(f"Unknown binxml token {hex(next_token)}")
 
         self.length = 4 + self._element.length
 

nxc/helpers/pfx.py

@@ -129,8 +129,8 @@ def sign_authpack(self, data, wrap_signed=False):
     def setup(self, dh_params=None):
         self.issuer = self.certificate.issuer.native["common_name"]
         if dh_params is None:
-            print("Generating DH params...")
-            print("DH params generated.")
+            nxc_logger.display("Generating DH params...")
+            nxc_logger.display("DH params generated.")
         else:
             if isinstance(dh_params, dict):
                 self.diffie = DirtyDH.from_dict(dh_params)

nxc/modules/get-network.py

@@ -11,6 +11,7 @@
 from ldap3 import LEVEL
 from os.path import expanduser
 from nxc.helpers.misc import CATEGORY
+from nxc.logger import nxc_logger
 from nxc.paths import NXC_PATH
 from nxc.parsers.ldap_results import parse_result_attributes
 
@@ -83,12 +84,12 @@ def options(self, context, module_options):
             if module_options["ALL"].lower() == "true" or module_options["ALL"] == "1":
                 self.showall = True
             else:
-                print("Could not parse ALL option.")
+                nxc_logger.display("Could not parse ALL option.")
         if module_options and "ONLY_HOSTS" in module_options:
             if module_options["ONLY_HOSTS"].lower() == "true" or module_options["ONLY_HOSTS"] == "1":
                 self.showhosts = True
             else:
-                print("Could not parse ONLY_HOSTS option.")
+                nxc_logger.display("Could not parse ONLY_HOSTS option.")
 
     def on_login(self, context, connection):
         zone = ldap2domain(connection.baseDN)