Merge osdetect and addonsdetect

lib/msf/core/exploit/http/server.rb

@@ -810,7 +810,7 @@ protected
   end
 
   def js_os_detect
-    @cache_os_detect ||= ::Rex::Exploitation::Js::OSDetect.new
+    @cache_os_detect ||= ::Rex::Exploitation::Js::Detect.os
   end
 
   # Transmits a html response to the supplied client

lib/rex/exploitation/js.rb

@@ -1,7 +1,6 @@
 # -*- coding: binary -*-
 
-require 'rex/exploitation/js/addonsdetect'
 require 'rex/exploitation/js/memory'
 require 'rex/exploitation/js/network'
-require 'rex/exploitation/js/osdetect'
-require 'rex/exploitation/js/utils'
+require 'rex/exploitation/js/utils'
+require 'rex/exploitation/js/detect'

lib/rex/exploitation/js/addonsdetect.rb

@@ -1,30 +0,0 @@
-# -*- coding: binary -*-
-
-require 'msf/core'
-require 'rex/text'
-require 'rex/exploitation/jsobfu'
-
-module Rex
-module Exploitation
-module Js
-
-#
-# Provides javascript functions to determine addon information.
-#
-# getMsOfficeVersion(): Returns the version for Microsoft Office
-#
-class AddonsDetect < JSObfu
-
-  def initialize(custom_js = '', opts = {})
-    @js = custom_js
-    @js += ::File.read(::File.join(Msf::Config.data_directory, "js", "detect", "addons.js"))
-
-    super @js
-
-    return @js
-  end
-
-end
-end
-end
-end

lib/rex/exploitation/js/detect.rb

@@ -0,0 +1,56 @@
+# -*- coding: binary -*-
+
+require 'msf/core'
+require 'rex/text'
+require 'rex/exploitation/jsobfu'
+
+module Rex
+module Exploitation
+module Js
+
+
+class Detect
+
+  #
+  # Provides several javascript functions for determining the OS and browser versions of a client.
+  #
+  # getVersion():  returns an object with the following properties
+  # os_name      -  OS name, one of the Msf::OperatingSystems constants
+  # os_flavor    -  OS flavor as a string (e.g.: "XP", "2000")
+  # os_sp        -  OS service pack (e.g.: "SP2", will be empty on non-Windows)
+  # os_lang      -  OS language (e.g.: "en-us")
+  # ua_name      -  Client name, one of the Msf::HttpClients constants
+  # ua_version   -  Client version as a string (e.g.: "3.5.1", "6.0;SP2")
+  # arch         -  Architecture, one of the ARCH_* constants
+  #
+  # The following functions work on the version returned in obj.ua_version
+  #
+  # ua_ver_cmp(a, b): returns -1, 0, or 1 based on whether a < b, a == b, or a > b respectively
+  # ua_ver_lt(a, b):  returns true if a < b
+  # ua_ver_gt(a, b):  returns true if a > b
+  # ua_ver_eq(a, b):  returns true if a == b
+  #
+  def self.os(custom_js = '')
+    js  = custom_js
+    js << ::File.read(::File.join(Msf::Config.data_directory, "js", "detect", "os.js"))
+
+    Rex::Exploitation::JSObfu.new(js)
+  end
+
+
+  #
+  # Provides javascript functions to determine addon information.
+  #
+  # getMsOfficeVersion(): Returns the version for Microsoft Office
+  #
+  def self.addons(custom_js = '')
+    js  = custom_js
+    js << ::File.read(::File.join(Msf::Config.data_directory, "js", "detect", "addons.js"))
+
+    Rex::Exploitation::JSObfu.new(js)
+  end
+
+end
+end
+end
+end

lib/rex/exploitation/js/osdetect.rb

@@ -1,44 +0,0 @@
-# -*- coding: binary -*-
-
-require 'msf/core'
-require 'rex/text'
-require 'rex/exploitation/jsobfu'
-
-module Rex
-module Exploitation
-module Js
-
-#
-# Provides several javascript functions for determining the OS and browser versions of a client.
-#
-# getVersion():  returns an object with the following properties
-#	os_name      -  OS name, one of the Msf::OperatingSystems constants
-#	os_flavor    -  OS flavor as a string (e.g.: "XP", "2000")
-#	os_sp        -  OS service pack (e.g.: "SP2", will be empty on non-Windows)
-#	os_lang      -  OS language (e.g.: "en-us")
-#	ua_name      -  Client name, one of the Msf::HttpClients constants
-#	ua_version   -  Client version as a string (e.g.: "3.5.1", "6.0;SP2")
-#	arch         -  Architecture, one of the ARCH_* constants
-#
-# The following functions work on the version returned in obj.ua_version
-#
-# ua_ver_cmp(a, b): returns -1, 0, or 1 based on whether a < b, a == b, or a > b respectively
-# ua_ver_lt(a, b):  returns true if a < b
-# ua_ver_gt(a, b):  returns true if a > b
-# ua_ver_eq(a, b):  returns true if a == b
-#
-class OSDetect < JSObfu
-
-  def initialize(custom_js = '', opts = {})
-    @js = custom_js
-    @js += ::File.read(::File.join(Msf::Config.data_directory, "js", "detect", "os.js"))
-
-    super @js
-
-    return @js
-  end
-
-end
-end
-end
-end

modules/auxiliary/server/browser_autopwn.rb

@@ -9,7 +9,7 @@
 #	- caching is busted when different browsers come from the same IP
 
 require 'msf/core'
-require 'rex/exploitation/js/osdetect'
+require 'rex/exploitation/js/detect'
 require 'rex/exploitation/jsobfu'
 
 class Metasploit3 < Msf::Auxiliary
@@ -171,7 +171,7 @@ class Metasploit3 < Msf::Auxiliary
   def setup
     print_status("Setup")
 
-    @init_js = ::Rex::Exploitation::Js::OSDetect.new <<-ENDJS
+    @init_js = ::Rex::Exploitation::Js::Detect.os(<<-ENDJS
 
       #{js_base64}
 
@@ -223,6 +223,7 @@ class Metasploit3 < Msf::Auxiliary
         report_and_get_exploits(detected_version);
       } // function bodyOnLoad
     ENDJS
+    )
 
     if (datastore['DEBUG'])
       print_debug("NOTE: Debug Mode; javascript will not be obfuscated")

spec/lib/rex/exploitation/js/addonsdetect_spec.rb

@@ -1,16 +0,0 @@
-require 'rex/exploitation/js'
-
-describe Rex::Exploitation::Js::AddonsDetect do
-
-  context "Class methods" do
-
-    context ".initialize" do
-      it "should load the Addons Detect javascript" do
-        js = Rex::Exploitation::Js::AddonsDetect.new.to_s
-        js.should =~ /window\.addons_detect/
-      end
-    end
-
-  end
-
-end

spec/lib/rex/exploitation/js/detect_spec.rb

@@ -0,0 +1,23 @@
+require 'rex/exploitation/js'
+
+describe Rex::Exploitation::Js::Detect do
+
+  context "Class methods" do
+
+    context ".os" do
+      it "should load the OS Detect javascript" do
+        js = Rex::Exploitation::Js::Detect.os.to_s
+        js.should =~ /window\.os_detect/
+      end
+    end
+
+    context ".addons" do
+      it "should load the Addons Detect javascript" do
+        js = Rex::Exploitation::Js::Detect.addons.to_s
+        js.should =~ /window\.addons_detect/
+      end
+    end
+
+  end
+
+end

spec/lib/rex/exploitation/js/osdetect_spec.rb

@@ -1,16 +0,0 @@
-require 'rex/exploitation/js'
-
-describe Rex::Exploitation::Js::OSDetect do
-
-  context "Class methods" do
-
-    context ".initialize" do
-      it "should load the OSDetect javascript" do
-        js = Rex::Exploitation::Js::OSDetect.new.to_s
-        js.should =~ /window\.os_detect/
-      end
-    end
-
-  end
-
-end