ruff: auto-run flake8-implicit-str-concat (ISC)

nxc/modules/masky.py

@@ -114,7 +114,7 @@ class NXCModule:
 
         if not tracker.files_cleaning_success:
             context.log.fail("Fail to clean files related to Masky")
-            context.log.fail(f"Please remove the files named '{tracker.agent_filename}', '{tracker.error_filename}', " f"'{tracker.output_filename}' & '{tracker.args_filename}' within the folder '\\Windows\\Temp\\'")
+            context.log.fail(f"Please remove the files named '{tracker.agent_filename}', '{tracker.error_filename}', '{tracker.output_filename}' & '{tracker.args_filename}' within the folder '\\Windows\\Temp\\'")
             ret = False
 
         if not tracker.svc_cleaning_success:

nxc/modules/mssql_priv.py

@@ -132,7 +132,7 @@ class NXCModule:
             return initial_user
         for grantor in user.grantors:
             if grantor.is_sysadmin:
-                self.context.log.success(f"{user.username} can impersonate: " f"{grantor.username} (sysadmin)")
+                self.context.log.success(f"{user.username} can impersonate: {grantor.username} (sysadmin)")
                 return grantor
             elif grantor.dbowner:
                 self.context.log.success(f"{user.username} can impersonate: {grantor.username} (which can privesc via dbowner)")

nxc/modules/ntdsutil.py

@@ -162,7 +162,7 @@ class NXCModule:
         try:
             context.log.success("Dumping the NTDS, this could take a while so go grab a redbull...")
             NTDS.dump()
-            context.log.success(f"Dumped {highlight(add_ntds_hash.ntds_hashes)} NTDS hashes to {connection.output_filename}.ntds " f"of which {highlight(add_ntds_hash.added_to_db)} were added to the database")
+            context.log.success(f"Dumped {highlight(add_ntds_hash.ntds_hashes)} NTDS hashes to {connection.output_filename}.ntds of which {highlight(add_ntds_hash.added_to_db)} were added to the database")
 
             context.log.display("To extract only enabled accounts from the output file, run the following command: ")
             context.log.display(f"grep -iv disabled {connection.output_filename}.ntds | cut -d ':' -f1")
@@ -173,6 +173,6 @@ class NXCModule:
 
         if self.no_delete:
             context.log.display(f"Raw NTDS dump copied to {self.dir_result}, parse it with:")
-            context.log.display(f"secretsdump.py -system {self.dir_result}/registry/SYSTEM " f"-security {self.dir_result}/registry/SECURITY " f'-ntds "{self.dir_result}/Active Directory/ntds.dit" LOCAL')
+            context.log.display(f"secretsdump.py -system {self.dir_result}/registry/SYSTEM -security {self.dir_result}/registry/SECURITY " f'-ntds "{self.dir_result}/Active Directory/ntds.dit" LOCAL')
         else:
             shutil.rmtree(self.dir_result)

nxc/modules/scan-network.py

@@ -39,7 +39,7 @@ def get_dns_resolver(server, context):
         socket.inet_aton(server)
         dnsresolver.nameservers = [server]
     except OSError:
-        context.info("Using System DNS to resolve unknown entries. Make sure resolving your" " target domain works here or specify an IP as target host to use that" " server for queries")
+        context.info("Using System DNS to resolve unknown entries. Make sure resolving your target domain works here or specify an IP as target host to use that server for queries")
     return dnsresolver
 
 
@@ -129,7 +129,7 @@ class NXCModule:
             )
         except ldap.LDAPSearchError as e:
             if e.getErrorString().find("sizeLimitExceeded") >= 0:
-                context.log.debug("sizeLimitExceeded exception caught, giving up and processing the" " data received")
+                context.log.debug("sizeLimitExceeded exception caught, giving up and processing the data received")
                 # We reached the sizeLimit, process the answers we have already and that's it. Until we implement
                 # paged queries
                 list_sites = e.getAnswers()

nxc/modules/spooler.py

@@ -62,7 +62,7 @@ class NXCModule:
             context.log.critical(error_text)
 
             if RPC_PROXY_INVALID_RPC_PORT_ERR in error_text or RPC_PROXY_RPC_OUT_DATA_404_ERR in error_text or RPC_PROXY_CONN_A1_404_ERR in error_text or RPC_PROXY_CONN_A1_0X6BA_ERR in error_text:
-                context.log.critical("This usually means the target does not allow " "to connect to its epmapper using RpcProxy.")
+                context.log.critical("This usually means the target does not allow to connect to its epmapper using RpcProxy.")
                 return
 
         # Display results.

nxc/modules/zerologon.py

@@ -60,7 +60,7 @@ class NXCModule:
             else:
                 self.context.log.highlight("Attack failed. Target is probably patched.")
         except DCERPCException:
-            self.context.log.fail("Error while connecting to host: DCERPCException, " "which means this is probably not a DC!")
+            self.context.log.fail("Error while connecting to host: DCERPCException, which means this is probably not a DC!")
 
 
 def fail(msg):

nxc/protocols/ldap.py

@@ -855,7 +855,7 @@ class ldap(connection):
         if self.password == "" and self.nthash == "" and self.kerberos is False:
             return False
         # Building the search filter
-        search_filter = "(&(UserAccountControl:1.2.840.113556.1.4.803:=%d)" "(!(UserAccountControl:1.2.840.113556.1.4.803:=%d))(!(objectCategory=computer)))" % (UF_DONT_REQUIRE_PREAUTH, UF_ACCOUNTDISABLE)
+        search_filter = "(&(UserAccountControl:1.2.840.113556.1.4.803:=%d)(!(UserAccountControl:1.2.840.113556.1.4.803:=%d))(!(objectCategory=computer)))" % (UF_DONT_REQUIRE_PREAUTH, UF_ACCOUNTDISABLE)
         attributes = [
             "sAMAccountName",
             "pwdLastSet",
@@ -928,7 +928,7 @@ class ldap(connection):
 
     def kerberoasting(self):
         # Building the search filter
-        searchFilter = "(&(servicePrincipalName=*)(UserAccountControl:1.2.840.113556.1.4.803:=512)" "(!(UserAccountControl:1.2.840.113556.1.4.803:=2))(!(objectCategory=computer)))"
+        searchFilter = "(&(servicePrincipalName=*)(UserAccountControl:1.2.840.113556.1.4.803:=512)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))(!(objectCategory=computer)))"
         attributes = [
             "servicePrincipalName",
             "sAMAccountName",

nxc/protocols/ldap/kerberos.py

@@ -101,7 +101,7 @@ class KerberosAttacks:
                 hexlify(decoded_tgs["ticket"]["enc-part"]["cipher"][16:].asOctets()).decode(),
             )
         else:
-            nxc_logger.error("Skipping" f" {decoded_tgs['ticket']['sname']['name-string'][0]}/{decoded_tgs['ticket']['sname']['name-string'][1]} due" f" to incompatible e-type {decoded_tgs['ticket']['enc-part']['etype']:d}")
+            nxc_logger.error("Skipping" f" {decoded_tgs['ticket']['sname']['name-string'][0]}/{decoded_tgs['ticket']['sname']['name-string'][1]} due to incompatible e-type {decoded_tgs['ticket']['enc-part']['etype']:d}")
 
         return entry
 

nxc/protocols/rdp.py

@@ -108,7 +108,7 @@ class rdp(connection):
         if self.domain is None:
             self.logger.display("Probably old, doesn't not support HYBRID or HYBRID_EX" f" ({nla})")
         else:
-            self.logger.display(f"{self.server_os} (name:{self.hostname}) (domain:{self.domain})" f" ({nla})")
+            self.logger.display(f"{self.server_os} (name:{self.hostname}) (domain:{self.domain}) ({nla})")
         return True
 
     def create_conn_obj(self):

nxc/protocols/smb/db_navigator.py

@@ -700,7 +700,7 @@ class navigator(DatabaseNavigator):
         print_help(help_string)
 
     def do_clear_database(self, line):
-        if input("This will destroy all data in the current database, are you SURE you" " want to run this? (y/n): ") == "y":
+        if input("This will destroy all data in the current database, are you SURE you want to run this? (y/n): ") == "y":
             self.db.clear_database()
 
     def help_clear_database(self):

nxc/protocols/smb/proto_args.py

@@ -63,7 +63,7 @@ def proto_args(parser, std_parser, module_parser):
     cgroup.add_argument("--exec-method", choices={"wmiexec", "mmcexec", "smbexec", "atexec"}, default=None, help="method to execute the command. Ignored if in MSSQL mode (default: wmiexec)")
     cgroup.add_argument("--dcom-timeout", help="DCOM connection timeout, default is 5 secondes", type=int, default=5)
     cgroup.add_argument("--get-output-tries", help="Number of times atexec/smbexec/mmcexec tries to get results, default is 5", type=int, default=5)
-    cgroup.add_argument("--codec", default="utf-8", help="Set encoding used (codec) from the target's output (default " '"utf-8"). If errors are detected, run chcp.com at the target, ' "map the result with " "https://docs.python.org/3/library/codecs.html#standard-encodings and then execute " "again with --codec and the corresponding codec")
+    cgroup.add_argument("--codec", default="utf-8", help="Set encoding used (codec) from the target's output (default " '"utf-8"). If errors are detected, run chcp.com at the target, ' "map the result with https://docs.python.org/3/library/codecs.html#standard-encodings and then execute again with --codec and the corresponding codec")
     cgroup.add_argument("--force-ps32", action="store_true", help="force the PowerShell command to run in a 32-bit process")
     cgroup.add_argument("--no-output", action="store_true", help="do not retrieve command output")
     cegroup = cgroup.add_mutually_exclusive_group()

nxc/protocols/ssh/db_navigator.py

@@ -286,7 +286,7 @@ class navigator(DatabaseNavigator):
         print_help(help_string)
 
     def do_clear_database(self, line):
-        if input("This will destroy all data in the current database, are you SURE you" " want to run this? (y/n): ") == "y":
+        if input("This will destroy all data in the current database, are you SURE you want to run this? (y/n): ") == "y":
             self.db.clear_database()
 
     def help_clear_database(self):

nxc/protocols/winrm.py

@@ -153,7 +153,7 @@ class winrm(connection):
                 elif "ms-mcs-admpwd" in values:
                     msMCSAdmPwd = str(values["ms-mcs-admpwd"])
                 else:
-                    self.logger.fail("No result found with attribute ms-MCS-AdmPwd or" " msLAPS-Password")
+                    self.logger.fail("No result found with attribute ms-MCS-AdmPwd or msLAPS-Password")
             self.logger.debug(f"Host: {sAMAccountName:<20} Password: {msMCSAdmPwd} {self.hostname}")
         else:
             self.logger.fail(f"msMCSAdmPwd or msLAPS-Password is empty or account cannot read LAPS property for {self.hostname}")
@@ -313,7 +313,7 @@ class winrm(connection):
         try:
             r = self.conn.execute_cmd(self.args.execute, encoding=self.args.codec)
         except Exception:
-            self.logger.info("Cannot execute command, probably because user is not local admin, but" " powershell command should be ok!")
+            self.logger.info("Cannot execute command, probably because user is not local admin, but powershell command should be ok!")
             r = self.conn.execute_ps(self.args.execute)
         self.logger.success("Executed command")
         buf = StringIO(r[0]).readlines()
@@ -328,7 +328,7 @@ class winrm(connection):
             self.logger.highlight(line.strip())
 
     def sam(self):
-        self.conn.execute_cmd("reg save HKLM\SAM C:\\windows\\temp\\SAM && reg save HKLM\SYSTEM" " C:\\windows\\temp\\SYSTEM")
+        self.conn.execute_cmd("reg save HKLM\SAM C:\\windows\\temp\\SAM && reg save HKLM\SYSTEM C:\\windows\\temp\\SYSTEM")
         self.conn.fetch("C:\\windows\\temp\\SAM", self.output_filename + ".sam")
         self.conn.fetch("C:\\windows\\temp\\SYSTEM", self.output_filename + ".system")
         self.conn.execute_cmd("del C:\\windows\\temp\\SAM && del C:\\windows\\temp\\SYSTEM")
@@ -345,7 +345,7 @@ class winrm(connection):
         SAM.export(f"{self.output_filename}.sam")
 
     def lsa(self):
-        self.conn.execute_cmd("reg save HKLM\SECURITY C:\\windows\\temp\\SECURITY && reg save HKLM\SYSTEM" " C:\\windows\\temp\\SYSTEM")
+        self.conn.execute_cmd("reg save HKLM\SECURITY C:\\windows\\temp\\SECURITY && reg save HKLM\SYSTEM C:\\windows\\temp\\SYSTEM")
         self.conn.fetch("C:\\windows\\temp\\SECURITY", f"{self.output_filename}.security")
         self.conn.fetch("C:\\windows\\temp\\SYSTEM", f"{self.output_filename}.system")
         self.conn.execute_cmd("del C:\\windows\\temp\\SYSTEM && del C:\\windows\\temp\\SECURITY")

nxc/protocols/winrm/proto_args.py

@@ -22,7 +22,7 @@ def proto_args(parser, std_parser, module_parser):
     cegroup.add_argument("--lsa", action="store_true", help="dump LSA secrets from target systems")
 
     cgroup = winrm_parser.add_argument_group("Command Execution", "Options for executing commands")
-    cgroup.add_argument("--codec", default="utf-8", help="Set encoding used (codec) from the target's output (default " '"utf-8"). If errors are detected, run chcp.com at the target, ' "map the result with " "https://docs.python.org/3/library/codecs.html#standard-encodings and then execute " "again with --codec and the corresponding codec")
+    cgroup.add_argument("--codec", default="utf-8", help="Set encoding used (codec) from the target's output (default " '"utf-8"). If errors are detected, run chcp.com at the target, ' "map the result with https://docs.python.org/3/library/codecs.html#standard-encodings and then execute again with --codec and the corresponding codec")
     cgroup.add_argument("--no-output", action="store_true", help="do not retrieve command output")
     cgroup.add_argument("-x", metavar="COMMAND", dest="execute", help="execute the specified command")
     cgroup.add_argument("-X", metavar="PS_COMMAND", dest="ps_execute", help="execute the specified PowerShell command")

nxc/protocols/wmi/proto_args.py

@@ -16,9 +16,9 @@ def proto_args(parser, std_parser, module_parser):
     cgroup = wmi_parser.add_argument_group("Command Execution", "Options for executing commands")
     cgroup.add_argument("--no-output", action="store_true", help="do not retrieve command output")
     cgroup.add_argument("-x", metavar="COMMAND", dest="execute", type=str, help="Creates a new cmd process and executes the specified command with output")
-    cgroup.add_argument("--exec-method", choices={"wmiexec", "wmiexec-event"}, default="wmiexec", help="method to execute the command. (default: wmiexec). " "[wmiexec (win32_process + StdRegProv)]: get command results over registry instead of using smb connection. " "[wmiexec-event (T1546.003)]: this method is not very stable, highly recommend use this method in single host, " "using on multiple hosts may crash (just try again if it crashed).")
+    cgroup.add_argument("--exec-method", choices={"wmiexec", "wmiexec-event"}, default="wmiexec", help="method to execute the command. (default: wmiexec). [wmiexec (win32_process + StdRegProv)]: get command results over registry instead of using smb connection. [wmiexec-event (T1546.003)]: this method is not very stable, highly recommend use this method in single host, using on multiple hosts may crash (just try again if it crashed).")
     cgroup.add_argument("--exec-timeout", default=5, metavar="exec_timeout", dest="exec_timeout", type=int, help="Set timeout (in seconds) when executing a command, minimum 5 seconds is recommended. Default: %(default)s")
-    cgroup.add_argument("--codec", default="utf-8", help="Set encoding used (codec) from the target's output (default " '"utf-8"). If errors are detected, run chcp.com at the target, ' "map the result with " "https://docs.python.org/3/library/codecs.html#standard-encodings and then execute " "again with --codec and the corresponding codec")
+    cgroup.add_argument("--codec", default="utf-8", help="Set encoding used (codec) from the target's output (default " '"utf-8"). If errors are detected, run chcp.com at the target, ' "map the result with https://docs.python.org/3/library/codecs.html#standard-encodings and then execute again with --codec and the corresponding codec")
     return parser
 
 

pyproject.toml

@@ -80,7 +80,7 @@ build-backend = "poetry.core.masonry.api"
 # Ruff doesn't enable pycodestyle warnings (`W`) or
 # McCabe complexity (`C901`) by default.
 # Other options: pep8-naming (N), flake8-annotations (ANN), flake8-blind-except (BLE), flake8-commas (COM)
-select = ["E", "F", "D", "UP", "YTT", "ASYNC", "B", "A", "C4"]
+select = ["E", "F", "D", "UP", "YTT", "ASYNC", "B", "A", "C4", "ISC"]
 ignore = [ "E501", "F405", "F841", "D100", "D101", "D102", "D103", "D104", "D105", "D106", "D107", "D203", "D204", "D205", "D212", "D213", "D400", "D401", "D415", "D417", "D419"]
 
 # Allow autofix for all enabled rules (when `--fix`) is provided.