Merge branch 'master' into KB-for-rails_webconsole_v2

Author: h00die

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,4 +11,5 @@ List the steps needed to make sure this thing works
 - [ ] ...
 - [ ] **Verify** the thing does what it should
 - [ ] **Verify** the thing does not do what it should not
+- [ ] **Document** the thing and how it works ([Example](https://github.com/rapid7/metasploit-framework/blob/master/documentation/modules/post/multi/gather/aws_keys.md))
 

.ruby-version

@@ -1 +1 @@
-2.3.3
+2.4.1

.travis.yml

@@ -11,7 +11,10 @@ addons:
       - graphviz
 language: ruby
 rvm:
+  - '2.1'
+  - '2.2'
   - '2.3.3'
+  - '2.4.1'
 
 env:
   - RAKE_TASKS="cucumber cucumber:boot" CREATE_BINSTUBS=true

Gemfile

@@ -3,11 +3,12 @@ source 'https://rubygems.org'
 #   spec.add_runtime_dependency '<name>', [<version requirements>]
 gemspec name: 'metasploit-framework'
 
+gem 'bit-struct', git: 'https://github.com/busterb/bit-struct', branch: 'ruby-2.4'
+gem 'method_source', git: 'https://github.com/banister/method_source', branch: 'master'
+
 # separate from test as simplecov is not run on travis-ci
 group :coverage do
   # code coverage for tests
-  # any version newer than 0.5.4 gives an Encoding error when trying to read the source files.
-  # see: https://github.com/colszowka/simplecov/issues/127 (hopefully fixed in 0.8.0)
   gem 'simplecov'
 end
 
@@ -17,14 +18,9 @@ group :development do
   # generating documentation
   gem 'yard'
   # for development and testing purposes
-  gem 'pry'
+  gem 'pry', git: 'https://github.com/pry/pry', branch: 'master'
   # module documentation
-  gem 'octokit', '~> 4.0'
-  # session aggregator, native builds have issues on arm platforms for now
-  gem 'metasploit-aggregator' if [
-    'x86-mingw32', 'x64-mingw32',
-    'x86_64-linux', 'x86-linux',
-    'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin'))
+  gem 'octokit'
 end
 
 group :development, :test do

Gemfile.lock

@@ -1,7 +1,30 @@
+GIT
+  remote: https://github.com/banister/method_source
+  revision: 6dcb116e37e20e58f615ffe05a40bbe9a536e44a
+  branch: master
+  specs:
+    method_source (0.8.1)
+
+GIT
+  remote: https://github.com/busterb/bit-struct
+  revision: 707133ae6af5420be6fbe29be6baa5fbc929da2e
+  branch: ruby-2.4
+  specs:
+    bit-struct (0.15.0)
+
+GIT
+  remote: https://github.com/pry/pry
+  revision: 1f64463184e0a160d0b41d1a1f92b8e2f230278c
+  branch: master
+  specs:
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+
 PATH
   remote: .
   specs:
-    metasploit-framework (4.14.8)
+    metasploit-framework (4.14.10)
       actionpack (~> 4.2.6)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -11,6 +34,7 @@ PATH
       jsobfu
       json
       metasm
+      metasploit-aggregator
       metasploit-concern
       metasploit-credential
       metasploit-model
@@ -104,7 +128,6 @@ GEM
       thor (~> 0.19)
     bcrypt (3.1.11)
     bindata (2.3.5)
-    bit-struct (0.15.0)
     builder (3.2.3)
     capybara (2.13.0)
       addressable
@@ -142,7 +165,7 @@ GEM
     factory_girl_rails (4.8.0)
       factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
-    faraday (0.11.0)
+    faraday (0.12.0.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
     filesize (0.1.1)
@@ -157,7 +180,7 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    grpc (1.2.0)
+    grpc (1.2.2)
       google-protobuf (~> 3.1)
       googleauth (~> 0.5.1)
     i18n (0.8.1)
@@ -204,7 +227,6 @@ GEM
       railties (~> 4.2.6)
       recog (~> 2.0)
     metasploit_payloads-mettle (0.1.8)
-    method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
@@ -217,10 +239,10 @@ GEM
     nessus_rest (0.1.6)
     net-ssh (4.1.0)
     network_interface (0.0.1)
-    nexpose (5.3.2)
+    nexpose (6.0.0)
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
-    octokit (4.6.2)
+    octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     openssl-ccm (1.2.1)
     openvas-omp (0.0.4)
@@ -235,10 +257,6 @@ GEM
       activerecord (>= 4.0.0)
       arel (>= 4.0.1)
       pg_array_parser (~> 0.0.9)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
     public_suffix (2.0.5)
     rack (1.6.5)
     rack-test (0.6.3)
@@ -263,48 +281,48 @@ GEM
     redcarpet (3.4.0)
     rex-arch (0.1.4)
       rex-text
-    rex-bin_tools (0.1.1)
+    rex-bin_tools (0.1.2)
       metasm
       rex-arch
       rex-core
       rex-struct2
       rex-text
-    rex-core (0.1.8)
-    rex-encoder (0.1.2)
+    rex-core (0.1.9)
+    rex-encoder (0.1.3)
       metasm
       rex-arch
       rex-text
-    rex-exploitation (0.1.11)
+    rex-exploitation (0.1.12)
       jsobfu
       metasm
       rex-arch
       rex-encoder
       rex-text
-    rex-java (0.1.3)
-    rex-mime (0.1.3)
+    rex-java (0.1.4)
+    rex-mime (0.1.4)
       rex-text
     rex-nop (0.1.0)
       rex-arch
-    rex-ole (0.1.4)
+    rex-ole (0.1.5)
       rex-text
-    rex-powershell (0.1.69)
+    rex-powershell (0.1.70)
       rex-random_identifier
       rex-text
-    rex-random_identifier (0.1.1)
+    rex-random_identifier (0.1.2)
       rex-text
-    rex-registry (0.1.1)
-    rex-rop_builder (0.1.1)
+    rex-registry (0.1.2)
+    rex-rop_builder (0.1.2)
       metasm
       rex-core
       rex-text
-    rex-socket (0.1.3)
+    rex-socket (0.1.5)
       rex-core
-    rex-sslscan (0.1.2)
+    rex-sslscan (0.1.3)
       rex-socket
       rex-text
-    rex-struct2 (0.1.0)
-    rex-text (0.2.13)
-    rex-zip (0.1.1)
+    rex-struct2 (0.1.1)
+    rex-text (0.2.14)
+    rex-zip (0.1.2)
       rex-text
     rkelly-remix (0.0.7)
     robots (0.10.1)
@@ -347,7 +365,6 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    slop (3.6.0)
     sqlite3 (1.3.13)
     sshkey (1.9.0)
     thor (0.19.4)
@@ -367,13 +384,14 @@ PLATFORMS
 
 DEPENDENCIES
   aruba
+  bit-struct!
   cucumber-rails
   factory_girl_rails
   fivemat
-  metasploit-aggregator
   metasploit-framework!
-  octokit (~> 4.0)
-  pry
+  method_source!
+  octokit
+  pry!
   rake
   redcarpet
   rspec-rails