Merge branch 'master' into bug/MSP-11368/boot-profiling

MSP-11368

Author: limhoff-r7

Gemfile

@@ -6,12 +6,11 @@ gemspec
 group :db do
   # Needed for Msf::DbManager
   gem 'activerecord', '>= 3.0.0', '< 4.0.0'
-  # Metasploit::Concern hooks
-  gem 'metasploit-concern', '~> 0.1.1'
+
   # Metasploit::Credential database models
-  gem 'metasploit-credential', '>= 0.9.0'
+  gem 'metasploit-credential', '~> 0.10.1'
   # Database models shared between framework and Pro.
-  gem 'metasploit_data_models', '~> 0.19'
+  gem 'metasploit_data_models', '~> 0.20.1'
   # Needed for module caching in Mdm::ModuleDetails
   gem 'pg', '>= 0.11'
 end
@@ -53,7 +52,7 @@ group :test do
   # cucumber extension for testing command line applications, like msfconsole
   gem 'aruba'
   # cucumber + automatic database cleaning with database_cleaner
-  gem 'cucumber-rails'
+  gem 'cucumber-rails', :require => false
   gem 'shoulda-matchers'
   # code coverage for tests
   # any version newer than 0.5.4 gives an Encoding error when trying to read the source files.

Gemfile.lock

@@ -5,14 +5,15 @@ PATH
       actionpack (< 4.0.0)
       activesupport (>= 3.0.0, < 4.0.0)
       bcrypt
+      jsobfu (~> 0.1.7)
       json
-      metasploit-model (~> 0.26.1)
+      metasploit-concern (~> 0.2.1)
+      metasploit-model (~> 0.27.1)
       meterpreter_bins (= 0.0.7)
       msgpack
       nokogiri
       packetfu (= 1.1.9)
       railties
-      rkelly-remix (= 0.0.6)
       robots
       rubyzip (~> 1.1)
       sqlite3
@@ -90,34 +91,40 @@ GEM
     hike (1.2.3)
     i18n (0.6.11)
     journey (1.0.4)
+    jsobfu (0.1.7)
+      rkelly-remix (= 0.0.6)
     json (1.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metasploit-concern (0.1.1)
+    metasploit-concern (0.2.1)
       activesupport (~> 3.0, >= 3.0.0)
-    metasploit-credential (0.9.0)
-      metasploit-concern (~> 0.1.0)
-      metasploit-model (~> 0.26.1)
-      metasploit_data_models (~> 0.19.4)
+      railties (< 4.0.0)
+    metasploit-credential (0.10.1)
+      metasploit-concern (~> 0.2.1)
+      metasploit-model (~> 0.27.0)
+      metasploit_data_models (~> 0.20.0)
       pg
+      railties (< 4.0.0)
       rubyntlm
       rubyzip (~> 1.1)
-    metasploit-model (0.26.1)
+    metasploit-model (0.27.1)
       activesupport
-    metasploit_data_models (0.19.4)
+      railties (< 4.0.0)
+    metasploit_data_models (0.20.1)
       activerecord (>= 3.2.13, < 4.0.0)
       activesupport
       arel-helpers
-      metasploit-concern (~> 0.1.0)
-      metasploit-model (~> 0.26.1)
+      metasploit-concern (~> 0.2.1)
+      metasploit-model (~> 0.27.0)
       pg
+      railties (< 4.0.0)
     meterpreter_bins (0.0.7)
     method_source (0.8.2)
     mime-types (1.25.1)
     mini_portile (0.6.0)
     msgpack (0.5.8)
-    multi_json (1.0.3)
+    multi_json (1.0.4)
     network_interface (0.0.1)
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
@@ -211,10 +218,9 @@ DEPENDENCIES
   factory_girl (>= 4.1.0)
   factory_girl_rails
   fivemat (= 1.2.1)
-  metasploit-concern (~> 0.1.1)
-  metasploit-credential (>= 0.9.0)
+  metasploit-credential (~> 0.10.1)
   metasploit-framework!
-  metasploit_data_models (~> 0.19)
+  metasploit_data_models (~> 0.20.1)
   network_interface (~> 0.0.1)
   pcaprub
   pg (>= 0.11)

data/js/detect/ie_addons.js

@@ -1,10 +1,10 @@
-window.ie_addons_detect = { };
+var ie_addons_detect = { };
 
 /**
  * Returns true if this ActiveX is available, otherwise false.
  * Grabbed this directly from browser_autopwn.rb
  **/
-window.ie_addons_detect.hasActiveX = function (axo_name, method) {
+ie_addons_detect.hasActiveX = function (axo_name, method) {
   var axobj = null;
   if (axo_name.substring(0,1) == String.fromCharCode(123)) {
     axobj = document.createElement("object");
@@ -41,7 +41,7 @@ window.ie_addons_detect.hasActiveX = function (axo_name, method) {
 /**
  * Returns the version of Microsoft Office. If not found, returns null.
  **/
-window.ie_addons_detect.getMsOfficeVersion = function () {
+ie_addons_detect.getMsOfficeVersion = function () {
   var version;
   var types = new Array();
   for (var i=1; i <= 5; i++) {

data/js/detect/misc_addons.js

@@ -1,10 +1,10 @@
-window.misc_addons_detect = { };
+var misc_addons_detect = { };
 
 
 /**
  * Detects whether the browser supports Silverlight or not
  **/
-window.misc_addons_detect.hasSilverlight = function () {
+misc_addons_detect.hasSilverlight = function () {
 	var found = false;
 
 	//
@@ -49,7 +49,7 @@ window.misc_addons_detect.hasSilverlight = function () {
 /**
  * Returns the Adobe Flash version
 **/
-window.misc_addons_detect.getFlashVersion = function () {
+misc_addons_detect.getFlashVersion = function () {
 	var foundVersion = null;
 
 	//
@@ -96,7 +96,7 @@ window.misc_addons_detect.getFlashVersion = function () {
 /**
  * Returns the Java version
  **/
-window.misc_addons_detect.getJavaVersion = function () {
+misc_addons_detect.getJavaVersion = function () {
 	var foundVersion = null;
 
 	//

data/js/detect/os.js

@@ -1,36 +1,36 @@
 
 // Case matters, see lib/msf/core/constants.rb
 // All of these should match up with constants in ::Msf::HttpClients
-clients_opera = "Opera";
-clients_ie    = "MSIE";
-clients_ff    = "Firefox";
-clients_chrome= "Chrome";
-clients_safari= "Safari";
+var clients_opera = "Opera";
+var clients_ie    = "MSIE";
+var clients_ff    = "Firefox";
+var clients_chrome= "Chrome";
+var clients_safari= "Safari";
 
 // All of these should match up with constants in ::Msf::OperatingSystems
-oses_linux    = "Linux";
-oses_windows  = "Microsoft Windows";
-oses_mac_osx  = "Mac OS X";
-oses_freebsd  = "FreeBSD";
-oses_netbsd   = "NetBSD";
-oses_openbsd  = "OpenBSD";
+var oses_linux    = "Linux";
+var oses_windows  = "Microsoft Windows";
+var oses_mac_osx  = "Mac OS X";
+var oses_freebsd  = "FreeBSD";
+var oses_netbsd   = "NetBSD";
+var oses_openbsd  = "OpenBSD";
 
 // All of these should match up with the ARCH_* constants
-arch_armle    = "armle";
-arch_x86      = "x86";
-arch_x86_64   = "x86_64";
-arch_ppc      = "ppc";
-arch_mipsle   = "mipsle";
+var arch_armle    = "armle";
+var arch_x86      = "x86";
+var arch_x86_64   = "x86_64";
+var arch_ppc      = "ppc";
+var arch_mipsle   = "mipsle";
 
-window.os_detect = {};
+var os_detect = {};
 
 /**
  * This can reliably detect browser versions for IE and Firefox even in the
  * presence of a spoofed User-Agent.  OS detection is more fragile and
  * requires truthful navigator.appVersion and navigator.userAgent strings in
  * order to be accurate for more than just IE on Windows.
  **/
-window.os_detect.getVersion = function(){
+os_detect.getVersion = function(){
 	//Default values:
 	var os_name;
 	var os_flavor;
@@ -1121,7 +1121,7 @@ window.os_detect.getVersion = function(){
 	return { os_name:os_name, os_flavor:os_flavor, os_sp:os_sp, os_lang:os_lang, arch:arch, ua_name:ua_name, ua_version:ua_version };
 }; // function getVersion
 
-window.os_detect.searchVersion = function(needle, haystack) {
+os_detect.searchVersion = function(needle, haystack) {
 	var index = haystack.indexOf(needle);
 	var found_version;
 	if (index == -1) { return; }
@@ -1137,7 +1137,7 @@ window.os_detect.searchVersion = function(needle, haystack) {
 /*
  * Return -1 if a < b, 0 if a == b, 1 if a > b
  */
-window.ua_ver_cmp = function(ver_a, ver_b) {
+ua_ver_cmp = function(ver_a, ver_b) {
 	// shortcut the easy case
 	if (ver_a == ver_b) {
 		return 0;
@@ -1181,15 +1181,15 @@ window.ua_ver_cmp = function(ver_a, ver_b) {
 	return 0;
 };
 
-window.ua_ver_lt = function(a, b) {
+ua_ver_lt = function(a, b) {
 	if (-1 == this.ua_ver_cmp(a,b)) { return true; }
 	return false;
 };
-window.ua_ver_gt = function(a, b) {
+ua_ver_gt = function(a, b) {
 	if (1 == this.ua_ver_cmp(a,b)) { return true; }
 	return false;
 };
-window.ua_ver_eq = function(a, b) {
+ua_ver_eq = function(a, b) {
 	if (0 == this.ua_ver_cmp(a,b)) { return true; }
 	return false;
 };

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140801150537) do
+ActiveRecord::Schema.define(:version => 20140905031549) do
 
   create_table "api_keys", :force => true do |t|
     t.text     "token"
@@ -125,6 +125,7 @@
     t.integer  "host_detail_count",                      :default => 0
     t.integer  "exploit_attempt_count",                  :default => 0
     t.integer  "cred_count",                             :default => 0
+    t.string   "detected_arch"
   end
 
   add_index "hosts", ["name"], :name => "index_hosts_on_name"