Merge branch 'main' into feat-lsassy

Author: NeffIsBack

README.md

@@ -63,3 +63,5 @@ Awesome code contributors of NetExec:
 [![](https://github.com/NeffIsBack.png?size=50)](https://github.com/NeffIsBack)
 [![](https://github.com/Hackndo.png?size=50)](https://github.com/Hackndo)
 [![](https://github.com/XiaoliChan.png?size=50)](https://github.com/XiaoliChan)
+[![](https://github.com/termanix.png?size=50)](https://github.com/termanix)
+[![](https://github.com/Dfte.png?size=50)](https://github.com/Dfte)

nxc/cli.py

@@ -60,7 +60,7 @@ def gen_cli_args():
 
     The network execution tool
     Maintained as an open source project by @NeffIsBack, @MJHallenbeck, @_zblurx
-    
+
     For documentation and usage examples, visit: https://www.netexec.wiki/
 
     {highlight('Version', 'red')} : {highlight(VERSION)}

nxc/database.py

@@ -110,7 +110,7 @@ def initialize_db():
 
     # Even if the default workspace exists, we still need to check if every protocol has a database (in case of a new protocol)
     init_protocol_dbs("default")
-    
+
 
 def format_host_query(q, filter_term, HostsTable):
     """One annoying thing is that if you search for an ip such as '10.10.10.5',
@@ -127,16 +127,16 @@ def format_host_query(q, filter_term, HostsTable):
     else:
         nxc_logger.debug("Neither 'ip' nor 'host' columns found in the table")
         return q
-   
-    # first we check if its an ip address 
+
+    # first we check if its an ip address
     try:
         ipaddress.ip_address(filter_term)
         nxc_logger.debug(f"filter_term is an IP address: {filter_term}")
         q = q.filter(ip_column == filter_term)
     except ValueError:
         nxc_logger.debug(f"filter_term is not an IP address: {filter_term}")
         like_term = func.lower(f"%{filter_term}%")
-        
+
         # check if the hostname column exists for hostname searching
         q = q.filter(ip_column.like(like_term) | func.lower(HostsTable.c.hostname).like(like_term)) if hasattr(HostsTable.c, "hostname") else q.filter(ip_column.like(like_term))
 

nxc/helpers/even6_parser.py

@@ -145,11 +145,11 @@ def xml(self, template=None):
             return ""
 
         attrs = filter(lambda x: x is not None, (x.xml(template) for x in self._attributes))
-        
+
         attrs = " ".join(attrs)
         if len(attrs) > 0:
             attrs = " " + attrs
-            
+
         if self._empty:
             return f"<{self._name.val}{attrs}/>"
         else:

nxc/helpers/misc.py

@@ -145,4 +145,3 @@ def detect_if_ip(target):
         return True
     except Exception:
         return False
-

nxc/helpers/ntlm_parser.py

@@ -31,4 +31,4 @@ def parse_challenge(challange):
                 target_info["os_version"] = f"{WIN_VERSIONS[product_build]} Build {product_build}"
             else:
                 target_info["os_version"] = f"{major_version}.{minor_version} Build {product_build}"
-    return target_info
+    return target_info

nxc/modules/add-computer.py

@@ -86,7 +86,7 @@ def on_login(self, context, connection):
         # If SAMR fails now try over LDAPS
         if not self.noLDAPRequired:
             self.do_ldaps_add(connection, context)
-            
+
     def do_samr_add(self, context):
         """
         Connects to a target server and performs various operations related to adding or deleting machine accounts.

nxc/modules/bitlocker.py

@@ -15,9 +15,9 @@ def __init__(self, context=None, module_options=None):
         self.module_options = module_options
 
     def options(self, context, module_options):
-        """ 
+        """
         USAGE:
-        
+
         NetExec smb <IP> -u <username> -p <password> -M bitlocker
         NetExec wmi <IP> -u <username> -p <password> -M bitlocker (Better option to use on real life.)
         """
@@ -43,18 +43,18 @@ def check_bitlocker_status(self):
         try:
             # Executing the PowerShell command to get BitLocker volumes status.
             check_bitlocker_command_str_output = self.connection.execute(check_bitlocker_command_str, True)
-            
+
             if "'Get-BitLockerVolume' is not recognized" in check_bitlocker_command_str_output:
                 self.context.log.fail("BitLockerVolume not found on target.")
                 return
 
             # Splitting the output into lines.
             lines = str(check_bitlocker_command_str_output).splitlines()
             data_lines = [line for line in lines if re.match(r"\w:", line)]
-            
+
             for line in data_lines:
                 # Checking every line for starting with drive
-                if line[1] == ":": 
+                if line[1] == ":":
                     parts = line.split()
                     MountPoint, EncryptionMethod, protection_status = parts[0], parts[1], parts[2]
 
@@ -85,15 +85,15 @@ def check_bitlocker_status(self):
                 oxidResolver=True,
                 doKerberos=self.connection.kerberos,
                 kdcHost=self.connection.kdcHost)
-                
+
             try:
                 # CoCreateInstanceEx for WMI login
                 i_interface = dcom_conn.CoCreateInstanceEx(wmi.CLSID_WbemLevel1Login, wmi.IID_IWbemLevel1Login)
                 iWbemLevel1Login = wmi.IWbemLevel1Login(i_interface)
 
                 # Specify the namespace for BitLocker
                 bitlockerNamespace = "root\\CIMv2\\Security\\MicrosoftVolumeEncryption"
-                
+
                 # NTLM login for WMI
                 iWbemServices = iWbemLevel1Login.NTLMLogin(bitlockerNamespace, NULL, NULL)
 
@@ -113,7 +113,7 @@ def check_bitlocker_status(self):
                     6: "XTS_AES_128",
                     7: "XTS_AES_256_WITH_DIFFUSER"
                 }
-                
+
                 try:
                     while True:
                         iWbemClassObject = iEnumWbemClassObject.Next(0xffffffff, 1)