[vscweb-commit] SF.net SVN: vscweb: [452] branches/vsc-2.0/pyvscd/util

[<cir...@us...>]

Revision: 452
Author:   cirrusrex
Date:     2006-08-02 11:09:19 -0700 (Wed, 02 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/vscweb/?rev=452&view=rev

Log Message:
-----------
pyssus-test.py modified for plugin import testing
handlers.py - This fixes bug #1533247 "plugins loaded isn't identifying new severity types"
loadplugins.py - added an option to run without committing changes to database

Modified Paths:
--------------
    branches/vsc-2.0/pyvscd/pyssus/handlers.py
    branches/vsc-2.0/pyvscd/pyssus/test/pyssus-test.py
    branches/vsc-2.0/pyvscd/util/loadplugins.py
Modified: branches/vsc-2.0/pyvscd/pyssus/handlers.py
===================================================================
--- branches/vsc-2.0/pyvscd/pyssus/handlers.py	2006-08-02 15:53:14 UTC (rev 451)
+++ branches/vsc-2.0/pyvscd/pyssus/handlers.py	2006-08-02 18:09:19 UTC (rev 452)
@@ -395,7 +395,7 @@
             raise NessusHandlerError, "Plugin[%s] data should contain %s, received %s --> %s" % (count, (self.basePluginLength+self.plugin_opts.__len__()), plugin.__len__(), "|||".join(plugin))
    
    def _getSeverity(self, description):
-      m = re.compile("(Risk Factor|Risk)\s*:\s*([a-z|A-Z\/]+)", re.IGNORECASE|re.MULTILINE).search(description)
+      m = re.compile("(Risk Factor|Risk)[;\s]*:[;\s]*([a-z|A-Z\/]+)\s*.*", re.IGNORECASE|re.MULTILINE).search(description)
       if m == None:
          return "Unknown"
       (rb,sev) = m.group(1,2)

Modified: branches/vsc-2.0/pyvscd/pyssus/test/pyssus-test.py
===================================================================
--- branches/vsc-2.0/pyvscd/pyssus/test/pyssus-test.py	2006-08-02 15:53:14 UTC (rev 451)
+++ branches/vsc-2.0/pyvscd/pyssus/test/pyssus-test.py	2006-08-02 18:09:19 UTC (rev 452)
@@ -65,8 +65,10 @@
       msg.unpack()
       pluginData = handlers.NessusPluginsHandler(msg, opt_list)
       print "Processed %s plugins" % (pluginData.plugins.__len__())
-      #print "Output: " + pluginData.__str__()
+      print "Output: " + "\n".join(pluginData.plugins.itervalues())
 
+      cx.close()
+      sys.exit(0)
       #handle preferences
       msg = cx.readMessage()
       while msg == None:

Modified: branches/vsc-2.0/pyvscd/util/loadplugins.py
===================================================================
--- branches/vsc-2.0/pyvscd/util/loadplugins.py	2006-08-02 15:53:14 UTC (rev 451)
+++ branches/vsc-2.0/pyvscd/util/loadplugins.py	2006-08-02 18:09:19 UTC (rev 452)
@@ -23,6 +23,7 @@
    parser.add_option('-v', '--verbose', action='store_true', dest='verbose',help='enable debugging')
    parser.add_option('-c', '--config', dest='conf', help='pyvscd config file')
    parser.add_option('-S', '--ssl',action='store_true', dest='ssl',help='enable ssl for nessus connection')
+   parser.add_option('-n', '--nocommit', action='store_true', dest='nocommit', help='do not actually update plugin data in table')
 
    (options, args) = parser.parse_args()
    if not options.nessus and not options.conf:
@@ -89,7 +90,7 @@
    #we need to replace this with our plugins handler
    pluginData = VSCPluginsHandler(msg, opt_list)
    logging.info("Received %s plugins", str(pluginData.plugins.__len__()))
-   pluginData.handle(args=(db,root_domain)) 
+   pluginData.handle(args=(db,root_domain,options.nocommit)) 
    log.debug("disconnecting from server.")
    cx.close()
 #end main
@@ -98,11 +99,11 @@
    
    def handle(self, args):
       log = logging.getLogger('plugins handler')
-      (db,root_domain) = args
-      libvscmt.plugins.flushTempPlugins(db)
+      (db,root_domain,nocommit) = args
+      if not nocommit: libvscmt.plugins.flushTempPlugins(db)
       for p in self.plugins:
-         libvscmt.plugins.addPlugin(db, p)
-         log.debug("added %s: %s", p['plugin'], p['name'])
+         if not nocommit: libvscmt.plugins.addPlugin(db, p)
+         log.debug("added %s: %s - %s", p['plugin'], p['name'], p['severity'])
 
       families = libvscmt.plugins.getFamilies(db)
       if "Full Scan" not in families:
@@ -114,7 +115,8 @@
          polid = libvscmt.plugins.policyExists(db, family, libvscmt.plugins.POLICY_USER, root_domain)
          if polid is None:
             log.debug("policy |%s| not found!", family)
-            libvscmt.plugins.addPolicy(db, (family, "Automagically generated by the VSC.",
+            if not nocommit:
+               libvscmt.plugins.addPolicy(db, (family, "Automagically generated by the VSC.",
                                   1, root_domain, libvscmt.plugins.POLICY_USER
                                  )
                             )
@@ -133,7 +135,7 @@
          log.debug("mapping plugins to policy %s[%s]", family,polid)
          for pl in plugin_list:
             #log.debug("mapping plugin [#%s] to policy [%s]" % (pl, polid))
-            if not libvscmt.plugins.isMapped(db,polid, pl):
+            if not libvscmt.plugins.isMapped(db,polid, pl) and not nocommit:
                libvscmt.plugins.mapPlugin(db,polid, pl)
 
          log.info("finished mapping plugins for this policy.")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.