revert db changes

Author: zblurx

nxc/protocols/ldap.py

@@ -326,9 +326,7 @@ def enum_host_info(self):
                 self.host,
                 self.hostname,
                 self.domain,
-                self.server_os,
-                self.signing_required,
-                self.cbt_status
+                self.server_os
             )
         except Exception as e:
             self.logger.debug(f"Error adding host {self.host} into db: {e!s}")

nxc/protocols/ldap/database.py

@@ -38,9 +38,7 @@ def db_schema(db_conn):
             "ip" text,
             "hostname" text,
             "domain" text,
-            "os" text,
-            "signing" boolean,
-            "cbt_status" text
+            "os" text
             )"""
         )
 
@@ -59,7 +57,7 @@ def reflect_tables(self):
                 )
                 sys.exit()
 
-    def add_host(self, ip, hostname, domain, os, signing=None, cbt_status=None):
+    def add_host(self, ip, hostname, domain, os):
         """Check if this host has already been added to the database, if not, add it in."""
         hosts = []
         updated_ids = []
@@ -73,9 +71,7 @@ def add_host(self, ip, hostname, domain, os, signing=None, cbt_status=None):
                 "ip": ip,
                 "hostname": hostname,
                 "domain": domain,
-                "os": os,
-                "signing": signing,
-                "cbt_status": cbt_status
+                "os": os
             }
             hosts = [new_host]
         # update existing hosts data
@@ -89,12 +85,6 @@ def add_host(self, ip, hostname, domain, os, signing=None, cbt_status=None):
                     host_data["hostname"] = hostname
                 if domain is not None:
                     host_data["domain"] = domain
-                if os is not None:
-                    host_data["os"] = os
-                if signing is not None:
-                    host_data["signing"] = signing
-                if cbt_status is not None:
-                    host_data["cbt_status"] = cbt_status
                 # only add host to be updated if it has changed
                 if host_data not in hosts:
                     hosts.append(host_data)

nxc/protocols/ldap/db_navigator.py

@@ -10,9 +10,7 @@ def display_hosts(self, hosts):
                 "IP",
                 "Hostname",
                 "Domain",
-                "OS",
-                "Signing",
-                "Channel Binding"
+                "OS"
             ]
         ]
 
@@ -27,18 +25,14 @@ def display_hosts(self, hosts):
             except Exception:
                 os = host[4]
 
-            signing = "Enforced" if bool(host[5]) else "None"
-            cbt_status = host[6]
-
             data.append(
                 [
                     host_id,
                     ip,
                     hostname,
                     domain,
-                    os,
-                    signing,
-                    cbt_status]
+                    os
+                ]
             )
         print_table(data, title="Hosts")
 
@@ -60,9 +54,7 @@ def do_hosts(self, line):
                         "IP",
                         "Hostname",
                         "Domain",
-                        "OS",
-                        "Signing",
-                        "Channel Binding"
+                        "OS"
                     ]
                 ]
                 host_id_list = []
@@ -79,18 +71,13 @@ def do_hosts(self, line):
                     except Exception:
                         os = host[4]
 
-                    signing = "Enforced" if bool(host[5]) else "None"
-                    cbt_status = host[6]
-
                     data.append(
                         [
                             host_id,
                             ip,
                             hostname,
                             domain,
-                            os,
-                            signing,
-                            cbt_status
+                            os
                         ]
                     )
                 print_table(data, title="Host")
@@ -100,7 +87,7 @@ def help_hosts(self):
         hosts [filter_term]
         By default prints all hosts
         Table format:
-        | 'HostID', 'IP', 'Hostname', 'Domain', 'OS', 'Signing, 'Channel Binding' |
+        | 'HostID', 'IP', 'Hostname', 'Domain', 'OS' |
         Subcommands:
             filter_term - filters hosts with filter_term
                 If a single host is returned (e.g. `hosts 15`, it prints the following tables:
@@ -201,4 +188,4 @@ def help_clear_database(self):
         THIS COMPLETELY DESTROYS ALL DATA IN THE CURRENTLY CONNECTED DATABASE
         YOU CANNOT UNDO THIS COMMAND
         """
-        print_help(help_string)
+        print_help(help_string)