From 8e1b00ce956ff23b637c6bbe87463a33dc638cec Mon Sep 17 00:00:00 2001
From: Joe Vennix <joe_vennix@rapid7.com>
Date: Fri, 19 Sep 2014 20:42:05 -0500
Subject: [PATCH] Adds JSObfu.disabled for spec stubbing, fixes BES specs.

---
 Gemfile.lock                                                | 4 ++--
 lib/rex/exploitation/jsobfu.rb                              | 1 +
 metasploit-framework.gemspec                                | 2 +-
 .../msf/core/exploit/remote/browser_exploit_server_spec.rb  | 6 ++++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6a14e2ed64..30aeecc156 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,7 +5,7 @@ PATH
       actionpack (< 4.0.0)
       activesupport (>= 3.0.0, < 4.0.0)
       bcrypt
-      jsobfu (~> 0.1.6)
+      jsobfu (~> 0.1.7)
       json
       metasploit-model (~> 0.26.1)
       meterpreter_bins (= 0.0.7)
@@ -90,7 +90,7 @@ GEM
     hike (1.2.3)
     i18n (0.6.11)
     journey (1.0.4)
-    jsobfu (0.1.6)
+    jsobfu (0.1.7)
       rkelly-remix (= 0.0.6)
     json (1.8.1)
     mail (2.5.4)
diff --git a/lib/rex/exploitation/jsobfu.rb b/lib/rex/exploitation/jsobfu.rb
index f02806e81d..0e7e3ae892 100644
--- a/lib/rex/exploitation/jsobfu.rb
+++ b/lib/rex/exploitation/jsobfu.rb
@@ -10,6 +10,7 @@ module Exploitation
 # from the gem available under the Rex namespace.
 #
 class JSObfu < ::JSObfu
+
 end
 
 end
diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec
index dc49a5b7cf..dc7798519b 100644
--- a/metasploit-framework.gemspec
+++ b/metasploit-framework.gemspec
@@ -56,7 +56,7 @@ Gem::Specification.new do |spec|
   # Needed for some admin modules (cfme_manageiq_evm_pass_reset.rb)
   spec.add_runtime_dependency 'bcrypt'
   # Needed for Javascript obfuscation
-  spec.add_runtime_dependency 'jsobfu', '~> 0.1.6'
+  spec.add_runtime_dependency 'jsobfu', '~> 0.1.7'
   # Needed for some admin modules (scrutinizer_add_user.rb)
   spec.add_runtime_dependency 'json'
   # Things that would normally be part of the database model, but which
diff --git a/spec/lib/msf/core/exploit/remote/browser_exploit_server_spec.rb b/spec/lib/msf/core/exploit/remote/browser_exploit_server_spec.rb
index aba2da467b..15d65341fb 100644
--- a/spec/lib/msf/core/exploit/remote/browser_exploit_server_spec.rb
+++ b/spec/lib/msf/core/exploit/remote/browser_exploit_server_spec.rb
@@ -240,6 +240,9 @@ describe Msf::Exploit::Remote::BrowserExploitServer do
     end
 
     context 'when a new visitor requests the exploit' do
+      before { JSObfu.disabled = true }
+      after  { JSObfu.disabled = false }
+
       it 'calls send_response once' do
         server.should_receive(:send_response).once
         server.on_request_uri(cli, request)
@@ -278,6 +281,9 @@ describe Msf::Exploit::Remote::BrowserExploitServer do
       let(:tag) { 'joe' }
       let(:cookie) { "#{cookie_name}=#{tag}" }
 
+      before { JSObfu.disabled = true }
+      after  { JSObfu.disabled = false }
+
       it 'calls send_response once' do
         server.should_receive(:send_response).once
         server.on_request_uri(cli, request)