lib/rex/exploitation/javascriptosdetect.rb in librex-0.0.35 vs lib/rex/exploitation/javascriptosdetect.rb in librex-0.0.36

@@ -1,8 +1,9 @@
 
+require 'msf/core'
 require 'rex/text'
-require 'rex/exploitation/obfuscatejs'
+require 'rex/exploitation/jsobfu'
 
 module Rex
 module Exploitation
 
 # 
@@ -22,11 +23,11 @@
 # 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 JavascriptOSDetect < ObfuscateJS
+class JavascriptOSDetect < JSObfu
 	
 	def initialize(custom_js = '', opts = {})
 		clients = ::Msf::HttpClients
 		oses    = ::Msf::OperatingSystems
 		@js = custom_js
@@ -872,29 +873,9 @@
 	if (0 == ua_ver_cmp(a,b)) { return true; }
 	return false;
 }
 ENDJS
 		super @js
-		update_opts(opts) if (opts)
-		update_opts({'Symbols' => {
-			'Variables' => [ 
-				'os_name', 'os_flavor',
-				'os_sp', 'os_lang',
-				'arch',
-				'ua_name', 
-				'ua_version', 
-				'found_version', 
-				'needle', 
-				'haystack',
-				],
-			'Methods' => [ 
-				'getVersion', 
-				'searchVersion' 
-				]
-			}
-		})
-
-		#self.obfuscate
 
 		return @js
 	end
 
 end