metasploit-runner 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c64681c2203eed651d897863f6acd420abed4d9
-  data.tar.gz: 68228e2fe22e7bea7358d0a25bfb03aa85bbdf28
+  metadata.gz: 44b990805ebdd61623403a4830225f3d9bdaa3f9
+  data.tar.gz: 71522f5c6ae49c2595d018d43fc179bb7864339c
 SHA512:
-  metadata.gz: 773aa5020c5fd2b2b930e42a89df9b633bbed3d908c76510e5bb31f9719c221129bd6d2a3c4af724a29626b8ffcb462045f86babef3c776f02c90cfd300fa214
-  data.tar.gz: b5f95158a6bd8a2a7cfed821ce152819b0c788318ce41e26e900d8b8e8432e815e29ece8f75f4fffdf1f582eb5094eb692bb94fff04dafcbcd00e69d0fe8e55e
+  metadata.gz: 2ba81f7d13ec19e6ff343c076d59b3f94997030569afc75cba1da50725fb250aec9f78efe4629297b0055141630103ac144207fe16164208c38e0a5f173cfb55
+  data.tar.gz: c8619e0b553700d9b79d2a6380c3bd42ac04caaa82eeab382fe65d2ab7c0de91c2d21c56fb0ff1839bd9946bb0eaaa7879f5be98c54dec160e40440e5f1756cb

data/MetasploitPenTestScript.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'msfrpc-client', '1.0.2'
+  spec.add_dependency 'msfrpc-client', '1.1.1'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/bin/exploit

@@ -17,7 +17,8 @@ if ARGV.grep(/^--/).empty?
       'use_os_filter' => ARGV[8],
       'module_filter' => ARGV[9],
       'report_type' => ARGV[10],
-      'whitelist_hosts' => ARGV[11]
+      'whitelist_hosts' => ARGV[11],
+      'ssl_version' => ARGV[12]
   })
 else
   Metasploit::Exploit.start(ARGV)

data/config/exploit.yml.example

@@ -2,6 +2,7 @@ connection_url: 'sploit.mydomain.com'
 port: '3790'
 uri: '/api/1.0'
 use_ssl: 'true'
+ssl_version: 'TLS1'
 token: 'asdlkjhsdfuw1228340asdasf8'
 workspace_name: 'mycoolsoftware-build-28'
 nexpose_console_name: 'nexpose-console-1'

data/lib/MetasploitPenTestScript/version.rb

@@ -1,3 +1,3 @@
 module MetasploitPenTestScript
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/metasploit/command_line_argument_parser.rb

@@ -4,6 +4,7 @@ class CommandLineArgumentParser
   def self.parse(args)
     options = {}
     options['use_ssl'] = false
+    options['ssl_version'] = 'TLS1'
     options['use_os_filter'] = false
     options['exploit_speed'] = 5
     options['limit_sessions'] = false
@@ -28,6 +29,10 @@ class CommandLineArgumentParser
         options['use_ssl'] = true
       end
 
+      opts.on('--ssl-version SSL-VERSION', 'SSL Version when using SSL') do |ssl_version|
+        options['ssl_version'] = ssl_version
+      end
+
       opts.on('--token TOKEN', 'Access token for Metasploit') do |token|
         options['token'] = token
       end

data/lib/metasploit/constants.rb

@@ -3,6 +3,7 @@ module CONSTANTS
   DEFAULT_URI = '/api/1.0'
   DEFAULT_SSL = true
   DEFAULT_OS_FILTER = false
+  DEFAULT_SSL_VERSION = 'TLS1'
   RUNNING_IMPORT_STATUS = 'running'
   EXPLOIT_RUNNING_MESSAGE = 'running'
   REQUIRED_TOKEN_MESSAGE = 'PWNED! Token is required'
@@ -13,6 +14,7 @@ module CONSTANTS
   SUCCESSFUL_CONNECTION_MESSAGE = '[*] Sucessfully authenticated to the Metasploit server'
   USING_DEFAULT_SSL_MESSAGE = '[*] Using SSL=TRUE'
   IMPORTING_DATA_MESSAGE = '[*] Importing scan data from Nexpose...'
+  DISCOVER_MESSAGE = '[*] Discovering all your things with Discover...'
   SCANNING_MESSAGE = '[*] Scanning all your things with WebScan...'
   AUDIT_MESSAGE = '[*] Performing web audit...'
   EXPLOIT_MESSAGE = '[*] Exploiting all your things...'
@@ -24,4 +26,4 @@ module CONSTANTS
   USING_MODULE_FILTER = '[*] Filtering exploits based on your desired modules'
   NO_MODULE_FILTER = '[*] Not filtering any modules'
   NO_REPORT_TYPE_MESSAGE = 'No report type specified - skipping report generation'
-end
+end

data/lib/metasploit/exploit.rb

@@ -36,6 +36,9 @@ module Metasploit
 
       if run_details.nexpose_console_name.nil? || run_details.nexpose_console_name.empty?
         puts CONSTANTS::SKIPPING_IMPORT_MESSAGE
+        discover = rpc_client.call('pro.start_discover', run_details.get_discover_options)
+
+        wait_for_task_to_stop_running(rpc_client, CONSTANTS::DISCOVER_MESSAGE, discover['task_id'])
       else
         import = rpc_client.call('pro.start_import', {'workspace' => run_details.workspace_name, 'DS_NEXPOSE_CONSOLE' => run_details.nexpose_console_name, 'DS_NEXPOSE_SITE' => run_details.workspace_name})
         wait_for_task_to_stop_running(rpc_client, CONSTANTS::IMPORTING_DATA_MESSAGE, import['task_id'])

data/lib/metasploit/exploit_run_description.rb

@@ -6,10 +6,12 @@ class ExploitRunDescription
     :port,
     :uri,
     :use_ssl,
+    :ssl_version,
     :token,
     :workspace_name,
     :nexpose_console_name,
     :device_ip_to_scan,
+    :raw_device_ip_to_scan,
     :use_os_filter,
     :module_filter,
     :report_type,
@@ -20,6 +22,7 @@ class ExploitRunDescription
   @@port_value = ''
   @@uri_value = ''
   @@use_ssl_value = ''
+  @@ssl_version = ''
   @@device_ip_to_scan_value = ''
   @@use_os_filter_value = ''
 
@@ -34,10 +37,12 @@ class ExploitRunDescription
     @@port_value = options['port']
     @@uri_value = options['uri']
     @@use_ssl_value = options['use_ssl']
+    @@ssl_version = options['ssl_version']
     self.token = options['token']
     self.workspace_name = options['workspace_name']
     self.nexpose_console_name = options['nexpose_console_name']
     @@device_ip_to_scan_value = options['device_ip_to_scan']
+    self.raw_device_ip_to_scan = options['device_ip_to_scan']
     self.use_os_filter = options['use_os_filter']
     self.module_filter = options['module_filter']
     self.report_type = options['report_type']
@@ -59,7 +64,7 @@ class ExploitRunDescription
      :token => self.token,
      :uri => self.uri,
      :ssl => self.use_ssl,
-     :ssl_version => 'TLS1'
+     :ssl_version => self.ssl_version
     }
   end
 
@@ -98,7 +103,14 @@ class ExploitRunDescription
         'report_type' => self.report_type,
         'created_by' => self.workspace_name,
         'file_formats' => [:pdf],
-        'DS_WHITELIST_HOSTS' => self.device_ip_to_scan
+        'included_addresses' => self.whitelist_hosts
+    }
+  end
+
+  def get_discover_options
+    {
+        'workspace' => self.workspace_name,
+        'ips' => [self.raw_device_ip_to_scan]
     }
   end
 
@@ -141,6 +153,14 @@ class ExploitRunDescription
     (@@use_ssl_value != false) ? true : false
   end
 
+  def ssl_version=(value)
+    @@ssl_version = value
+  end
+
+  def ssl_version
+    get_value(@@ssl_version, CONSTANTS::DEFAULT_SSL_VERSION)
+  end
+
   def use_os_filter=(value)
     @@use_os_filter_value = value
   end

data/spec/command_line_argument_parser_spec.rb

@@ -9,6 +9,7 @@ describe 'command_line_argument_parser' do
         '--port' => '1234',
         '--token' => 'testtoken',
         '--use-ssl' => nil,
+        '--ssl-version' => 'TLS1',
         '--use-os-filter' => nil,
         '--module-filter' => 'exploit/blah1,exploit/blah2',
         '--report-type' => 'fisma',
@@ -45,6 +46,16 @@ describe 'command_line_argument_parser' do
       expect(@command_line_argument_parser['use_ssl']).to eq(false)
     end
 
+    it 'should parse --ssl-version' do
+      expect(@command_line_argument_parser['ssl_version']).to eq(@expected_arguments['--ssl-version'])
+    end
+
+    it 'should pick appropriate default when --ssl-version not present' do
+      @expected_arguments.delete '--ssl-version'
+      @command_line_argument_parser = CommandLineArgumentParser.parse(hash_to_array(@expected_arguments))
+      expect(@command_line_argument_parser['ssl_version']).to eq('TLS1')
+    end
+
     it 'should parse --use-os-filter' do
       expect(@command_line_argument_parser['use_os_filter']).to eq(true)
     end

data/spec/exploit_run_description_spec.rb

@@ -30,6 +30,7 @@ describe 'exploit_run_description' do
         'port' => @expected_port,
         'uri' => @expected_uri,
         'use_ssl' => @expected_ssl,
+        'ssl_version' => @expected_tls,
         'token' => @expected_token,
         'workspace_name' => @expected_workspace_name,
         'nexpose_console_name' => @expected_nexpose_console_name,
@@ -48,6 +49,7 @@ describe 'exploit_run_description' do
       expect(@exploit_run_description.port).to eq(@expected_port)
       expect(@exploit_run_description.uri).to eq(@expected_uri)
       expect(@exploit_run_description.use_ssl).to eq(@expected_ssl)
+      expect(@exploit_run_description.ssl_version).to eq(@expected_tls)
       expect(@exploit_run_description.token).to eq(@expected_token)
       expect(@exploit_run_description.workspace_name).to eq(@expected_workspace_name)
       expect(@exploit_run_description.nexpose_console_name).to eq(@expected_nexpose_console_name)
@@ -98,6 +100,16 @@ describe 'exploit_run_description' do
       expect(@exploit_run_description.use_ssl).to eq(CONSTANTS::DEFAULT_SSL)
     end
 
+    it 'should use TLS1 as default if empty string' do
+      @exploit_run_description.ssl_version = ''
+      expect(@exploit_run_description.ssl_version).to eq(CONSTANTS::DEFAULT_SSL_VERSION)
+    end
+
+    it 'should use TLS1 as default if nil is passed' do
+      @exploit_run_description.ssl_version = nil
+      expect(@exploit_run_description.ssl_version).to eq(CONSTANTS::DEFAULT_SSL_VERSION)
+    end
+
     it 'should return false on the SSL Option if false is passed' do
       @exploit_run_description.use_ssl = false
       expect(@exploit_run_description.use_ssl).to eq(false)

data/spec/exploit_spec.rb

@@ -44,6 +44,7 @@ describe 'exploit' do
         'port' => @expected_port,
         'uri' => @expected_uri,
         'use_ssl' => @expected_ssl,
+        'ssl_version' => @expected_ssl_version,
         'token' => @expected_token,
         'workspace_name' => @expected_workspace_name,
         'nexpose_console_name' => @expected_nexpose_console_name,
@@ -68,6 +69,7 @@ describe 'exploit' do
           '--device-ip-to-scan' => '1.2.3.4',
           '--whitelist-hosts' => '1.2.3.0/24',
           '--exploit-speed' => '200',
+          '--ssl-version' => 'TLS1'
       }
     end
 
@@ -340,7 +342,7 @@ describe 'exploit' do
                                      'report_type' => @expected_report_type,
                                      'created_by' => @expected_workspace_name,
                                      'file_formats' => [:pdf],
-                                     'DS_WHITELIST_HOSTS' => @mock_device_url_to_scan,
+                                     'included_addresses' => @mock_whitelist_hosts,
                                     })
 
         Metasploit::Exploit.start(@options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-runner
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Nathan Gibson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msfrpc-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Script to run automated Metaspolit Penetration Tests.