diff --git a/lib/msf/core/exploit/android.rb b/lib/msf/core/exploit/android.rb index e038a151fa..32fece6c49 100644 --- a/lib/msf/core/exploit/android.rb +++ b/lib/msf/core/exploit/android.rb @@ -1,12 +1,9 @@ # -*- coding: binary -*- require 'msf/core' -require 'msf/core/exploit/jsobfu' module Msf module Exploit::Android - include Msf::Exploit::JSObfu - # Since the NDK stager is used, arch detection must be performed SUPPORTED_ARCHES = [ ARCH_ARMLE, ARCH_MIPSLE, ARCH_X86 ] @@ -23,7 +20,7 @@ module Exploit::Android def add_javascript_interface_exploit_js(arch) stagename = Rex::Text.rand_text_alpha(5) - js_obfuscate %Q| + %Q| function exec(runtime, cmdArr) { var ch = 0; var output = ''; diff --git a/modules/exploits/android/browser/webview_addjavascriptinterface.rb b/modules/exploits/android/browser/webview_addjavascriptinterface.rb index 3fcbe9455f..c6571e90ce 100644 --- a/modules/exploits/android/browser/webview_addjavascriptinterface.rb +++ b/modules/exploits/android/browser/webview_addjavascriptinterface.rb @@ -74,6 +74,8 @@ class Metasploit3 < Msf::Exploit::Remote :os_flavor => 'Android' } )) + + deregister_options('JsObfuscate') end # Hooked to prevent BrowserExploitServer from attempting to do JS detection diff --git a/spec/lib/msf/core/exploit/android_spec.rb b/spec/lib/msf/core/exploit/android_spec.rb deleted file mode 100644 index 5e0d19c3b6..0000000000 --- a/spec/lib/msf/core/exploit/android_spec.rb +++ /dev/null @@ -1,8 +0,0 @@ -require 'spec_helper' -require 'msf/core' - -describe Msf::Exploit::Android do - - it_should_behave_like 'Msf::Exploit::JSObfu' - -end