Merge pull request #37 from rapid7/master

update
rapid7 · Feb 1, 2017 · bc9c96e · bc9c96e
2 parents 3a9c662 + be170ab
commit bc9c96e
Show file tree

Hide file tree

Showing 326 changed files with 10,552 additions and 3,244 deletions.
diff --git a/COPYING b/COPYING
@@ -1,4 +1,4 @@
-Copyright (C) 2006-2016, Rapid7, Inc.
+Copyright (C) 2006-2017, Rapid7, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metasploit-framework (4.13.10)
+    metasploit-framework (4.13.18)
       actionpack (~> 4.2.6)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -14,9 +14,9 @@ PATH
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 1.2.5)
+      metasploit-payloads (= 1.2.11)
       metasploit_data_models
-      metasploit_payloads-mettle (= 0.1.4)
+      metasploit_payloads-mettle (= 0.1.7)
       msgpack
       nessus_rest
       net-ssh
@@ -30,7 +30,7 @@ PATH
       pcaprub
       pg
       railties
-      rb-readline-r7
+      rb-readline
       recog
       redcarpet
       rex-arch (= 0.1.4)
@@ -91,7 +91,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
-    arel (6.0.3)
+    arel (6.0.4)
     arel-helpers (2.3.0)
       activerecord (>= 3.1.0, < 6)
     aruba (0.14.2)
@@ -103,8 +103,8 @@ GEM
       thor (~> 0.19)
     bcrypt (3.1.11)
     bit-struct (0.15.0)
-    builder (3.2.2)
-    capybara (2.11.0)
+    builder (3.2.3)
+    capybara (2.12.0)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -132,24 +132,24 @@ GEM
       nokogiri (~> 1.5)
       railties (>= 3, < 5.1)
     cucumber-wire (0.0.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
     erubis (2.7.0)
     factory_girl (4.8.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.8.0)
       factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
-    faraday (0.10.0)
+    faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.14)
+    ffi (1.9.17)
     filesize (0.1.1)
     fivemat (1.3.2)
     gherkin (4.0.0)
-    i18n (0.7.0)
-    jsobfu (0.4.1)
-      rkelly-remix (= 0.0.6)
-    json (1.8.3)
+    i18n (0.8.0)
+    jsobfu (0.4.2)
+      rkelly-remix
+    json (1.8.6)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     metasm (1.0.2)
@@ -169,8 +169,8 @@ GEM
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-payloads (1.2.5)
-    metasploit_data_models (2.0.10)
+    metasploit-payloads (1.2.11)
+    metasploit_data_models (2.0.14)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
       arel-helpers
@@ -180,21 +180,21 @@ GEM
       postgres_ext
       railties (~> 4.2.6)
       recog (~> 2.0)
-    metasploit_payloads-mettle (0.1.4)
+    metasploit_payloads-mettle (0.1.7)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
-    msgpack (1.0.2)
+    msgpack (1.0.3)
     multi_json (1.12.1)
     multi_test (0.1.2)
     multipart-post (2.0.0)
     nessus_rest (0.1.6)
-    net-ssh (3.2.0)
+    net-ssh (4.0.1)
     network_interface (0.0.1)
-    nokogiri (1.6.8.1)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
     octokit (4.6.2)
       sawyer (~> 0.8.0, >= 0.5.3)
@@ -215,15 +215,15 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    public_suffix (2.0.4)
+    public_suffix (2.0.5)
     rack (1.6.5)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
@@ -233,10 +233,10 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
-    rb-readline-r7 (0.5.2.0)
-    recog (2.1.2)
+    rb-readline (0.5.3)
+    recog (2.1.4)
       nokogiri
-    redcarpet (3.3.4)
+    redcarpet (3.4.0)
     rex-arch (0.1.4)
       rex-text
     rex-bin_tools (0.1.1)
@@ -245,25 +245,25 @@ GEM
       rex-core
       rex-struct2
       rex-text
-    rex-core (0.1.3)
-    rex-encoder (0.1.1)
+    rex-core (0.1.6)
+    rex-encoder (0.1.2)
       metasm
       rex-arch
       rex-text
-    rex-exploitation (0.1.4)
+    rex-exploitation (0.1.10)
       jsobfu
       metasm
       rex-arch
       rex-encoder
       rex-text
     rex-java (0.1.3)
-    rex-mime (0.1.1)
+    rex-mime (0.1.3)
       rex-text
     rex-nop (0.1.0)
       rex-arch
-    rex-ole (0.1.3)
+    rex-ole (0.1.4)
       rex-text
-    rex-powershell (0.1.68)
+    rex-powershell (0.1.69)
       rex-random_identifier
       rex-text
     rex-random_identifier (0.1.1)
@@ -273,16 +273,16 @@ GEM
       metasm
       rex-core
       rex-text
-    rex-socket (0.1.2)
+    rex-socket (0.1.3)
       rex-core
-    rex-sslscan (0.1.1)
+    rex-sslscan (0.1.2)
       rex-socket
       rex-text
     rex-struct2 (0.1.0)
-    rex-text (0.2.9)
+    rex-text (0.2.11)
     rex-zip (0.1.1)
       rex-text
-    rkelly-remix (0.0.6)
+    rkelly-remix (0.0.7)
     robots (0.10.1)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
@@ -308,25 +308,25 @@ GEM
       faraday (~> 0.8, < 1.0)
     shoulda-matchers (3.1.1)
       activesupport (>= 4.0.0)
-    simplecov (0.12.0)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    sqlite3 (1.3.12)
-    sshkey (1.8.0)
+    sqlite3 (1.3.13)
+    sshkey (1.9.0)
     thor (0.19.4)
     thread_safe (0.3.5)
     timecop (0.8.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     tzinfo-data (1.2016.10)
       tzinfo (>= 1.0.0)
-    windows_error (0.0.2)
+    windows_error (0.1.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yard (0.9.5)
+    yard (0.9.8)
 
 PLATFORMS
   ruby
@@ -348,4 +348,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.13.6
+   1.14.3
diff --git a/LICENSE b/LICENSE
@@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: http://www.metasploit.com/
 
 Files: *
-Copyright: 2006-2016, Rapid7, Inc.
+Copyright: 2006-2017, Rapid7, Inc.
 License: BSD-3-clause
 
 # The Metasploit Framework is provided under the 3-clause BSD license provided

diff --git a/data/exploits/CVE-2014-3153.elf b/data/exploits/CVE-2014-3153.elf
diff --git a/data/exploits/CVE-2014-3153.so b/data/exploits/CVE-2014-3153.so
diff --git a/data/exploits/firefox_smil_uaf/post.html b/data/exploits/firefox_smil_uaf/post.html
@@ -0,0 +1 @@
+<html><body bgcolor="#2F3236"><center><div><iframe width="1280" height="720" src="https://www.youtube.com/embed/wArxEk0Rxhc?autoplay=1" frameborder="0" allowfullscreen></iframe></div></center></body></html>