[Openvas-commits] r2700 - in trunk/openvas-client: . nessus src/gui

[scm-commit@wald.intevation.org]

Author: jan
Date: 2009-03-07 01:11:11 +0100 (Sat, 07 Mar 2009)
New Revision: 2700

Modified:
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/nessus/backend.c
   trunk/openvas-client/nessus/data_mining.c
   trunk/openvas-client/src/gui/priofiltermngr_dlg.c
Log:
* src/gui/priofiltermngr_dlg.c (priorityfiltermanager_dialog):
Changed string representation of severity.

* nessus/data_mining.c (__split_line): Apply filter for
severity.

* nessus/backend.c (backend_convert): Apply filter for severity.



Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2009-03-06 21:20:12 UTC (rev 2699)
+++ trunk/openvas-client/ChangeLog	2009-03-07 00:11:11 UTC (rev 2700)
@@ -1,3 +1,13 @@
+2009-03-07  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
+
+	* src/gui/priofiltermngr_dlg.c (priorityfiltermanager_dialog):
+	Changed string representation of severity.
+
+	* nessus/data_mining.c (__split_line): Apply filter for
+	severity.
+
+	* nessus/backend.c (backend_convert): Apply filter for severity.
+ 
 2009-03-06  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
 
 	* src/util/priority_filter.c (priority_filter_xml_elem,

Modified: trunk/openvas-client/nessus/backend.c
===================================================================
--- trunk/openvas-client/nessus/backend.c	2009-03-06 21:20:12 UTC (rev 2699)
+++ trunk/openvas-client/nessus/backend.c	2009-03-07 00:11:11 UTC (rev 2700)
@@ -41,6 +41,7 @@
 #include "backend.h"
 #include "nbe_output.h"
 #include "error_dlg.h"
+#include "priority_filter.h"
 
 
 
@@ -220,6 +221,7 @@
     fprintf(stderr, "backend_insert: some arguments are NULL\n");
      return -1;
   } 
+
  lseek(backends[be].fd, 0, SEEK_END);
  data = addslashes(data);
  if((write(backends[be].fd, "results|", strlen("results|")) < 0)    || /* RATS: ignore String literals are nul-terminated */
@@ -318,6 +320,7 @@
   char * t;
   char * t2;
   char * id = NULL;
+  char * p = NULL;
   
   
   line++;
@@ -375,6 +378,7 @@
    if(t2){
     t2[0]='\0';
    }
+  p = strdup(t);
    
    
   buffer = strdup(t);
@@ -419,6 +423,9 @@
   }
   t2[0]=0;
    
+  char * prio = priority_filter_apply(current_hostname, p, id, t);
+  if (prio) t = prio;
+
   if(!strcmp(t, "Security Note"))
     buffer = estrdup("NOTE");
   else if(!strcmp(t, "Security Warning"))	

Modified: trunk/openvas-client/nessus/data_mining.c
===================================================================
--- trunk/openvas-client/nessus/data_mining.c	2009-03-06 21:20:12 UTC (rev 2699)
+++ trunk/openvas-client/nessus/data_mining.c	2009-03-07 00:11:11 UTC (rev 2700)
@@ -84,6 +84,7 @@
 #include <stdarg.h>
 #include "backend.h"
 #include "data_mining.h"
+#include "priority_filter.h"
 
 
 #ifndef MIN
@@ -1171,6 +1172,9 @@
  else
   return 0;
   
+  char * prio = priority_filter_apply(*hostname, *port, *plugin_id, *severity);
+  if (prio) *severity = prio;
+
  entry = &(t[1]);
  *data = entry;
 

Modified: trunk/openvas-client/src/gui/priofiltermngr_dlg.c
===================================================================
--- trunk/openvas-client/src/gui/priofiltermngr_dlg.c	2009-03-06 21:20:12 UTC (rev 2699)
+++ trunk/openvas-client/src/gui/priofiltermngr_dlg.c	2009-03-07 00:11:11 UTC (rev 2700)
@@ -66,18 +66,19 @@
                             "http (80/tcp)",
                             "1.3.6.1.4.1.25623.1.0.10056",
                             "This is just a test-override",
-                            "NOTE",
-                            "FALSE", FALSE));
+                            "Security Note",
+                            "False Positive", FALSE));
     priority_filter_add(global_filter,
       priority_override_new("PriorityOverride2",
                             "192.168.11.35",
                             "general/tcp",
                             "1.3.6.1.4.1.25623.1.0.900505",
                             "This is just a test-override",
-                            "NOTE",
-                            "FALSE", TRUE));
+                            "Security Note",
+                            "False Positive", TRUE));
 
-    char * filter_file = g_build_filename (prefs_get_nessushome(), ".openvasrc", "priofilter.xml", NULL);
+    char * filter_file = g_build_filename (prefs_get_nessushome(),
+      ".openvas", "priofilter.xml", NULL);
     priority_filter_to_xml (global_filter, filter_file);
     priority_filter_from_xml (filter_file);
     g_free(filter_file);