norad_cli 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d75304010117d3484f9e1d7828b0d09335131d48
-  data.tar.gz: 7e79b1b5f11ffbf988248644102a1d1b6f13b52a
+  metadata.gz: c76972ccc6770677c3120ed70cd195c043141647
+  data.tar.gz: c58525f06bafa832759511b0178a46c677168981
 SHA512:
-  metadata.gz: e0c87d8f23fa01e5fcae0355bc5886d4c3e4e3e4a5822542ccd2adb895a78711857cf81df6e259696161b656db14b65dfffec84928ce1007c26356c7bc8dbc73
-  data.tar.gz: b60aa8a94481885057e0b8e9913c971197c3b2b6fb819f15655ee3b99b5a969b2e156ae7ef63693fe270743fa69f02dba693b2e4019fd9383b54e24e76595990
+  metadata.gz: 8d476040efc1bef4484ec3791433741cbd7c8d52974b3187cf44ffa7712f4709338e36c4c8c7029b883e2647bfd9eda83216e8fdf112f5cba6981cf92b33cc2d
+  data.tar.gz: c542973a351aec58583a7badb70df367f286152be2ce0e1203ae4dc8228283505336bc04ab8104a6ad92c32539b0fa1a2f2190a9bf6c6547fb38462c22122890

data/lib/norad_cli/support/sectest_container.rb

@@ -11,6 +11,7 @@ module NoradCli
     attr_accessor :sectest_image
     attr_accessor :results_server
     attr_accessor :debug
+    attr_reader   :sectest_options
 
     def initialize(sectest_name, registry, version, options)
       # Generate a random assessment id
@@ -47,10 +48,11 @@ module NoradCli
       end
 
       # Load the prog_arg format
-      sectest_options ||= YAML.safe_load(File.read("sectests/#{sectest_name}/manifest.yml"))
+      @sectest_options ||= YAML.safe_load(File.read("sectests/#{sectest_name}/manifest.yml"))
 
-      # Load an ssh key if necess
-      prog_arg_hash[:ssh_key] = load_ssh_key(prog_arg_hash[:ssh_key]) if prog_arg_hash.key?(:ssh_key)
+      # Load an ssh key if necessary (default to Norad's key pair)
+      prog_arg_hash[:ssh_user] = 'testuser' if !prog_arg_hash[:ssh_user] && progarg_present?('ssh_user')
+      prog_arg_hash[:ssh_key] = load_ssh_key(prog_arg_hash[:ssh_key]) if progarg_present?('ssh_key')
 
       # Fill out the prog_args and return
       begin
@@ -65,6 +67,10 @@ module NoradCli
       end
     end
 
+    def progarg_present?(key)
+      sectest_options['prog_args'].include?("{#{key}}")
+    end
+
     def start
       # Start the results server container
       @results_server.start
@@ -123,7 +129,10 @@ module NoradCli
 
     # Replace ssh key file with encoded ssh key
     def load_ssh_key(ssh_key_file)
-      if File.exist?(ssh_key_file)
+      # Check for no ssh_key specified
+      if !ssh_key_file
+        Base64.strict_encode64(File.read(NoradCli.ssh_key_path))
+      elsif File.exist?(ssh_key_file)
         Base64.strict_encode64(File.read(ssh_key_file))
       else
         puts Rainbow("Error: SSH Key file: #{ssh_key_file} does not exist!\nExiting..\n").red

data/lib/norad_cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: norad_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Blake Hitchcock
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git