openvas-cli 0.2.6 → 0.2.7

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/lib/openvas-cli/vas_base.rb

@@ -19,6 +19,12 @@ module OpenvasCli
     
     attr_accessor :id
     
+    def initialize(attributes={})
+      attributes.each { |key, value|
+        instance_variable_set("@#{key}", value)
+      }
+    end
+    
     def new_record?
       @id == nil || @id.empty?
     end
@@ -30,5 +36,42 @@ module OpenvasCli
     def to_param
       id
     end
+    
+    def to_key
+      if new_record?
+        nil
+      else
+        [@id]
+      end
+    end
+    
+    def save!
+      raise(VasExceptions::RecordNotSaved) unless valid?
+      create_or_update || raise(VasExceptions::RecordNotSaved)
+    end
+    
+    def save
+      create_or_update if valid?      
+    end
+    
+    def destroy!
+      delete_record || raise(VasExceptions::RecordNotSaved)
+    end
+    
+    def destroy
+      delete_record
+    end
+    
+    def self.get_by_id(id)
+      get_all(:id => id).first
+    end
+    
+    def create_or_update
+      true
+    end
+    
+    def delete_record
+      true
+    end
   end
 end

data/lib/openvas-cli/vas_exceptions.rb

@@ -6,5 +6,7 @@ module OpenvasCli
     # Thrown when some sort of communications error (like a timeout or unexpected
     # end-of-file) is encountered.
     class CommunicationException < StandardError; end
+    
+    class RecordNotSaved < StandardError; end
   end
 end

data/lib/openvas-cli/vas_lsc_credential.rb

@@ -1,6 +1,14 @@
 require 'vas_base'
 
 module OpenvasCli
+  class VasLscCredentialValidator < ActiveModel::Validator
+    def validate(record)
+      if record.password && record.password != record.password_confirmation
+        record.errors[:password] << "and Password Confirmation do not match."
+      end
+    end
+  end
+
   class VasLscCredential < VasBase
 
     attr_accessor :name
@@ -12,17 +20,12 @@ module OpenvasCli
     attr_accessor :package
     attr_accessor :package_type
     attr_accessor :password 
+    attr_accessor :password_confirmation
     
     validates :name,  :presence => true, :length => {:minimum => 1}
     validates :login, :presence => true, :length => {:minimum => 1} 
     
-    def initialize(params = {})
-      @id = params[:id] if params[:id]  
-      @name = params[:name] if params[:name]
-      @login = params[:login] if params[:login] 
-      @comment = params[:comment] if params[:comment] 
-      @password = params[:password] if params[:password]
-    end
+    validates_with VasLscCredentialValidator 
     
     def target_keys
       @target_keys ||= []
@@ -32,9 +35,7 @@ module OpenvasCli
       @targets ||= []
     end
     
-    def save!
-      raise "VasLscCredential is not valid" unless valid?
-      
+    def create_or_update
       if @id
         #update
         req = Nokogiri::XML::Builder.new { |xml|
@@ -57,18 +58,33 @@ module OpenvasCli
         }
       end
       
-      resp = VasLscCredential.connection.send_receive(req.doc)
-      
-      @id = VasLscCredential.extract_value_from("create_lsc_credential_response/@id", resp) unless @id
+      begin
+        resp = VasLscCredential.connection.send_receive(req.doc)
+        @id = VasLscCredential.extract_value_from("create_lsc_credential_response/@id", resp) unless @id
+        
+        true
+      rescue VasExceptions::CommandException => e
+        errors[:command_failure] << e.message
+        
+        nil
+      end
     end
     
-    def destroy!
+    def delete_record
       return unless @id
       req = Nokogiri::XML::Builder.new { |xml|
         xml.delete_lsc_credential( :lsc_credential_id => @id )
       }
       
-      VasLscCredential.connection.send_receive(req.doc)
+      begin
+        VasLscCredential.connection.send_receive(req.doc)
+        
+        true
+      rescue VasExceptions::CommandException
+        errors[:command_failure] << e.message
+        
+        nil
+      end
     end
     
     def self.get_all(options={})
@@ -78,12 +94,17 @@ module OpenvasCli
         xml.get_lsc_credentials(params)
       }
       
-      resp = connection.send_receive(req.doc)
-      
       ret = []
-      resp.xpath("//lsc_credential").each { |cred|
-        ret << from_xml_node(cred)
-      }
+
+      begin
+        resp = connection.send_receive(req.doc)
+          
+        resp.xpath("//lsc_credential").each { |cred|
+          ret << from_xml_node(cred)
+        }
+      rescue VasExceptions::CommandException => e
+        
+      end
       
       ret
     end

data/lib/openvas-cli/vas_preference.rb

@@ -39,19 +39,13 @@ module OpenvasCli
       value_will_change! unless val == @value
       @value = val
     end
-    
-    def initialize(attributes={})
-      @name      = attributes[:name]      if attributes[:name]  
-      @value     = attributes[:value]     if attributes[:value]
-      @config_id = attributes[:config_id] if attributes[:config_id]
-    end
-    
+     
     def config
-      @config ||= VasConfig.get_all(:id => @config_id)[0]
+      @config ||= VasConfig.get_by_id(@config_id)
     end
     
     def nvt
-      @nvt ||= VasNVT.get_all(:id => @nvt_id)[0]
+      @nvt ||= VasNVT.get_by_id(@nvt_id)
     end
     
     def val_choices
@@ -66,8 +60,11 @@ module OpenvasCli
       end
     end
     
-    def save!
-      raise "Cannot save a preference that is not tied to a configuration" unless @config_id
+    def create_or_update
+      unless @config_id
+        errors[:config_id] << "Config_id required to save"
+        return
+      end
       req = Nokogiri::XML::Builder.new { |xml|
         xml.modify_config(:config_id => @config_id) {
           xml.preference {
@@ -84,7 +81,19 @@ module OpenvasCli
         } 
       }
     
-      VasPreference.connection.send_receive(req.doc)
+      begin
+        VasPreference.connection.send_receive(req.doc)
+        
+          true
+      rescue VasExceptions::CommandException => e
+        errors[:command_failure] << e.message
+        
+        nil
+      end
+    end
+    
+    def self.get_by_id(id)
+      nil
     end
     
     # Pulls Vas preferences.

data/lib/openvas-cli/vas_report.rb

@@ -3,14 +3,12 @@ require 'vas_base'
 module OpenvasCli
   # Contains the details of a single OpenVAS report.
   class VasReport < VasBase
-    attr_accessor :report_id
     attr_accessor :task_id
     attr_accessor :task_name
     attr_accessor :started_at
     # Overall Status Only
     attr_accessor :status
     
-    validates :report_id, :presence => true, :UUID => true
     validates :task_id,   :presence => true, :UUID => true, 
               :unless => Proc.new { |report| report.empty? }
     
@@ -19,9 +17,11 @@ module OpenvasCli
     # === 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].
+    # [: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[:report_id] if options[:report_id]
+      params[:report_id] = options[:id] if options[:id]
       if options[:filter]
         params[:levels] = ""
         options[:filter].each { |f|
@@ -57,48 +57,65 @@ module OpenvasCli
       
       ret = []
       repts.xpath('//report').each { |r|
-        r_id            = VasReport.new
-        r_id.report_id  = extract_value_from("@id", r)
-        r_id.task_id    = extract_value_from("task/@id", r)
-        r_id.task_name  = extract_value_from("task/name", r)
-        r_id.status     = extract_value_from("scan_run_status", r)
-        r_id.started_at = extract_value_from("scan_start", r)
+        rep            = VasReport.new
+        rep.id         = extract_value_from("@id", r)
+        rep.task_id    = extract_value_from("task/@id", r)
+        rep.task_name  = extract_value_from("task/name", r)
+        rep.status     = extract_value_from("scan_run_status", r)
+        rep.started_at = extract_value_from("scan_start", r)
         
-        r_id.result_count[:total]             = extract_value_from("result_count/full", r).to_i
-        r_id.result_count[:filtered]          = extract_value_from("result_count/filtered", r).to_i
-        r_id.result_count[:debug][:total]     = extract_value_from("result_count/debug/full", r).to_i
-        r_id.result_count[:debug][:filtered]  = extract_value_from("result_count/debug/filtered", r).to_i
-        r_id.result_count[:high][:total]      = extract_value_from("result_count/hole/full", r).to_i
-        r_id.result_count[:high][:filtered]   = extract_value_from("result_count/hold/filtered", r).to_i
-        r_id.result_count[:low][:total]       = extract_value_from("result_count/info/full", r).to_i
-        r_id.result_count[:low][:filtered]    = extract_value_from("result_count/info/filtered", r).to_i
-        r_id.result_count[:log][:total]       = extract_value_from("result_count/log/full", r).to_i
-        r_id.result_count[:log][:filtered]    = extract_value_from("result_count/log/filtered", r).to_i
-        r_id.result_count[:medium][:total]    = extract_value_from("result_count/warning/full", r).to_i
-        r_id.result_count[:medium][:filtered] = extract_value_from("result_count/warning/filtered", r).to_i
+        rep.result_count[:total]             = extract_value_from("result_count/full", r).to_i
+        rep.result_count[:filtered]          = extract_value_from("result_count/filtered", r).to_i
+        rep.result_count[:debug][:total]     = extract_value_from("result_count/debug/full", r).to_i
+        rep.result_count[:debug][:filtered]  = extract_value_from("result_count/debug/filtered", r).to_i
+        rep.result_count[:high][:total]      = extract_value_from("result_count/hole/full", r).to_i
+        rep.result_count[:high][:filtered]   = extract_value_from("result_count/hold/filtered", r).to_i
+        rep.result_count[:low][:total]       = extract_value_from("result_count/info/full", r).to_i
+        rep.result_count[:low][:filtered]    = extract_value_from("result_count/info/filtered", r).to_i
+        rep.result_count[:log][:total]       = extract_value_from("result_count/log/full", r).to_i
+        rep.result_count[:log][:filtered]    = extract_value_from("result_count/log/filtered", r).to_i
+        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_id.results << VasResult.parse_result_node(result)
+          rep.results << VasResult.parse_result_node(result)
         }
         
-        ret << r_id
+        ret << rep
       }
+
+      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 }
+        end
+      end
       
       ret
     end
     
     def to_xml
       req = Nokogiri::XML::Builder.new { |xml|
-        xml.get_reports(:report_id => @report_id)
+        xml.get_reports(:report_id => @id)
       }
       
       report = VasReport.connection.send_receive(req.doc)
       
-      report.at_xpath('//report').to_xml
+      report.at_xpath('/get_reports_response/report').to_xml
     end
     
     def task
-      @task ||= VasTask.get_all(:task_id => @task_id)[0]
+      @task ||= VasTask.get_by_id(@task_id)
     end
     
     def results

data/lib/openvas-cli/vas_result.rb

@@ -6,14 +6,18 @@ module OpenvasCli
     attr_accessor :result_id, :subnet, :host, :port, :rule_id, :threat,
                   :description, :notes, :overrides, :task_id
                   
-    validates :result_id, :presence=>true, :UUID=>true
-      
+    validates :id, :presence=>true, :UUID=>true
+    
+    def self.get_by_id(id)
+      nil
+    end
+    
     def self.get_all(options = {})
       options[:sort_by] ||= :threat
       
       params = {:overrides => 0, :notes => 0}
-      if options[:id]
-        params[:task_id] = options[:id]
+      if options[:task_id]
+        params[:task_id] = options[:task_id]
         params[:apply_overrides] = 1 if options[:apply_overrides]
       end
 
@@ -72,7 +76,7 @@ module OpenvasCli
     
     def self.parse_result_node(node, task_id = nil)
       res             = VasResult.new
-      res.result_id   = extract_value_from("@id", node)
+      res.id          = extract_value_from("@id", node)
       res.threat      = extract_value_from("threat", node)
       res.subnet      = extract_value_from("subnet", node)
       res.host        = extract_value_from("host", node)

data/lib/openvas-cli/vas_schedule.rb

@@ -18,14 +18,6 @@ module OpenvasCli
     
     define_attribute_methods [:name, :comment, :first_time, :period]
     
-    def initialize(params = {})
-      @name          = params[:name]          if params[:name]  
-      @comment       = params[:comment]       if params[:comment]
-      @first_time    = params[:first_time]    if params[:first_time]
-      @period        = params[:period]        if params[:period]
-      reset_changes
-    end
-    
     def changed?
       local_changes = false
       local_changes = @period.changed? if @period
@@ -53,23 +45,31 @@ module OpenvasCli
       @period = v
     end
     
-    def destroy!
+    def delete_record
       return unless @id
       
       req = Nokogiri::XML::Builder.new { |xml|
         xml.delete_schedule(:schedule_id => @id)
       }
       
-      VasSchedule.connection.send_receive(req.doc)
-      @id = nil
-      reset_changes
+      begin
+        VasSchedule.connection.send_receive(req.doc)
+        @id = nil
+        reset_changes
+        
+        true
+      rescue VasExceptions::CommandException => e
+        errors[:command_failure] << e.message
+        
+        nil
+      end
     end
     
-    def save!
+    def create_or_update
       return unless changed? || @id == nil
       
       if @id
-        destroy!
+        return unless destroy
       end
       
       req = Nokogiri::XML::Builder.new { |xml|
@@ -96,9 +96,17 @@ module OpenvasCli
         }
       }
       
-      resp = VasSchedule.connection.send_receive(req.doc)
-      @id = VasSchedule.extract_value_from("/create_schedule_response/@id", resp) unless @id
-      reset_changes
+      begin
+        resp = VasSchedule.connection.send_receive(req.doc)
+        @id = VasSchedule.extract_value_from("/create_schedule_response/@id", resp) unless @id
+        reset_changes
+      
+        true
+      rescue VasExceptions::CommandException => e
+        errors[:command_failure] << e.message
+        
+        nil
+      end
     end
     
     def self.get_all(options = {})

data/lib/openvas-cli/vas_target.rb

@@ -29,12 +29,13 @@ module OpenvasCli
    
     def changed?
       local_changes = false
-      local_changes = !@org_hosts.eql?(@hosts) if @org_hosts 
-    
+      
+      local_changes = true unless @org_hosts && @org_hosts.eql?(@hosts)  
+      
       unless local_changes == true
         local_changes = credential_changed?(:ssh) || credential_changed?(:smb)
       end
-      
+            
       local_changes ||  super
     end
    
@@ -53,15 +54,9 @@ module OpenvasCli
     end
 
     def initialize(params = {})
-      @id = params[:id] if params[:id]
-      @name = params[:name] if params[:name]
-      @hosts = params[:hosts] if params[:hosts]
-      @comment = params[:comment] if params[:comment]
-      @port_range = params[:port_range] if params[:port_range]
-    
+      super(params)    
+
       @org_hosts = @hosts.collect { |h| h } if @hosts
-      
-      reset_changes
     end
 
     def credentials
@@ -86,14 +81,14 @@ module OpenvasCli
     
     def hosts=(val)
       hosts_will_change! unless @hosts.eql?(val)
-      @host = val
+      @hosts = val
       
       @org_hosts = val.collect { |h| h } if val
     end  
     
-    def save!
+    def create_or_update
       if @id
-        destroy!
+        return unless destroy
       end
       req = Nokogiri::XML::Builder.new { |xml|
         xml.create_target {
@@ -105,23 +100,38 @@ module OpenvasCli
           xml.port_range { xml.text(@port_range) } if @port_range
         }
       }
-      resp = VasTarget.connection.send_receive(req.doc)
       
-      @id = VasTarget.extract_value_from("create_target_response/@id", resp)
+      begin
+        resp = VasTarget.connection.send_receive(req.doc)
+        @id = VasTarget.extract_value_from("create_target_response/@id", resp)
+        reset_changes
+        
+        true
+      rescue VaxExceptions::CommandException => e
+        errors[:command_failure] << e.message
+        
+        nil
+      end      
       
-      reset_changes
     end
     
-    def destroy!
+    def delete_record
       return unless @id
       
       req = Nokogiri::XML::Builder.new { |xml|
         xml.delete_target(:target_id => @id)
       }
       
-      VasTarget.connection.send_receive(req.doc)
-      
-      @id = nil
+      begin
+        VasTarget.connection.send_receive(req.doc)
+        @id = nil
+        
+        true
+      rescue VaxExceptions::CommandException => e
+        errors[:command_failure] << e.message
+        
+        nil
+      end  
     end
     
     def self.create!(params={})
@@ -147,7 +157,9 @@ module OpenvasCli
           targ.id                    = extract_value_from("@id", t)
           targ.name                  = extract_value_from("name", t)
           host_string                = extract_value_from("hosts", t)
-          targ.hosts                 << host_string.split(/, /)
+          all_hosts = host_string.split(/,/)
+          all_hosts.each { |hst| hst.strip! }
+          targ.hosts                 = all_hosts
           targ.comment               = extract_value_from("comment", t)
           targ.port_range            = extract_value_from("port_range", t)
           targ.in_use                = extract_value_from("in_use", t).to_i > 0
@@ -159,6 +171,8 @@ module OpenvasCli
             targ.task_keys << extract_value_from("@id", task)
           }
           
+          targ.reset_changes
+          
           ret << targ
         }
       
@@ -184,13 +198,14 @@ module OpenvasCli
       ret = { :ssh => nil, :smb => nil }
       
       @credential_keys.each { |key, value|
-        ret[key] = VasLscCredential.get_all(:id => value) if value && !value.empty?
+        ret[key] = VasLscCredential.get_all(:id => value)[0] if value && !value.empty?
       } if @credential_keys
       
       ret
     end
     
     def credential_changed?(key)
+      credential_keys[key] = nil if credential_keys[key] && credential_keys[key].empty?
       if credential_keys[key] == nil && credentials[key] != nil
         return true
       elsif credential_keys[key] != nil && credentials[key] == nil

data/lib/openvas-cli/vas_task.rb

@@ -19,16 +19,6 @@ module OpenvasCli
     
     
     define_attribute_methods [:name, :comment, :config_id, :target_id, :schedule_id]
-    
-    def initialize(params = {})
-      @name        = params[:name]        if params[:name]
-      @comment     = params[:comment]     if params[:comment]
-      @config_id   = params[:config_id]   if params[:config_id]
-      @target_id   = params[:target_id]   if params[:target_id]
-      @schedule_id = params[:schedule_id] if params[:schedule_id]
-      @schedule    = params[:schedule]    if params[:schedule]
-      reset_changes
-    end
 
     def name=(val)
       name_will_change! unless @name == val
@@ -56,7 +46,7 @@ module OpenvasCli
     end
     
     def schedule
-      @schedule || pull_my_schedule
+      @schedule ||= pull_my_schedule
     end
     
     def schedule=(v)
@@ -65,33 +55,32 @@ module OpenvasCli
     end
     
     def config
-      @config || pull_my_config
+      @config ||= pull_my_config
     end
     
     def config=(val)
       @config = val
-      config_id = val ? val.id : nil
+      config_id = val.id if val
     end
     
     def target
-      @target || pull_my_target
+      @target ||= pull_my_target
     end
     
     def target=(val)
       @target = val
-      target_id = val ? val.id : nil
+      target_id = val.id if val
     end
     
-    def save!
-      raise "Invalid State" unless valid?
-    
+    def create_or_update
+          
       if schedule && schedule.changed?
-        schedule.save!
+        return unless schedule.save
         schedule_id = schedule.id
       end
       
       if config.changed?
-        config.save!
+        return unless config.save
       end
        
       req = Nokogiri::XML::Builder.new { |xml|
@@ -112,19 +101,35 @@ module OpenvasCli
         end
       }
       
-      resp = VasTask.connection.send_receive(req.doc)
+      begin
+        resp = VasTask.connection.send_receive(req.doc)
+        @id = VasTask.extract_value_from("/create_task_response/@id", resp) unless @id
+        reset_changes
+        
+        true
+      rescue VaxExceptions::CommandException => e
+        errors[:command_failure] << e.message
+        
+        nil
+      end
       
-      @id = VasTask.extract_value_from("/create_task_response/@id", resp) unless @id
       
-      reset_changes
     end
     
-    def destroy!
+    def delete_record
       req = Nokogiri::XML::Builder.new { |xml|
         xml.delete_task(:task_id => @id)
       }
       
-      VasTask.connection.send_receive(req.doc)
+      begin
+        VasTask.connection.send_receive(req.doc)
+        
+        true
+      rescue VaxExceptions::CommandException => e
+        errors[:command_failure] << e.message
+        
+        nil
+      end
     end
     
     def start
@@ -174,10 +179,10 @@ module OpenvasCli
     def self.get_all(options = {})
       params = {:apply_overrides => 0, :sort_field => "name"}
       
-      params[:task_id] = options[:task_id] if options[:task_id]
+      params[:task_id] = options[:id] if options[:id]
     
       req = Nokogiri::XML::Builder.new { |xml|
-        xml.get_tasks
+        xml.get_tasks(params)
       }
       
       tasks = connection.send_receive(req.doc)
@@ -191,20 +196,22 @@ module OpenvasCli
     end
     
     def self.from_xml_node(node)
-      t_id                = VasTask.new
-      t_id.id             = extract_value_from("@id", node)
-      t_id.name           = extract_value_from("name", node)
-      t_id.comment        = extract_value_from("comment", node)
-      t_id.status         = extract_value_from("status", node)
+      t                = VasTask.new
+      t.id             = extract_value_from("@id", node)
+      t.name           = extract_value_from("name", node)
+      t.comment        = extract_value_from("comment", node)
+      t.status         = extract_value_from("status", node)
       if node.at_xpath("progress")
-        t_id.progress = VasTaskProgress.from_xml_node(node.at_xpath("progress"))
+        t.progress = VasTaskProgress.from_xml_node(node.at_xpath("progress"))
       end
-      t_id.times_run      = extract_value_from("report_count/finished", node).to_i
-      t_id.last_report_id = extract_value_from("last_report/report/@id", node)
-      t_id.config_id      = extract_value_from("config/@id", node)
-      t_id.target_id      = extract_value_from("target/@id", node)
+      t.times_run      = extract_value_from("report_count/finished", node).to_i
+      t.last_report_id = extract_value_from("last_report/report/@id", node)
+      t.config_id      = extract_value_from("config/@id", node)
+      t.target_id      = extract_value_from("target/@id", node)
+      
+      t.reset_changes
       
-      t_id
+      t
     end
    
   private

data/openvas-cli.gemspec

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

@@ -19,10 +19,23 @@ module OpenvasCli
         :name => next_test_name, 
         :login => "FOOBAR", 
         :comment => "Yet another test credential", 
-        :password => "thisCanTr3@llyBe1"
+        :password => "thisCanTr3@llyBe1",
+        :password_confirmation => "thisCanTr3@llyBe1"
       }
     end
 
+    it 'should require password and confirmation to be the same' do
+      cred = VasLscCredential.new(valid_params)
+      cred.should be_valid
+      
+      cred.password_confirmation = "something different"
+      cred.should_not be_valid
+      
+      cred.should have(1).errors
+      
+      cred.errors[:password].should_not be nil
+    end
+
     it 'should pull all available credentials' do
       all = VasLscCredential.get_all
       all.should_not be nil
@@ -36,7 +49,7 @@ module OpenvasCli
       cred.id.should_not be nil
       cred.id.should_not be_empty
       
-      n_cred = VasLscCredential.get_all(:id => cred.id)[0]
+      n_cred = VasLscCredential.get_by_id(cred.id)
       n_cred.should_not be nil
       n_cred.id.should == cred.id
       n_cred.name.should == cred.name
@@ -48,13 +61,13 @@ module OpenvasCli
       cred = VasLscCredential.new(valid_params)
       cred.save!
       
-      n_cred = VasLscCredential.get_all(:id => cred.id)[0]
+      n_cred = VasLscCredential.get_by_id(cred.id)
       n_cred.login = "NOT_FOOBAR"
       n_cred.save!
       
       n_cred.id.should == cred.id
       
-      n_cred = VasLscCredential.get_all(:id => cred.id)[0]
+      n_cred = VasLscCredential.get_by_id(cred.id)
       n_cred.login.should == "NOT_FOOBAR"
     end
     
@@ -64,9 +77,13 @@ module OpenvasCli
       cred.id.should_not be nil
       cred.id.should_not be_empty
       
-      n_cred = VasLscCredential.get_all(:id => cred.id)[0]
+      n_cred = VasLscCredential.get_by_id(cred.id)
       n_cred.should_not be nil
       n_cred.login.should == 'FOO\\BAR'
     end
+    
+    it 'should not barf if it is given an invalid ID to pull' do
+      lambda {VasLscCredential.get_all(:id => 'foo')}.should_not raise_error
+    end
   end
 end

data/spec/openvas-cli/vas_nvt_spec.rb

@@ -9,14 +9,14 @@ module OpenvasCli
       rules.each{ |r| r.should be_valid }
     end
     
-    it 'should pull an NVT by OID', :slow => true do
-      id = VasNVT.get_all.choice.id
+    it 'should pull an NVT by OID' do
+      fam = VasNVTFamily.get_all.choice
+        
+      id = VasNVT.get_all(:family => fam.name).choice.id
     
-      rule = VasNVT.get_all(:id => id)
+      rule = VasNVT.get_by_id(id)
       rule.should_not be nil
-      rule.count.should == 1
-      
-      rule[0].should be_valid
+      rule.should be_valid
     end
     
     it 'should pull an NVT by Family' do

data/spec/openvas-cli/vas_report_spec.rb

@@ -12,24 +12,22 @@ module OpenvasCli
     end
     
     it 'should pull a raw XML dump for a single report' do
-      rept = VasReport.get_all[0]
+      rept = VasReport.get_all.choice
       
       xml = rept.to_xml
       
       xdoc = Nokogiri::XML(xml) #it should be a valid xml document
       
-      xdoc.at_xpath("//report/@id").value.should == rept.report_id
+      xdoc.at_xpath("//report/@id").value.should == rept.id
     end
     
     it 'should pull a specific report by id' do
-      all = VasReport.get_all
-      
-      o_rept = all[rand(all.count)]
+      o_rept = VasReport.get_all.choice
       o_rept.should_not be nil
-      n_rept = VasReport.get_all(:report_id => o_rept.report_id)[0]
+      n_rept = VasReport.get_by_id(o_rept.id)
       n_rept.should_not be nil
       
-      o_rept.report_id.should == n_rept.report_id
+      o_rept.id.should == n_rept.id
     end
     
     it 'should report the associated results' do
@@ -68,10 +66,19 @@ module OpenvasCli
     
     it 'should return an empty set when passed a bad report_id' do
       lambda {
-        r = VasReport.get_all(:report_id => '0000000000')
-        r.should_not be nil
-        r.should be_empty
+        r = VasReport.get_by_id(:id => '0000000000')
+        r.should be nil
       }.should_not raise_error
     end
+    
+    it 'default sort should be by started_at descending' do
+      
+    end
+    
+    it 'just adding :sort_order => :ascending should reverse the started_at sort'
+    
+    it 'should sort by task_name (default :descending)'
+    
+    it 'should sort by :task_name, :ascending'
   end
 end

data/spec/openvas-cli/vas_result_spec.rb

@@ -40,8 +40,8 @@ module OpenvasCli
       
       last_id = ""
       results.each { |r|
-        r.result_id.should >= last_id
-        last_id = r.result_id
+        r.id.should >= last_id
+        last_id = r.id
       }
     end
     
@@ -60,8 +60,8 @@ module OpenvasCli
       
       last_val = ""
       results.each { |r|
-        r.rule_id.should >= last_val
-        last_val = r.rule_id
+        r.id.should >= last_val
+        last_val = r.id
       }
     end
     
@@ -89,7 +89,7 @@ module OpenvasCli
       tasks = VasTask.get_all
       
       unless tasks.empty?
-        task_id = tasks[0].task_id
+        task_id = tasks.choice.id
         results = VasResult.get_all(:task_id => task_id)
         results.each { |r| r.task_id.should == task_id }
         
@@ -106,5 +106,35 @@ module OpenvasCli
         threats.should include r.threat
       }
     end
+    
+    it 'should return null when pulling by task_id' do
+      lambda {
+        VasResult.get_by_id('foo').should be nil
+      }.should_not raise_error
+    end
+    
+    it 'should not raise an error on save!' do
+      result = VasResult.get_all(:task_id => VasTask.get_all.choice.id).choice
+      lambda {
+        result.save!
+      }.should_not raise_error
+    end
+    
+    it 'should return true on save' do
+      result = VasResult.get_all(:task_id => VasTask.get_all.choice.id).choice
+      result.save.should be true
+    end
+    
+    it 'should not raise an error on destroy!' do
+      result = VasResult.get_all(:task_id => VasTask.get_all.choice.id).choice
+      lambda {
+        result.destroy!
+      }.should_not raise_error
+    end
+    
+    it 'should return true on save' do
+      result = VasResult.get_all(:task_id => VasTask.get_all.choice.id).choice
+      result.destroy.should be true
+    end
   end
 end

data/spec/openvas-cli/vas_schedule_spec.rb

@@ -32,11 +32,16 @@ module OpenvasCli
 
       unless all.empty?    
         schedule_id = all.choice.id
-        schedules = VasSchedule.get_all(:id => schedule_id)
-        schedules.count.should == 1
-        schedules[0].id.should == schedule_id
+        schedule = VasSchedule.get_by_id(schedule_id)
+        schedule.should_not be nil
       end
     end
+
+    it 'should return nil if bogus ID is provided' do
+      lambda {
+        VasSchedule.get_by_id("8675309").should be nil
+      }.should_not raise_error
+    end
     
     it 'default sort should be by name' do
       all = VasSchedule.get_all
@@ -86,7 +91,7 @@ module OpenvasCli
       s.should_not be_changed
       s.id.should_not be nil
       
-      new_s = VasSchedule.get_all(:id => s.id)[0]
+      new_s = VasSchedule.get_by_id(s.id)
       new_s.should_not be nil
       new_s.id.should            == s.id
       new_s.name.should          == s.name
@@ -106,9 +111,9 @@ module OpenvasCli
       
       s.id.should_not == old_id
       
-      VasSchedule.get_all(:id => old_id).should be_empty
+      VasSchedule.get_by_id(old_id).should be nil
       
-      new_s = VasSchedule.get_all(:id => s.id)[0]
+      new_s = VasSchedule.get_by_id(s.id)
       new_s.should_not be nil
       new_s.id.should            == s.id
       new_s.name.should          == s.name

data/spec/openvas-cli/vas_target_spec.rb

@@ -69,14 +69,14 @@ module OpenvasCli
       
       t.id.should_not be nil
       
-      n_t = VasTarget.get_all(:id => t.id)[0]
+      n_t = VasTarget.get_by_id(t.id)
       n_t.should_not be nil
       n_t.id.should == t.id
       n_t.name.should == t.name
       n_t.should have(t.hosts.count).hosts
-  #    n_t.hosts.each { |h|
-  #      t.hosts.should include h
-  #    }
+      n_t.hosts.each { |h|
+        t.hosts.should include h
+      }
     end
     
     it 'should record a change when the name has changed' do
@@ -133,9 +133,8 @@ module OpenvasCli
       
       t.id.should_not == org_id
       
-      srch = VasTarget.get_all(:id => org_id)
-      srch.should_not be nil
-      srch.size.should == 0
+      srch = VasTarget.get_by_id(org_id)
+      srch.should be nil
     end
     
     it 'should show a change when a new credential is added' do

data/spec/openvas-cli/vas_task_spec.rb

@@ -60,19 +60,22 @@ module OpenvasCli
       
       tasks.should_not be nil
       
-      tasks.each { |t| t.should be_valid }
+      tasks.each { |t| 
+        t.should be_valid 
+      }
     end
     
     it 'should create a task' do
       t = VasTask.new(valid_params)
-      t.save!
+      t.save.should_not be nil
       
       t.id.should_not be nil
       t.id.should_not be_empty
       
-      new_t = VasTask.get_all(:id => t.id)[0]    
+      new_t = VasTask.get_by_id(t.id)
       new_t.should_not be nil
       
+      new_t.id.should == t.id      
       new_t.name.should == t.name
       new_t.config_id.should == t.config_id
       new_t.target_id.should == t.target_id
@@ -86,9 +89,9 @@ module OpenvasCli
       if all.length > 0
         task = all[0]
       
-        new_task = VasTask.get_all(:task_id => task.task_id)[0]
+        new_task = VasTask.get_by_id(task.id)
         
-        task.task_id.should == new_task.task_id
+        task.id.should == new_task.id
       end
     end
     

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'log4r'
 require 'fileutils'
-require 'openvas_cli'
+require 'openvas-cli'
 
 Dir["#{File.dirname(__FILE__)}/../lib/openvas-cli/vas_*.rb"].each {|f| require f}
 # Requires supporting files with custom matchers and macros, etc,
@@ -13,7 +13,7 @@ Dir["#{File.dirname(__FILE__)}/../lib/openvas-cli/vas_*.rb"].each {|f| require f
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-#  config.filter_run_excluding :slow => true
+  config.filter_run_excluding :slow => true
 end
 
 
@@ -29,9 +29,6 @@ log_out              = Log4r::RollingFileOutputter.new('test_log' ,
                                :maxsize => 10485760})
 log_out.level        = Log4r::INFO
 logger.outputters    = log_out
-#VasManager.logger    = logger
-#VasManager.user      = "admin"
-#VasManager.password  = "Password"
 
 OpenvasCli.configure { |config|
   config.password = "Password"

data/vas_test.rb

@@ -8,5 +8,6 @@ OpenvasCli.configure { |config|
 
 families = OpenvasCli::VasNVTFamily.get_all
 nvts = OpenvasCli::VasNVT.get_all(:family => families.choice.name)
-nvt = nvts.choice
-puts nvt.to_param
+nvts.each { |n|
+  puts "risk_factor => #{n.risk_factor}"
+}

metadata

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