The unified diff between revisions [34cacda2..] and [1c711be8..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch "plugins/postgresql.py"
# from [73a8e9961aa44a965ace8280f8c859a34dc5ce53]
# to [54d93455e0f9fcf2556160d53943c9e2f3c94614]
#
# patch "scan.py"
# from [4b763dedd86d4f4544589f700e19b6ad82b75711]
# to [a10dc3c2b1fe6f00e7166b3bdf8797d0a7df0786]
#
# patch "sql/drop.sql"
# from [10030b602aa7cac1610d8799e4fb58ad20af3a42]
# to [bd691296b9667eda345c7af55b6fe2aa8faec42c]
#
# patch "sql/init.sql"
# from [52ec22b48a75f90a120b3eccb350e58c1ed55ce6]
# to [14a69e794604ec9b377aeb9ae9dc11a70e1d6565]
#
============================================================
--- plugins/postgresql.py 73a8e9961aa44a965ace8280f8c859a34dc5ce53
+++ plugins/postgresql.py 54d93455e0f9fcf2556160d53943c9e2f3c94614
@@ -22,6 +22,9 @@ def initialise(library):
def initialise(library):
global cnx
cnx = libpq.PQconnectdb(library.config.connect_str)
+ cnx.query("DELETE FROM urgency")
+ for urgency in library.urgency_to_string:
+ cnx.query("INSERT INTO urgency (urgency,description) VALUES (%d,%s)" % (urgency, q(library.urgency_to_string[urgency])))
def finalise(library):
return
@@ -37,7 +40,9 @@ def write_results(library, host, results
if udp_ports != None: udp_ports = ','.join(map(str, udp_ports))
tcp_ports = result.tcp_ports
if tcp_ports != None: tcp_ports = ','.join(map(str, tcp_ports))
- values = [ result.address[0], result.plugin_name, tcp_ports, udp_ports, result.urgency_string(), result.short_mesg, result.long_mesg, result.advice ]
+ urgency = result.urgency
+ if urgency != None: urgency = str(urgency)
+ values = [ result.address[0], result.plugin_name, tcp_ports, udp_ports, urgency, result.short_mesg, result.long_mesg, result.advice ]
values = map(q, values)
query += ','.join(values) + ")"
cnx.query(query)
============================================================
--- scan.py 4b763dedd86d4f4544589f700e19b6ad82b75711
+++ scan.py a10dc3c2b1fe6f00e7166b3bdf8797d0a7df0786
@@ -93,6 +93,7 @@ class PluginLibrary:
class PluginLibrary:
def __init__(self, config):
self.config = config
+ self.urgency_to_string = urgency_to_string
orig_path = None
self.output_plugins = []
self.tcp_to_plugin = {}
@@ -145,8 +146,6 @@ class ScannerResponse:
self.short_mesg = None
self.long_mesg = None
self.advice = None
- def urgency_string(self):
- return urgency_to_string[self.urgency]
def text_summary(self):
if self.urgency == None or self.plugin_name == None: return
ports = []
============================================================
--- sql/drop.sql 10030b602aa7cac1610d8799e4fb58ad20af3a42
+++ sql/drop.sql bd691296b9667eda345c7af55b6fe2aa8faec42c
@@ -1,3 +1,5 @@ DROP TABLE results;
DROP TABLE results;
+DROP TABLE urgency;
+
============================================================
--- sql/init.sql 52ec22b48a75f90a120b3eccb350e58c1ed55ce6
+++ sql/init.sql 14a69e794604ec9b377aeb9ae9dc11a70e1d6565
@@ -9,3 +9,9 @@ CREATE TABLE results (
long_mesg text,
advice text
);
+
+CREATE TABLE urgency (
+ urgency integer,
+ description varchar(256)
+);
+