norad_cli 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6845add9cfabc34338bc67744b6d3b4509f3a0bd
-  data.tar.gz: 870a0347fd4929e075c877eaec20034d3471317e
+  metadata.gz: 3f606aeaa79482bbf32e5d7f6afff6e1178a35a5
+  data.tar.gz: 2cd7aef8152ce1623e20bb82fc0670a309f1866c
 SHA512:
-  metadata.gz: 31bfb046789af2d16a86f912db431b5b10e4e9ec1b7fead6fd6be4db6841c04748d3c9cc5e7ee68d9ece1d606167cfaa9127864c5b44b6d59811450f9ffe4a30
-  data.tar.gz: 05d22bb8f7ff35bf7abd624003c2d023f9778370d791a6558b92296c48458a20a318a0a3d05609be97cb4a74d7dcde205c5a43b44c78d7c13ef499c1f066885c
+  metadata.gz: 6c461bd847cd10274b816ae1e29b9445e835315d85a296238f9649e809bddb86a20a4f221607be68a19fba687f04c3c919e07f37aa6239bcbd76b70359509be0
+  data.tar.gz: 9264b190fdcbc625b61101142690ce24e2ddbfeaeb55e550ca4fe08e2462ba0ea7baac90fb678f6e1205a265624fef1231a26c1c584ddc70a41ae70ff3efcdd6

data/lib/norad_cli/cli/sectest.rb

@@ -25,6 +25,13 @@ class Sectest < Thor
     # Check for the root_dir
     root_dir?
 
+    # Check for valid test types
+    if !%w(authenticated web_application brute_force ssl_crypto ssh_crypto whole_host).include?(options[:test_type])
+      say("#{options[:test_type]} is not a supported test type", :red)
+      say('Exiting...', :red)
+      exit(1)
+    end
+
     # Set options for templates
     options[:name] = sectest_name
     options[:spec_class_name] = sectest_name.split('-').map { |t| t =~ /\d+/ ? t : t.capitalize! }.join
@@ -149,6 +156,7 @@ class Sectest < Thor
 
   desc 'spec:image SECTESTNAME', 'Run the rspec tests for SECTESTNAME'
   option :verbose, aliases: '-v', type: :boolean, desc: 'Turn on verbose logging'
+  option :debug, aliases: '-d', type: :boolean, desc: 'Turn on debugging'
   define_method 'spec:image' do |name|
     # Check for the root_dir
     root_dir?
@@ -158,6 +166,10 @@ class Sectest < Thor
       ENV['ENABLE_LOGS'] = 'true'
     end
 
+    if options[:debug]
+      ENV['ENABLE_NORAD_DEBUG'] = 'true'
+    end
+
     ENV['SCAN_ASSESSMENT'] = 'true'
     ENV['TEST_RESULTS_SERVER_IMAGE'] = 'docker-images-test-results-server'
     ENV['UBUNTU_SSH_SERVER_IMAGE'] = 'docker-images-test-ubuntu-ssh-server'
@@ -168,7 +180,7 @@ class Sectest < Thor
 
   desc 'spec', 'Run all rspec tests for the entire repo (all sectests)'
   option :verbose, aliases: '-v', type: :boolean, default: false, desc: 'Turn on verbose logging'
-  option :scan_assessment, aliases: '-s', type: :boolean, default: true, desc: 'Fix me'
+  option :debug, aliases: '-d', type: :boolean, desc: 'Turn on debugging'
   def spec
     # Check for the root_dir
     root_dir?
@@ -239,7 +251,7 @@ class Sectest < Thor
     def root_dir?
       %w(base spec sectests).each do |dirrepo_name|
         if !File.exist?(dirrepo_name)
-          say("Commands must be run from the root directory\nExiting....", :red)
+          say("Commands must be run from the root of the test repository\nExiting....", :red)
           exit(1)
         end
       end

data/lib/norad_cli/templates/spec/spec_helper.rb

@@ -181,7 +181,10 @@ if ENV['SCAN_ASSESSMENT']
 
     define_method :stop_target_machine do |machine|
       machine.stop
-      machine.delete(force: true)
+      # Do not delete targets if debugging enabled
+      if !ENV['ENABLE_NORAD_DEBUG']
+        machine.delete(force: true)
+      end
       machine.id
     end
 

data/lib/norad_cli/templates/tool/wrapper.rb.erb

@@ -9,9 +9,12 @@ def run(args)
                               ['FIXME:TOOL_OPTION', 'FIXME:TOOL_OPTION', 'FIXME:TOOL_OPTION'].flatten,
                               timeout)
 
-  # Execute the runner
+  # Execute the runner, write output to a file, and process
   runner.execute
 
+  # Or Execute the runner and process stdout
+  # runner.execute(true)
+
   # Ensure the tool created results
   runner.parse_results do |fh|
     ############################

data/lib/norad_cli/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module NoradCli
-  VERSION = '0.1.6'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: norad_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Blake Hitchcock