openvas-cli 0.2.7 → 0.2.8

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/lib/openvas-cli/vas_report.rb

@@ -16,15 +16,15 @@ module OpenvasCli
     # reports.
     # === Options:
     # [:report_id => [report_id]] Pulls a specific +report_id+.  If the id provided is bogus, an empty set is returned.
-    # [:filter => [array_of_filter_symbols]] Filters the report results by severity.  Valid symbols are: [:high, :medium, :low, :log, :deubg].
+    # [:levels => [array_of_filter_symbols]] Filters the report results by severity.  Valid symbols are: [:high, :medium, :low, :log, :deubg].
     # [:sort => [sort_field]] Sorts the report by the given field.  Possible values are +:task_name+, +:started_at+. defaults to +:started_at+
     # [:sort_order => [:ascending, :descending]] Order of sort.  Defaults to :descending.
     def self.get_all(options={})
       params = {}
       params[:report_id] = options[:id] if options[:id]
-      if options[:filter]
+      if options[:levels]
         params[:levels] = ""
-        options[:filter].each { |f|
+        options[:levels].each { |f|
           case f
           when :high
             params[:levels] += 'h'

data/lib/openvas-cli/vas_result.rb

@@ -9,13 +9,15 @@ module OpenvasCli
     validates :id, :presence=>true, :UUID=>true
     
     def self.get_by_id(id)
-      nil
+      get_all(:id => id)[0]
     end
     
     def self.get_all(options = {})
       options[:sort_by] ||= :threat
       
       params = {:overrides => 0, :notes => 0}
+      
+      params[:result_id] = options[:id] if options[:id]
       if options[:task_id]
         params[:task_id] = options[:task_id]
         params[:apply_overrides] = 1 if options[:apply_overrides]
@@ -41,17 +43,21 @@ module OpenvasCli
       req = Nokogiri::XML::Builder.new { |xml|
         xml.get_results(params)
       }
-      xml = connection.send_receive(req.doc)
       
       results = {}
-      xml.xpath("//result").each { |xr|
-        id     = extract_value_from("@id", xr)
-        threat = extract_value_from("threat", xr)
-        if (levels.empty? || levels.include?(threat)) && results.has_key?(id) == false
-          res = parse_result_node(xr, options[:task_id])
-          results[res.result_id] = res
-        end
-      }    
+      
+      begin
+        xml = connection.send_receive(req.doc)
+        xml.xpath("//result").each { |xr|
+          id     = extract_value_from("@id", xr)
+          threat = extract_value_from("threat", xr)
+          if (levels.empty? || levels.include?(threat)) && results.has_key?(id) == false
+            res = parse_result_node(xr, options[:task_id])
+            results[res.result_id] = res
+          end
+        }    
+      rescue VasExceptions::CommandException => e
+      end
       
       ret = results.values
 

data/openvas-cli.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{openvas-cli}
-  s.version = "0.2.7"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Reed Swenson"]
-  s.date = %q{2011-04-04}
+  s.date = %q{2011-04-07}
   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_report_spec.rb

@@ -39,7 +39,7 @@ module OpenvasCli
     end
     
     it 'should filter the results' do
-      all = VasReport.get_all(:filter => [:high])
+      all = VasReport.get_all(:levels => [:high])
       
       all.each { |report|
         report.results.each{ |result|
@@ -47,7 +47,7 @@ module OpenvasCli
         }
       }
       
-      all = VasReport.get_all(:filter => [:log])
+      all = VasReport.get_all(:levels => [:log])
       
       all.each { |report|
         report.results.each{ |result|
@@ -55,7 +55,7 @@ module OpenvasCli
         }
       }
       
-      all = VasReport.get_all(:filter => [:medium, :debug, :low])
+      all = VasReport.get_all(:levels => [:medium, :debug, :low])
       
       all.each { |report|
         report.results.each{ |result|
@@ -72,13 +72,39 @@ module OpenvasCli
     end
     
     it 'default sort should be by started_at descending' do
-      
+      last_date = nil
+      VasReport.get_all.each { |r|
+        last_date = r.started_at unless last_date
+        r.started_at.should <= last_date
+        last_date = r.started_at
+      }
     end
     
-    it 'just adding :sort_order => :ascending should reverse the started_at sort'
+    it 'just adding :sort_order => :ascending should reverse the started_at sort' do
+      last_date = nil
+      VasReport.get_all(:sort_order => :ascending).each { |r|
+        last_date = r.started_at unless last_date
+        r.started_at.should >= last_date
+        last_date = r.started_at
+      }
+    end
     
-    it 'should sort by task_name (default :descending)'
+    it 'should sort by task_name (default :descending)' do
+      last_name = nil
+      VasReport.get_all(:sort => :task_name).each { |r|
+        last_name = r.started_at unless last_name
+        r.started_at.should <= last_name
+        last_date = r.started_at
+      }
+    end
     
-    it 'should sort by :task_name, :ascending'
+    it 'should sort by :task_name, :ascending' do
+      last_name = nil
+      VasReport.get_all(:sort => :task_name, :sort_order => :ascending).each { |r|
+        last_name = r.started_at unless last_name
+        r.started_at.should >= last_name
+        last_date = r.started_at
+      }
+    end
   end
 end

data/spec/openvas-cli/vas_result_spec.rb

@@ -136,5 +136,12 @@ module OpenvasCli
       result = VasResult.get_all(:task_id => VasTask.get_all.choice.id).choice
       result.destroy.should be true
     end
+    
+    it 'should return a result by ID' do
+      result = VasResult.get_all(:task_id => VasTask.get_all.choice.id).choice
+      
+      nr = VasResult.get_by_id(result.id)
+      nr.should_not be nil
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openvas-cli
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Reed Swenson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 -05:00
+date: 2011-04-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency