openvas-cli 0.1.1 → 0.2.0

data/spec/openvas-cli/vas_target_spec.rb

@@ -1,39 +1,151 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'ipaddress'
 
-describe VasTarget do
-  it 'should get all available targets' do
-    targs = VasTarget.get_all
-    targs.count.should > 0
+module OpenvasCli
+  describe VasTarget do
+    before(:each) do
+      @valid_chars = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a',
+                     'b', 'c', 'd', 'e', 'f', 'A', 'B', 'C', 'D', 'E', 'F', '-']
+    end
     
-    targs.each { |t|
-      t.should be_valid
-    }
-  end
-  
-  it 'should require a non-empty vas_id' do
-    t = VasTarget.new
-    t.vas_id = ""
+    after(:each) do
+      all = VasTarget.get_all
+      
+      all.each { |t|
+        t.destroy! if t.name =~ /Test_.*/i
+      }
+    end
+
+    def valid_params
+      {
+        :name=>"Test_#{Time.now.strftime('%Y-%m-%d_%H:%M:%S')}",
+        :hosts => VasTarget.get_local_subnets
+      }
+    end
     
-    t.should_not be_valid
-  end
-  
-  it 'should require a valid UUID format' do
-    t = VasTarget.new
-    t.vas_id = "This is not a valid UUID"
+    it 'should get all available targets' do
+      targs = VasTarget.get_all
+      targs.count.should > 0
+      
+      targs.each { |t|
+        t.should be_valid
+      }
+    end
     
-    t.should_not be_valid
-    t.should have(1).errors
+    it 'should require a non-empty vas_id' do
+      t = VasTarget.new(valid_params)
+      t.id = ""
+      
+      t.should_not be_valid
+    end
     
-    valid_chars = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a',
-                   'b', 'c', 'd', 'e', 'f', 'A', 'B', 'C', 'D', 'E', 'F', '-']
+    it 'should require a valid UUID format' do
+      t = VasTarget.new(valid_params)
+      t.id = "This is not a valid UUID"
+      t.should_not be_valid
+      t.should have(1).errors
+      
+      1.upto(10) {
+        uuid = ''
+        1.upto(rand(40) + 1) {
+          uuid += @valid_chars[rand(@valid_chars.length)]
+        }
+        t.id = uuid
+        t.should be_valid
+      }
+    end
     
-    1.upto(10) {
-      uuid = ''
-      1.upto(rand(40) + 1) {
-        uuid += valid_chars[rand(valid_chars.length)]
+    it 'should generate a valid list of subnets' do
+      VasTarget.get_local_subnets.each { |sn|
+        net = IPAddress(sn)
+        net.should be_network
       }
-      t.vas_id = uuid
+    end
+    
+    it 'should create a new target if the id is empty' do
+      t = VasTarget.new(valid_params)
+      t.id = nil
+      t.save!
+      
+      t.id.should_not be nil
+      
+      n_t = VasTarget.get_all(:id => t.id)[0]
+      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
+  #    }
+    end
+    
+    it 'should record a change when the name has changed' do
+      t = VasTarget.new(valid_params)
+      
+      t.should_not be_changed
+      
+      t.name = "NEW NAME"
+      t.should be_changed
+    end
+    
+    it 'should record a change when the comment has changed' do
+      t = VasTarget.new(valid_params)
+      t.should_not be_changed
+      
+      t.comment = "NEW COMMENT"
+      t.should be_changed
+    end
+    
+    it 'should record a change when the hosts have been re-assigned' do
+      t = VasTarget.new(valid_params)
+      t.should_not be_changed
+      
+      t.hosts = ['10.10.10.0/24', '192.168.1.0/24']
+      t.should be_changed
+    end
+    
+    it 'should record a change when a host has been added' do
+      t = VasTarget.new(valid_params)
+      t.should_not be_changed
+      
+      t.hosts << "10.10.10.0/24"
+      t.should be_changed
+    end
+    
+    it 'should record a change when a host has been removed' do
+      t = VasTarget.new(valid_params.merge({:hosts => ['10.10.10.0/24', '192.168.1.0/24']}))
       t.should be_valid
-    }
+      t.should have(2).hosts
+      
+      t.hosts.delete_if { |h| h == '192.168.1.0/24'}
+      t.should have(1).hosts
+      
+      t.should be_changed
+    end
+    
+    it 'should create a new target and delete the old one when something has changed.' do
+      t = VasTarget.new(valid_params)
+      t.save!
+      org_id = t.id
+      
+      t.hosts = ['10.10.10.0/24', '192.168.1.0/24']
+      t.save!
+      
+      t.id.should_not == org_id
+      
+      srch = VasTarget.get_all(:id => org_id)
+      srch.should_not be nil
+      srch.size.should == 0
+    end
+    
+    it 'should show a change when a new credential is added' do
+      t = VasTarget.new(valid_params)
+      t.credentials[:ssh] = VasLscCredential.new(:name => "Test_login", 
+                                                 :login => "myLogin",
+                                                 :comment => "Should never be saved", 
+                                                 :password => "reallyBadPassword")
+                                                 
+      t.should be_changed
+    end
   end
 end

data/spec/openvas-cli/vas_task_spec.rb

@@ -1,19 +1,100 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe 'VasTask' do
-  it 'should pull all tasks' do
-    tasks = VasTask.get_all
+module OpenvasCli
+  describe VasTask do
+    after(:each) do
+      all = VasTask.get_all
+      all.each { |t| t.destroy! if t.name =~ /Test_.*/i }
+      
+      all = VasTarget.get_all
+      all.each { |t| t.destroy! if t.name =~ /Target_Test_.*/i }
+    end
     
-    tasks.should_not be nil
+    def valid_params
+      {
+        :name => "Test_#{Time.now.strftime('%Y-%m-%d_%H:%M:%S')}",
+        :config_id => get_config_id, 
+        :target_id => get_target_id, 
+        :schedule => VasSchedule.new(schedule_params)
+      }
+    end
     
-    tasks.each { |t| t.should be_valid }
-  end
-  
-  it 'should pull a single task given the task_id' do
-    task = VasTask.get_all[0]
+    def schedule_params
+      {
+        :name => "Test_#{Time.now.strftime('%Y-%m-%d_%H:%M:%S')}", 
+        :comment => "Test Schedule [Automatically Generated]", 
+        :first_time => Time.now + 86400,
+        :period => VasPeriod.new(:number => 1, :period => :day)
+      }
+    end
+    
+    def get_config_id
+      VasConfig.get_all.choice.id
+    end
+    
+    def get_target_id
+      targs = VasTarget.get_all
+      if targs.count == 0 
+        t = VasTarget.create!(valid_target_params)
+      else
+        t = targs.choice
+      end
+      
+      t.id
+    end
+    
+    def valid_target_params
+      {
+        :name  => "Test_Target_#{Time.now.strftime('%Y-%m-%d_%H:%M:%S')}",
+        :hosts => VasTarget.get_local_subnets
+      }
+    end
+    
+    it 'should create a valid task' do
+      t = VasTask.new(valid_params)
+      t.should be_valid
+    end
+
+    it 'should pull all tasks' do
+      tasks = VasTask.get_all
+      
+      tasks.should_not be nil
+      
+      tasks.each { |t| t.should be_valid }
+    end
+    
+    it 'should create a task' do
+      t = VasTask.new(valid_params)
+      t.save!
+      
+      t.id.should_not be nil
+      t.id.should_not be_empty
+      
+      new_t = VasTask.get_all(:id => t.id)[0]    
+      new_t.should_not be nil
+      
+      new_t.name.should == t.name
+      new_t.config_id.should == t.config_id
+      new_t.target_id.should == t.target_id
+      
+      new_t.destroy!
+    end
     
-    new_task = VasTask.get_all(:task_id => task.task_id)[0]
+    it 'should pull a single task given the task_id' do
+      all = VasTask.get_all
+      
+      if all.length > 0
+        task = all[0]
+      
+        new_task = VasTask.get_all(:task_id => task.task_id)[0]
+        
+        task.task_id.should == new_task.task_id
+      end
+    end
     
-    task.task_id.should == new_task.task_id
+    it 'should start a new task and run it to the end'
+    it 'should stop a task completely'
+    it 'should pause a task and restart it'
+    it 'should report the progress of a task'
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,11 @@
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'openvas-cli')))
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'rspec'
-require 'openvas-cli'
 require 'log4r'
+require 'fileutils'
+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,
@@ -18,13 +20,21 @@ end
 # Set the client and logger up to meet your needs.  Be careful if you set the 
 # log level to Log4r::DEBUG.  This will cause A LOT of information to be dumped
 # to file.
+log_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "log"))
+FileUtils.mkdir(log_dir) unless File.exists?(log_dir)
 logger               = Log4r::Logger.new 'test_log'
 log_file             = File.expand_path(File.join(File.dirname(__FILE__), '..', 'log', 'test.log'))
 log_out              = Log4r::RollingFileOutputter.new('test_log' , 
                               {:filename => log_file.to_s,
                                :maxsize => 10485760})
-log_out.level        = Log4r::WARN
+log_out.level        = Log4r::INFO
 logger.outputters    = log_out
-OpenvasCli.logger    = logger
-OpenvasCli.user      = "admin"
-OpenvasCli.password  = "Password"
+#VasManager.logger    = logger
+#VasManager.user      = "admin"
+#VasManager.password  = "Password"
+
+OpenvasCli.configure { |config|
+  config.password = "Password"
+}
+
+OpenvasCli.logger = logger

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openvas-cli
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Reed Swenson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 -06:00
+date: 2011-03-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,8 +31,8 @@ dependencies:
         - 0
         - 5
         version: 3.0.5
-  version_requirements: *id001
   name: activesupport
+  version_requirements: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -47,12 +47,28 @@ dependencies:
         - 0
         - 5
         version: 3.0.5
-  version_requirements: *id002
   name: activerecord
+  version_requirements: *id002
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 3
+        - 0
+        - 5
+        version: 3.0.5
+  name: rails
+  version_requirements: *id003
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,12 +79,28 @@ dependencies:
         - 4
         - 4
         version: 1.4.4
-  version_requirements: *id003
   name: nokogiri
+  version_requirements: *id004
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
+        version: 0.7.0
+  name: ipaddress
+  version_requirements: *id005
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,12 +111,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  version_requirements: *id004
   name: rspec
+  version_requirements: *id006
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,12 +127,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id005
   name: bundler
+  version_requirements: *id007
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,12 +143,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  version_requirements: *id006
   name: jeweler
+  version_requirements: *id008
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -125,12 +157,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
   name: rcov
+  version_requirements: *id009
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -139,12 +171,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id008
   name: ZenTest
+  version_requirements: *id010
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -153,8 +185,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id009
   name: log4r
+  version_requirements: *id011
   prerelease: false
 description: A full ruby implementation of the OpenVAS OMP (version 2.0) protocol.
 email: fleureed@gmail.com
@@ -177,24 +209,37 @@ files:
 - features/openvas-cli.feature
 - features/step_definitions/openvas-cli_steps.rb
 - features/support/env.rb
+- lib/openvas-cli/configuration.rb
+- lib/openvas-cli/conn_addin.rb
+- lib/openvas-cli/immutable_children_validator.rb
 - lib/openvas-cli/oid_validator.rb
-- lib/openvas-cli/openvas-cli.rb
 - lib/openvas-cli/uuid_validator.rb
+- lib/openvas-cli/vas_administrator.rb
 - lib/openvas-cli/vas_base.rb
+- lib/openvas-cli/vas_config.rb
+- lib/openvas-cli/vas_connection.rb
 - lib/openvas-cli/vas_exceptions.rb
+- lib/openvas-cli/vas_lsc_credential.rb
 - lib/openvas-cli/vas_nvt.rb
 - lib/openvas-cli/vas_nvt_family.rb
 - lib/openvas-cli/vas_override.rb
+- lib/openvas-cli/vas_period.rb
 - lib/openvas-cli/vas_preference.rb
 - lib/openvas-cli/vas_report.rb
 - lib/openvas-cli/vas_result.rb
 - lib/openvas-cli/vas_schedule.rb
 - lib/openvas-cli/vas_target.rb
 - lib/openvas-cli/vas_task.rb
+- lib/openvas-cli/vas_task_progress.rb
+- lib/openvas-cli/xml_addin.rb
+- lib/openvas_cli.rb
 - openvas-cli.gemspec
-- spec/openvas-cli/openvas-cli_spec.rb
+- spec/openvas-cli/vas_administrator_spec.rb
+- spec/openvas-cli/vas_config_spec.rb
+- spec/openvas-cli/vas_lsc_credential_spec.rb
 - spec/openvas-cli/vas_nvt_family_spec.rb
 - spec/openvas-cli/vas_nvt_spec.rb
+- spec/openvas-cli/vas_period_spec.rb
 - spec/openvas-cli/vas_preference_spec.rb
 - spec/openvas-cli/vas_report_spec.rb
 - spec/openvas-cli/vas_result_spec.rb
@@ -232,14 +277,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A full ruby implementation of the OpenVAS OMP (version 2.0) protocol.
 test_files: 
-- spec/openvas-cli/openvas-cli_spec.rb
+- spec/openvas-cli/vas_administrator_spec.rb
+- spec/openvas-cli/vas_config_spec.rb
+- spec/openvas-cli/vas_lsc_credential_spec.rb
 - spec/openvas-cli/vas_nvt_family_spec.rb
 - spec/openvas-cli/vas_nvt_spec.rb
+- spec/openvas-cli/vas_period_spec.rb
 - spec/openvas-cli/vas_preference_spec.rb
 - spec/openvas-cli/vas_report_spec.rb
 - spec/openvas-cli/vas_result_spec.rb