Numerous ruff linter adjustments and fixes

Author: Mercury0

nxc/logger.py

@@ -175,7 +175,7 @@ def add_file_log(self, log_file=None):
         file_creation = False
 
         if not os.path.isfile(output_file):
-            open(output_file, "x")  # noqa: SIM115
+            open(output_file, "x")
             file_creation = True
 
         file_handler = RotatingFileHandler(output_file, maxBytes=100000, encoding="utf-8")

nxc/modules/daclread.py

@@ -231,7 +231,7 @@ def options(self, context, module_options):
             context.log.debug("There is a target specified!")
             if re.search(r"^(.+)\/([^\/]+)$", module_options["TARGET"]) is not None:
                 try:
-                    self.target_file = open(module_options["TARGET"])  # noqa: SIM115
+                    self.target_file = open(module_options["TARGET"])
                     self.target_sAMAccountName = None
                 except Exception:
                     context.log.fail("The file doesn't exist or cannot be openned.")

nxc/modules/handlekatz.py

@@ -126,8 +126,8 @@ def on_admin_login(self, context, connection):
             except Exception as e:
                 context.log.fail(f"[OPSEC] Error deleting lsass.dmp file on share {self.share}: {e}")
 
-            h_in = open(self.dir_result + machine_name, "rb")  # noqa: SIM115
-            h_out = open(self.dir_result + machine_name + ".decode", "wb")  # noqa: SIM115
+            h_in = open(self.dir_result + machine_name, "rb")
+            h_out = open(self.dir_result + machine_name + ".decode", "wb")
 
             bytes_in = bytearray(h_in.read())
             bytes_in_len = len(bytes_in)

nxc/modules/user-desc.py

@@ -94,7 +94,7 @@ def create_log_file(self, host, time):
         logfile = Path.home().joinpath(".nxc").joinpath("logs").joinpath(logfile)
 
         self.context.log.info(f"Creating log file '{logfile}'")
-        self.log_file = open(logfile, "w")  # noqa: SIM115
+        self.log_file = open(logfile, "w")
         self.append_to_log("User:", "Description:")
 
     def delete_log_file(self):

nxc/protocols/ftp.py

@@ -139,7 +139,7 @@ def get_file(self, filename):
             # Check if the file exists 
             self.conn.size(filename)
             # Attempt to download the file
-            self.conn.retrbinary(f"RETR {filename}", open(downloaded_file, "wb").write)  # noqa: SIM115
+            self.conn.retrbinary(f"RETR {filename}", open(downloaded_file, "wb").write)
         except error_perm as error_message:
             self.logger.fail(f"Failed to download the file. Response: ({error_message})")
             self.conn.close()
@@ -157,7 +157,7 @@ def get_file(self, filename):
     def put_file(self, local_file, remote_file):
         try:
             # Attempt to upload the file
-            self.conn.storbinary(f"STOR {remote_file}", open(local_file, "rb"))  # noqa: SIM115
+            self.conn.storbinary(f"STOR {remote_file}", open(local_file, "rb"))
         except error_perm as error_message:
             self.logger.fail(f"Failed to upload file. Response: ({error_message})")
             return False

nxc/protocols/nfs.py

@@ -562,13 +562,13 @@ def get_root_handles(self, mount_fh):
         # Format for the file id see: https://elixir.bootlin.com/linux/v6.13.4/source/include/linux/exportfs.h#L25
         fh = bytearray(mount_fh)
         if filesystem in [FileID.ext, FileID.unknown]:
-            root_handles.append(bytes(fh[:3] + b"\x02" + fh[4:4+fh_fsid_len] + b"\x02\x00\x00\x00" + b"\x00\x00\x00\x00" + b"\x02\x00\x00\x00"))
-            root_handles.append(bytes(fh[:3] + b"\x02" + fh[4:4+fh_fsid_len] + b"\x80\x00\x00\x00" + b"\x00\x00\x00\x00" + b"\x80\x00\x00\x00"))
+            root_handles.append(bytes(fh[:3] + b"\x02" + fh[4:4 + fh_fsid_len] + b"\x02\x00\x00\x00" + b"\x00\x00\x00\x00" + b"\x02\x00\x00\x00"))
+            root_handles.append(bytes(fh[:3] + b"\x02" + fh[4:4 + fh_fsid_len] + b"\x80\x00\x00\x00" + b"\x00\x00\x00\x00" + b"\x80\x00\x00\x00"))
         if filesystem in [FileID.btrfs, FileID.unknown]:
             # Iterate over btrfs subvolumes, use 16 as default similar to the guys from nfs-security-tooling
             for i in range(16):
                 subvolume = int.to_bytes(i) + b"\x01\x00\x00"
-                root_handles.append(bytes(fh[:3] + b"\x4d" + fh[4:4+fh_fsid_len] + b"\x00\x01\x00\x00" + b"\x00\x00\x00\x00" + subvolume + b"\x00\x00\x00\x00" + b"\x00\x00\x00\x00"))
+                root_handles.append(bytes(fh[:3] + b"\x4d" + fh[4:4 + fh_fsid_len] + b"\x00\x01\x00\x00" + b"\x00\x00\x00\x00" + subvolume + b"\x00\x00\x00\x00" + b"\x00\x00\x00\x00"))
 
         return root_handles
 

nxc/protocols/smb.py

@@ -132,7 +132,6 @@ def __init__(self, args, db, host):
         self.c_share_write_checked = False
         self.isdc = False
 
-
         connection.__init__(self, args, db, host)
 
     def proto_logger(self):
@@ -612,7 +611,6 @@ def create_conn_obj(self):
                 self.logger.debug("SMBv1 fallback disabled; not attempting SMBv1 connection.")
                 return False
 
-
     def check_if_admin(self):
         try:
             if self.password is None and not self.nthash:
@@ -1205,7 +1203,6 @@ def shares(self):
 
         return permissions
 
-
     def dir(self):
         search_path = ntpath.join(self.args.dir, "*")
         try:
@@ -1746,7 +1743,7 @@ def dpapi(self):
 
         if self.args.pvk is not None:
             try:
-                self.pvkbytes = open(self.args.pvk, "rb").read()  # noqa: SIM115
+                self.pvkbytes = open(self.args.pvk, "rb").read()
                 self.logger.success(f"Loading domain backupkey from {self.args.pvk}")
             except Exception as e:
                 self.logger.fail(str(e))
@@ -1767,7 +1764,7 @@ def dpapi(self):
             use_kcache=self.use_kcache,
         )
 
-        self.output_file = open(self.output_file_template.format(output_folder="dpapi"), "w", encoding="utf-8")  # noqa: SIM115
+        self.output_file = open(self.output_file_template.format(output_folder="dpapi"), "w", encoding="utf-8")
 
         conn = upgrade_to_dploot_connection(connection=self.conn, target=target)
         if conn is None: