metasploit-runner 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb7b6b62a5e127e5a84acc2e2b558919aa22e67c
-  data.tar.gz: 6acd00b0c82e833ac3a5fe1649d5f23e66c4fe26
+  metadata.gz: ed708546d491150bc795b5633b9359043c960ce3
+  data.tar.gz: cfeda943c27e25482178e6d466ec539e1da30f19
 SHA512:
-  metadata.gz: 559b8ed2e5a55f2ecdbfe9fbed0f86962205c69badc98e86bbfbc7042f388fceed5037464ff0d52b0e82f7bcd04049f0e47de7b7345bf9f19a99d950371beee6
-  data.tar.gz: 4d0ffb3a6b65c0ae1bf2569094e5993787c632e8d5b299e2ce660dbcb7b7fc7fdc23a4ece5a971da28758ffecf68ff32375b4b517e9cae58df297302849fb987
+  metadata.gz: 9f01160bb2c7fcb6ba1e5d4893f094ef2c7c204c8647c19a98e40d976674884d3c36590fe31ffc1f8554c0b73a2d082f9bdb159ae729417089a23c08e6ff747c
+  data.tar.gz: 3e0c5d8f5b832d482f97bf3721f6a157d2100123a5d18d7aace600a39866c29c4217b47ebf606e97b06aa3f2bc2803a3ad60d1ca423bb1cf524d087eec57b6f3

data/lib/MetasploitPenTestScript/version.rb

@@ -1,3 +1,3 @@
 module MetasploitPenTestScript
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/lib/metasploit/exploit.rb

@@ -50,17 +50,13 @@ module Metasploit
     end
 
     def self.do_metasploit_audit(rpc_client, run_details)
-
       audit = rpc_client.call('pro.start_webaudit', run_details.get_audit_options)
 
-
       wait_for_task_to_stop_running(rpc_client, CONSTANTS::AUDIT_MESSAGE, audit['task_id'])
     end
 
     def self.do_metasploit_exploit(rpc_client, run_details)
-
-
-      if run_details.use_os_filter == true
+      if run_details.use_os_filter
         puts CONSTANTS::USING_OS_FILTER_MESSAGE
       else
         puts CONSTANTS::NO_OS_FILTER

data/lib/metasploit/exploit_run_description.rb

@@ -15,7 +15,7 @@ class ExploitRunDescription
     self.workspace_name = workspace_name
     self.nexpose_console_name = nexpose_console_name
     @@device_ip_to_scan_value = device_ip_to_scan
-    @@use_os_filter_value = use_os_filter
+    self.use_os_filter = use_os_filter
   end
 
   def verify
@@ -91,7 +91,7 @@ class ExploitRunDescription
   end
 
   def use_os_filter
-    (@@use_os_filter_value == false) ? false : true
+    self.to_bool(@@use_os_filter_value)
   end
 
 
@@ -99,4 +99,8 @@ class ExploitRunDescription
     (value_to_check.nil? || value_to_check.empty?) ? default : value_to_check
   end
 
+  def to_bool(str)
+    str == 'true'
+  end
+
 end

data/spec/exploit_run_description_spec.rb

@@ -8,7 +8,7 @@ describe 'exploit_run_description' do
       @expected_port = '3791'
       @expected_uri = '/api/1.1'
       @expected_ssl = false
-      @expected_os_filter = true
+      @expected_os_filter = false
       @expected_workspace_name = 'workspacename'
       @expected_nexpose_console_name = 'nexpose_console_name'
       @expected_webscan_task_id = '12'

data/spec/exploit_spec.rb

@@ -12,8 +12,8 @@ describe 'exploit' do
       @expected_port = '3791'
       @expected_uri = '/api/1.1'
       @expected_ssl = false
-      @expected_use_os_filter = true
-      @expected_no_os_filter = false
+      @expected_use_os_filter = false
+      @expected_no_os_filter = true
       @expected_workspace_name = 'workspacename'
       @expected_nexpose_console_name = 'nexpose_console_name'
       @expected_webscan_task_id = '12'
@@ -319,7 +319,7 @@ describe 'exploit' do
                                                                 "DS_LimitSessions" => @expected_session_limit,
                                                                 "DS_MATCH_VULNS" => @expected_match_vulns,
                                                                 "DS_MATCH_PORTS" => @expected_match_ports,
-                                                                "DS_FilterByOS" =>  true})
+                                                                "DS_FilterByOS" =>  @expected_use_os_filter})
 
         Metasploit::Exploit.start(@expected_connection, @expected_port, @expected_uri, @expected_ssl,  @expected_token, @expected_workspace_name, @expected_nexpose_console_name, @mock_device_ip_to_scan, true)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-runner
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Nathan Gibson