Formating

Author: NeffIsBack

nxc/protocols/mssql/database.py

@@ -158,8 +158,7 @@ def add_credential(self, credtype, domain, username, password, pillaged_from=Non
                     q = update(self.UsersTable).values(credential_data)  # .returning(self.UsersTable.c.id)
                     results = self.db_execute(q)  # .first()
 
-        nxc_logger.debug(
-            f"add_credential(credtype={credtype}, domain={domain}, username={username}, password={password}, pillaged_from={pillaged_from})")
+        nxc_logger.debug(f"add_credential(credtype={credtype}, domain={domain}, username={username}, password={password}, pillaged_from={pillaged_from})")
         return user_rowid
 
     def remove_credentials(self, creds_id):
@@ -274,7 +273,6 @@ def get_hosts(self, filter_term=None, domain=None):
         # if we're filtering by ip/hostname
         elif filter_term and filter_term != "":
             like_term = func.lower(f"%{filter_term}%")
-            q = select(self.HostsTable).filter(
-                self.HostsTable.c.ip.like(like_term) | func.lower(self.HostsTable.c.hostname).like(like_term))
+            q = select(self.HostsTable).filter(self.HostsTable.c.ip.like(like_term) | func.lower(self.HostsTable.c.hostname).like(like_term))
 
         return self.db_execute(q).all()

nxc/protocols/smb/database.py

@@ -190,17 +190,17 @@ def reflect_tables(self):
 
     # pull/545
     def add_host(
-            self,
-            ip,
-            hostname,
-            domain,
-            os,
-            smbv1,
-            signing,
-            spooler=None,
-            zerologon=None,
-            petitpotam=None,
-            dc=None,
+        self,
+        ip,
+        hostname,
+        domain,
+        os,
+        smbv1,
+        signing,
+        spooler=None,
+        zerologon=None,
+        petitpotam=None,
+        dc=None,
     ):
         """Check if this host has already been added to the database, if not, add it in."""
         hosts = []
@@ -271,8 +271,7 @@ def add_credential(self, credtype, domain, username, password, group_id=None, pi
         credentials = []
         groups = []
 
-        if (group_id and not self.is_group_valid(group_id)) or (
-                pillaged_from and not self.is_host_valid(pillaged_from)):
+        if (group_id and not self.is_group_valid(group_id)) or (pillaged_from and not self.is_host_valid(pillaged_from)):
             nxc_logger.debug("Invalid group or host")
             return
 
@@ -345,7 +344,8 @@ def add_admin_user(self, credtype, domain, username, password, host, user_id=Non
         creds_q = creds_q.filter(self.UsersTable.c.id == user_id) if user_id else creds_q.filter(
             func.lower(self.UsersTable.c.credtype) == func.lower(credtype),
             func.lower(self.UsersTable.c.domain) == func.lower(domain),
-            func.lower(self.UsersTable.c.username) == func.lower(username), self.UsersTable.c.password == password)
+            func.lower(self.UsersTable.c.username) == func.lower(username),
+            self.UsersTable.c.password == password)
         users = self.db_execute(creds_q)
         hosts = self.get_hosts(host)
 
@@ -568,8 +568,7 @@ def get_groups(self, filter_term=None, group_name=None, group_domain=None):
 
         results = self.db_execute(q).all()
 
-        nxc_logger.debug(
-            f"get_groups(filter_term={filter_term}, groupName={group_name}, groupDomain={group_domain}) => {results}")
+        nxc_logger.debug(f"get_groups(filter_term={filter_term}, groupName={group_name}, groupDomain={group_domain}) => {results}")
         return results
 
     def get_group_relations(self, user_id=None, group_id=None):
@@ -722,13 +721,13 @@ def is_dpapi_secret_valid(self, dpapi_secret_id):
         return valid
 
     def add_dpapi_secrets(
-            self,
-            host: str,
-            dpapi_type: str,
-            windows_user: str,
-            username: str,
-            password: str,
-            url: str = "",
+        self,
+        host: str,
+        dpapi_type: str,
+        windows_user: str,
+        username: str,
+        password: str,
+        url: str = "",
     ):
         """Add dpapi secrets to nxcdb"""
         secret = {
@@ -747,13 +746,13 @@ def add_dpapi_secrets(
             f"add_dpapi_secrets(host={host}, dpapi_type={dpapi_type}, windows_user={windows_user}, username={username}, password={password}, url={url})")
 
     def get_dpapi_secrets(
-            self,
-            filter_term=None,
-            host: Optional[str] = None,
-            dpapi_type: Optional[str] = None,
-            windows_user: Optional[str] = None,
-            username: Optional[str] = None,
-            url: Optional[str] = None,
+        self,
+        filter_term=None,
+        host: Optional[str] = None,
+        dpapi_type: Optional[str] = None,
+        windows_user: Optional[str] = None,
+        username: Optional[str] = None,
+        url: Optional[str] = None,
     ):
         """Get dpapi secrets from nxcdb"""
         q = select(self.DpapiSecrets)
@@ -780,8 +779,7 @@ def get_dpapi_secrets(
             q = q.filter(func.lower(self.DpapiSecrets.c.url) == func.lower(url))
         results = self.db_execute(q).all()
 
-        nxc_logger.debug(
-            f"get_dpapi_secrets(filter_term={filter_term}, host={host}, dpapi_type={dpapi_type}, windows_user={windows_user}, username={username}, url={url}) => {results}")
+        nxc_logger.debug(f"get_dpapi_secrets(filter_term={filter_term}, host={host}, dpapi_type={dpapi_type}, windows_user={windows_user}, username={username}, url={url}) => {results}")
         return results
 
     def add_loggedin_relation(self, user_id, host_id):
@@ -878,8 +876,7 @@ def add_check(self, name, description):
 
     def add_check_result(self, host_id, check_id, secure, reasons):
         """Check if this check result has already been added to the database, if not, add it in."""
-        q = select(self.ConfChecksResultsTable).filter(self.ConfChecksResultsTable.c.host_id == host_id,
-                                                       self.ConfChecksResultsTable.c.check_id == check_id)
+        q = select(self.ConfChecksResultsTable).filter(self.ConfChecksResultsTable.c.host_id == host_id, self.ConfChecksResultsTable.c.check_id == check_id)
         select_results = self.db_execute(q).all()
         context = locals()
         new_row = {column: context[column] for column in ("host_id", "check_id", "secure", "reasons")}