openvas-cli 0.2.9 → 0.2.10

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.2.10

data/lib/openvas-cli/vas_config.rb

@@ -47,33 +47,37 @@ module OpenvasCli
       req = Nokogiri::XML::Builder.new { |xml|
         xml.get_configs(params)
       }
-      
-      resp = connection.send_receive(req.doc)
-      
       ret = []
-      resp.xpath("/get_configs_response/config").each { |xml|
-        cfg               = VasConfig.new
-        cfg.id            = extract_value_from("@id", xml)
-        cfg.name          = extract_value_from("name", xml)
-        cfg.comment       = extract_value_from("comment", xml)
-        cfg.families_grow = extract_value_from("family_count/growing", xml).to_i > 0
-        cfg.rules_grow    = extract_value_from("nvt_count/growing", xml).to_i > 0
-        cfg.in_use        = extract_value_from("in_use", xml).to_i > 0
+      
+      begin
+        resp = connection.send_receive(req.doc)
         
-        xml.xpath("tasks/task").each { |t| cfg.tasks << VasTask.from_xml_node(t) }
-        xml.xpath("families/family").each { |f| cfg.families << VasNVTFamily.from_xml_node(f) }
-        xml.xpath("preferences/preference").each { |p| 
-          p = VasPreference.from_xml_node(p) 
-          p.config_id = cfg.id
-          p.reset_changes
-          cfg.preferences << p
+
+        resp.xpath("/get_configs_response/config").each { |xml|
+          cfg               = VasConfig.new
+          cfg.id            = extract_value_from("@id", xml)
+          cfg.name          = extract_value_from("name", xml)
+          cfg.comment       = extract_value_from("comment", xml)
+          cfg.families_grow = extract_value_from("family_count/growing", xml).to_i > 0
+          cfg.rules_grow    = extract_value_from("nvt_count/growing", xml).to_i > 0
+          cfg.in_use        = extract_value_from("in_use", xml).to_i > 0
+          
+          xml.xpath("tasks/task").each { |t| cfg.tasks << VasTask.from_xml_node(t) }
+          xml.xpath("families/family").each { |f| cfg.families << VasNVTFamily.from_xml_node(f) }
+          xml.xpath("preferences/preference").each { |p| 
+            p = VasPreference.from_xml_node(p) 
+            p.config_id = cfg.id
+            p.reset_changes
+            cfg.preferences << p
+          }
+          
+          cfg.reset_changes
+          
+          ret << cfg
         }
-        
-        cfg.reset_changes
-        
-        ret << cfg
-      }
-      
+      rescue Exception => e
+      end
+
       ret
     end
     

data/lib/openvas-cli/vas_preference.rb

@@ -56,7 +56,7 @@ module OpenvasCli
     
     def full_name
       if @nvt_id && !@nvt_id.empty?
-        "#{nvt.name}[#{@val_type_desc}]:#{@name}"
+        "#{nvt_name}[#{@val_type_desc}]:#{@name}"
       else
         @name
       end
@@ -98,6 +98,14 @@ module OpenvasCli
       nil
     end
     
+    def self.get_by_name(config_id, name, nvt_id=nil)
+      if nvt_id
+        get_all(:config_id => config_id, :name => name, :nvt_oid => nvt_id).first
+      else
+        get_all(:config_id => config_id, :name => name).first
+      end
+    end
+    
     # Pulls Vas preferences.
     # === Options:
     # [:config_id] => [configuration_id]] pulls preferences associated with the provided configuration id
@@ -109,7 +117,13 @@ module OpenvasCli
       params = {}
       params[:config_id]  = options[:config_id] if options[:config_id]
       params[:nvt_oid]    = options[:nvt_oid]   if options[:nvt_oid]
-      manual_filter       = true                if options[:name]
+      if options[:name]
+        if options[:nvt_oid]
+          params[:preference] = options[:name]
+        else
+          manual_filter = true 
+        end
+      end
       
       req = Nokogiri::XML::Builder.new { |xml|
         if params.empty?
@@ -122,10 +136,10 @@ module OpenvasCli
       begin
         prefs = connection.send_receive(req.doc)
         
-        prefs.xpath("//preference").each { |p|
-          pref       = from_xml_node(p, options[:config_id])
+        prefs.xpath("/get_preferences_response/preference").each { |p|
+          pref = from_xml_node(p, options[:config_id])
           if manual_filter
-            ret << pref if options[:name] && options[:name] == pref.name
+            ret << pref if pref.name == options[:name] && pref.nvt_id.empty?
           else
             ret << pref
           end

data/lib/openvas-cli/vas_report.rb

@@ -56,7 +56,8 @@ module OpenvasCli
       end
       
       ret = []
-      repts.xpath('//report').each { |r|
+      
+      repts.xpath('/get_reports_response/report/report').each { |r|
         rep            = VasReport.new
         rep.id         = extract_value_from("@id", r)
         rep.task_id    = extract_value_from("task/@id", r)
@@ -77,7 +78,7 @@ module OpenvasCli
         rep.result_count[:medium][:total]    = extract_value_from("result_count/warning/full", r).to_i
         rep.result_count[:medium][:filtered] = extract_value_from("result_count/warning/filtered", r).to_i
         
-        r.xpath("results/result").each { |result|
+        r.xpath("./results/result").each { |result|
           rep.results << VasResult.parse_result_node(result)
         }
         
@@ -86,18 +87,19 @@ module OpenvasCli
 
       options[:sort] = :started_at unless options[:sort]
       options[:sort_order] = :descending unless options[:sort_order]
-      
-      if options[:sort] == :started_at
-        if options[:sort_order] == :ascending
-          ret.sort! { |a,b| a.started_at <=> b.started_at }
-        else
-          ret.sort! { |a,b| b.started_at <=> a.started_at }
-        end
-      elsif options[:sort] == :task_name
-        if options[:sort_order] == :ascending
-          ret.sort! { |a,b| a.task_name <=> b.task_name }
-        else
-          ret.sort! { |a,b| b.task_name <=> a.task_name }
+      unless options[:id]
+        if options[:sort] == :started_at
+          if options[:sort_order] == :ascending
+            ret.sort! { |a,b| a.started_at <=> b.started_at }
+          else
+            ret.sort! { |a,b| b.started_at <=> a.started_at }
+          end
+        elsif options[:sort] == :task_name
+          if options[:sort_order] == :ascending
+            ret.sort! { |a,b| a.task_name <=> b.task_name }
+          else
+            ret.sort! { |a,b| b.task_name <=> a.task_name }
+          end
         end
       end
       

data/openvas-cli.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{openvas-cli}
-  s.version = "0.2.9"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Reed Swenson"]
-  s.date = %q{2011-04-13}
+  s.date = %q{2011-04-14}
   s.description = %q{A full ruby implementation of the OpenVAS OMP (version 2.0) protocol.}
   s.email = %q{fleureed@gmail.com}
   s.extra_rdoc_files = [

data/spec/openvas-cli/vas_config_spec.rb

@@ -77,5 +77,12 @@ module OpenvasCli
       n_pref = new_cfg.preferences[i]
       n_pref.value.should == pref.value
     end
+    
+    it 'should not throw an exception when trying to pull with an invalid ID' do
+      lambda {
+        cfg = VasConfig.get_by_id("foo")
+        cfg.should be nil
+      }.should_not raise_error
+    end
   end
 end

data/spec/openvas-cli/vas_preference_spec.rb

@@ -11,16 +11,82 @@ module OpenvasCli
       }
     end
     
-    it 'should pull a single preference by name' do
-      all = VasPreference.get_all
+    it 'should pull a single preference by name and nvt_oid' do
+      config = VasConfig.get_all.choice
+      
+      prefs = VasPreference.get_all(:config_id => config.id)
+      o_pref = prefs.choice
+      while o_pref.nvt_id.empty?
+        o_pref = prefs.choice
+      end
+      o_pref.should_not be nil
+    
+      
+      prefs = VasPreference.get_all(:config_id => config.id, :nvt_oid => o_pref.nvt_id, :name=>o_pref.name)
+      prefs.count.should == 1
+      
+      n_pref = prefs.first
+      n_pref.should_not be nil
+      
+      o_pref.full_name.should == n_pref.full_name
+      o_pref.value.should     == n_pref.value
+      o_pref.config_id.should == n_pref.config_id
+    end
+    
+    it 'should pull a single preference by name for the global configuration' do
+      config = VasConfig.get_all.choice
+      
+      prefs = VasPreference.get_all(:config_id => config.id)
+      o_pref = prefs.choice
+      while !o_pref.nvt_id.empty?
+        o_pref = prefs.choice
+      end
+      o_pref.should_not be nil
+    
+      
+      prefs = VasPreference.get_all(:config_id => config.id, :name=>o_pref.name)
+      prefs.count.should == 1
+      
+      n_pref = prefs.first
+      n_pref.should_not be nil
+      
+      o_pref.full_name.should == n_pref.full_name
+      o_pref.value.should     == n_pref.value
+      o_pref.config_id.should == n_pref.config_id
+    end
+    
+    it 'get_by_name should pull a single preference by name and nvt_oid' do
+      config = VasConfig.get_all.choice
+      
+      prefs = VasPreference.get_all(:config_id => config.id)
+      o_pref = prefs.choice
+      while o_pref.nvt_id.empty?
+        o_pref = prefs.choice
+      end
+      o_pref.should_not be nil
+    
+      n_pref = VasPreference.get_by_name(config.id, o_pref.name, o_pref.nvt_id)
+      n_pref.should_not be nil
+      
+      o_pref.full_name.should == n_pref.full_name
+      o_pref.value.should     == n_pref.value
+      o_pref.config_id.should == n_pref.config_id
+    end
+    
+    it 'get_by_name should pull a single preference by name for the global configuration' do
+      config = VasConfig.get_all.choice
       
-      o_pref = all[rand(all.count)]
+      prefs = VasPreference.get_all(:config_id => config.id)
+      o_pref = prefs.choice
+      while !o_pref.nvt_id.empty?
+        o_pref = prefs.choice
+      end
       o_pref.should_not be nil
       
-      n_pref = VasPreference.get_all(:name=>o_pref.name)[0]
+      n_pref = VasPreference.get_by_name(config.id, o_pref.name)
       n_pref.should_not be nil
       
-      o_pref.name.should      == n_pref.name
+      o_pref.full_name.should == n_pref.full_name
       o_pref.value.should     == n_pref.value
       o_pref.config_id.should == n_pref.config_id
     end

data/spec/openvas-cli/vas_report_spec.rb

@@ -106,5 +106,24 @@ module OpenvasCli
         last_date = r.task_name
       }
     end
+    
+    it 'should pull results for a report when the ID and a filter is specified' do
+      report_ids = {}
+      VasReport.get_all(:levels => [:high, :medium]).each { |r| 
+        report_ids[r.id] = r.results.count unless r.results.empty?
+      }
+      report_ids.each { |id, count|
+        options = {
+          :sort_order => :descending, 
+          :sort       => :started_at, 
+          :levels     => [:high, :medium], 
+          :id         => id
+        }
+        rept = VasReport.get_all(options)[0]
+        rept.should_not be nil
+        rept.should have(count).results
+      }
+      
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openvas-cli
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 2
-  - 9
-  version: 0.2.9
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Reed Swenson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 -05:00
+date: 2011-04-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency