Merge branch 'master' into land-8293-multi-railgun

Author: Brent Cook

.dockerignore

@@ -5,6 +5,10 @@ docker-compose*.yml
 docker/
 !docker/msfconsole.rc
 README.md
+.git/
+.github/
+.ruby-version
+.ruby-gemset
 
 .bundle
 Gemfile.local
@@ -93,3 +97,6 @@ data/meterpreter/ext_server_pivot.*.dll
 # https://rapid7.github.io/metasploit-framework. It's an orphan branch.
 /metakitty
 .vagrant
+
+# no need for rspecs
+spec/

.gitignore

@@ -88,3 +88,6 @@ data/meterpreter/ext_server_pivot.*.dll
 
 # local docker compose overrides
 docker-compose.local*
+
+# Ignore python bytecode
+*.pyc

.travis.yml

@@ -16,12 +16,15 @@ rvm:
   - '2.4.1'
 
 env:
-  - RAKE_TASKS="cucumber cucumber:boot" CREATE_BINSTUBS=true
-  - RAKE_TASKS=spec SPEC_OPTS="--tag content"
-  - RAKE_TASKS=spec SPEC_OPTS="--tag ~content"
+  - CMD=bundle exec rake "cucumber cucumber:boot" CREATE_BINSTUBS=true
+  - CMD=bundle exec rake spec SPEC_OPTS="--tag content"
+  - CMD=bundle exec rake spec SPEC_OPTS="--tag ~content"
 
 matrix:
   fast_finish: true
+  include:
+  - rvm: ruby-head
+    env: CMD="docker-compose -f $TRAVIS_BUILD_DIR/docker-compose.yml build"
 before_install:
   - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
   - rake --version
@@ -36,7 +39,7 @@ before_script:
   - bundle exec rake db:migrate
 script:
   # fail build if db/schema.rb update is not committed
-  - git diff --exit-code db/schema.rb && bundle exec rake $RAKE_TASKS
+  - git diff --exit-code db/schema.rb && $CMD
 
 notifications:
   irc: "irc.freenode.org#msfnotify"
@@ -49,3 +52,6 @@ branches:
   except:
     - gh-pages
     - metakitty
+
+services:
+  - docker

Gemfile.lock

@@ -1,13 +1,13 @@
 GIT
   remote: https://github.com/WinRb/rubyntlm
-  revision: 7e2daf6076ba55a435d3e345498a7df40faa3d49
+  revision: 38aaf1d59dd1a443e4a9c0aea2be232cfe262772
   branch: master
   specs:
-    rubyntlm (0.6.1)
+    rubyntlm (0.6.2)
 
 GIT
   remote: https://github.com/banister/method_source
-  revision: 6dcb116e37e20e58f615ffe05a40bbe9a536e44a
+  revision: 0cc6cc8e15d08880585e8cb0c54e13c3cf937c54
   branch: master
   specs:
     method_source (0.8.1)
@@ -31,7 +31,7 @@ GIT
 PATH
   remote: .
   specs:
-    metasploit-framework (4.14.15)
+    metasploit-framework (4.14.17)
       actionpack (~> 4.2.6)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -44,9 +44,9 @@ PATH
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 1.2.24)
+      metasploit-payloads (= 1.2.28)
       metasploit_data_models
-      metasploit_payloads-mettle (= 0.1.8)
+      metasploit_payloads-mettle (= 0.1.9)
       msgpack
       nessus_rest
       net-ssh
@@ -56,7 +56,7 @@ PATH
       octokit
       openssl-ccm
       openvas-omp
-      packetfu (= 1.1.13.pre)
+      packetfu
       patch_finder
       pcaprub
       pg
@@ -136,7 +136,7 @@ GEM
     bcrypt (3.1.11)
     bindata (2.4.0)
     builder (3.2.3)
-    capybara (2.13.0)
+    capybara (2.14.0)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -146,7 +146,7 @@ GEM
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.1)
-    contracts (0.15.0)
+    contracts (0.16.0)
     cucumber (2.4.0)
       builder (>= 2.1.2)
       cucumber-core (~> 1.5.0)
@@ -177,7 +177,7 @@ GEM
     ffi (1.9.18)
     filesize (0.1.1)
     fivemat (1.3.3)
-    gherkin (4.1.1)
+    gherkin (4.1.3)
     google-protobuf (3.2.0.2)
     googleauth (0.5.1)
       faraday (~> 0.9)
@@ -222,7 +222,7 @@ GEM
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-payloads (1.2.24)
+    metasploit-payloads (1.2.28)
     metasploit_data_models (2.0.14)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -233,7 +233,7 @@ GEM
       postgres_ext
       railties (~> 4.2.6)
       recog (~> 2.0)
-    metasploit_payloads-mettle (0.1.8)
+    metasploit_payloads-mettle (0.1.9)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
@@ -254,7 +254,7 @@ GEM
     openssl-ccm (1.2.1)
     openvas-omp (0.0.4)
     os (0.9.6)
-    packetfu (1.1.13.pre)
+    packetfu (1.1.13)
       pcaprub
     patch_finder (1.0.2)
     pcaprub (0.12.4)
@@ -283,7 +283,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
     rb-readline (0.5.4)
-    recog (2.1.5)
+    recog (2.1.6)
       nokogiri
     redcarpet (3.4.0)
     rex-arch (0.1.4)
@@ -299,7 +299,7 @@ GEM
       metasm
       rex-arch
       rex-text
-    rex-exploitation (0.1.12)
+    rex-exploitation (0.1.13)
       jsobfu
       metasm
       rex-arch
@@ -312,7 +312,7 @@ GEM
       rex-arch
     rex-ole (0.1.5)
       rex-text
-    rex-powershell (0.1.70)
+    rex-powershell (0.1.71)
       rex-random_identifier
       rex-text
     rex-random_identifier (0.1.2)
@@ -333,23 +333,23 @@ GEM
       rex-text
     rkelly-remix (0.0.7)
     robots (0.10.1)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     ruby_smb (0.0.12)
       bindata
       rubyntlm
@@ -383,7 +383,7 @@ GEM
     xmlrpc (0.3.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yard (0.9.8)
+    yard (0.9.9)
 
 PLATFORMS
   ruby

LICENSE_GEMS

@@ -1,3 +1,4 @@
+This file is auto-generated by tools/dev/update_gem_licenses.sh
 actionpack, 4.2.8, MIT
 actionview, 4.2.8, MIT
 activemodel, 4.2.8, MIT
@@ -8,14 +9,14 @@ arel, 6.0.4, MIT
 arel-helpers, 2.3.0, unknown
 aruba, 0.14.2, MIT
 bcrypt, 3.1.11, MIT
-bindata, 2.3.5, ruby
+bindata, 2.4.0, ruby
 bit-struct, 0.15.0, ruby
 builder, 3.2.3, MIT
 bundler, 1.14.6, MIT
-capybara, 2.13.0, MIT
+capybara, 2.14.0, MIT
 childprocess, 0.5.9, MIT
 coderay, 1.1.1, MIT
-contracts, 0.15.0, "Simplified BSD"
+contracts, 0.16.0, "Simplified BSD"
 cucumber, 2.4.0, MIT
 cucumber-core, 1.5.0, MIT
 cucumber-rails, 1.4.5, MIT
@@ -25,31 +26,31 @@ docile, 1.1.5, MIT
 erubis, 2.7.0, MIT
 factory_girl, 4.8.0, MIT
 factory_girl_rails, 4.8.0, MIT
-faraday, 0.12.0.1, MIT
+faraday, 0.12.1, MIT
 ffi, 1.9.18, "New BSD"
 filesize, 0.1.1, MIT
 fivemat, 1.3.3, MIT
-gherkin, 4.1.1, MIT
+gherkin, 4.1.3, MIT
 google-protobuf, 3.2.0.2, "New BSD"
 googleauth, 0.5.1, "Apache 2.0"
-grpc, 1.2.2, "New BSD"
+grpc, 1.2.5, "New BSD"
 i18n, 0.8.1, MIT
 jsobfu, 0.4.2, "New BSD"
-json, 2.0.3, ruby
+json, 2.1.0, ruby
 jwt, 1.5.6, MIT
 little-plugger, 1.1.4, MIT
-logging, 2.2.0, MIT
+logging, 2.2.2, MIT
 loofah, 2.0.3, MIT
 memoist, 0.15.0, MIT
 metasm, 1.0.3, LGPL
 metasploit-aggregator, 0.1.3, "New BSD"
 metasploit-concern, 2.0.3, "New BSD"
 metasploit-credential, 2.0.8, "New BSD"
-metasploit-framework, 4.14.9, "New BSD"
+metasploit-framework, 4.14.17, "New BSD"
 metasploit-model, 2.0.3, "New BSD"
-metasploit-payloads, 1.2.19, "3-clause (or ""modified"") BSD"
+metasploit-payloads, 1.2.28, "3-clause (or ""modified"") BSD"
 metasploit_data_models, 2.0.14, "New BSD"
-metasploit_payloads-mettle, 0.1.8, "3-clause (or ""modified"") BSD"
+metasploit_payloads-mettle, 0.1.9, "3-clause (or ""modified"") BSD"
 method_source, 0.8.1, MIT
 mime-types, 3.1, MIT
 mime-types-data, 3.2016.0521, MIT
@@ -68,7 +69,7 @@ octokit, 4.7.0, MIT
 openssl-ccm, 1.2.1, MIT
 openvas-omp, 0.0.4, MIT
 os, 0.9.6, MIT
-packetfu, 1.1.13.pre, BSD
+packetfu, 1.1.13, BSD
 patch_finder, 1.0.2, "New BSD"
 pcaprub, 0.12.4, LGPL-2.1
 pg, 0.20.0, "New BSD"
@@ -84,18 +85,18 @@ rails-html-sanitizer, 1.0.3, MIT
 railties, 4.2.8, MIT
 rake, 12.0.0, MIT
 rb-readline, 0.5.4, BSD
-recog, 2.1.5, unknown
+recog, 2.1.6, unknown
 redcarpet, 3.4.0, MIT
 rex-arch, 0.1.4, "New BSD"
 rex-bin_tools, 0.1.2, "New BSD"
 rex-core, 0.1.9, "New BSD"
 rex-encoder, 0.1.3, "New BSD"
-rex-exploitation, 0.1.12, "New BSD"
+rex-exploitation, 0.1.13, "New BSD"
 rex-java, 0.1.4, "New BSD"
 rex-mime, 0.1.4, "New BSD"
 rex-nop, 0.1.0, unknown
 rex-ole, 0.1.5, "New BSD"
-rex-powershell, 0.1.70, "New BSD"
+rex-powershell, 0.1.71, "New BSD"
 rex-random_identifier, 0.1.2, "New BSD"
 rex-registry, 0.1.2, "New BSD"
 rex-rop_builder, 0.1.2, "New BSD"
@@ -106,13 +107,13 @@ rex-text, 0.2.14, "New BSD"
 rex-zip, 0.1.2, "New BSD"
 rkelly-remix, 0.0.7, MIT
 robots, 0.10.1, MIT
-rspec-core, 3.5.4, MIT
-rspec-expectations, 3.5.0, MIT
-rspec-mocks, 3.5.0, MIT
-rspec-rails, 3.5.2, MIT
-rspec-support, 3.5.0, MIT
-ruby_smb, 0.0.8, "New BSD"
-rubyntlm, 0.6.1, MIT
+rspec-core, 3.6.0, MIT
+rspec-expectations, 3.6.0, MIT
+rspec-mocks, 3.6.0, MIT
+rspec-rails, 3.6.0, MIT
+rspec-support, 3.6.0, MIT
+ruby_smb, 0.0.12, "New BSD"
+rubyntlm, 0.6.2, MIT
 rubyzip, 1.2.1, "Simplified BSD"
 sawyer, 0.8.1, MIT
 shoulda-matchers, 3.1.1, MIT
@@ -127,5 +128,6 @@ timecop, 0.8.1, MIT
 tzinfo, 1.2.3, MIT
 tzinfo-data, 1.2017.2, MIT
 windows_error, 0.1.1, BSD
+xmlrpc, 0.3.0, ruby
 xpath, 2.0.0, unknown
-yard, 0.9.8, MIT
+yard, 0.9.9, MIT