Skip to content

Commit 8e1b00c

Browse files
committed
Adds JSObfu.disabled for spec stubbing, fixes BES specs.
1 parent df999db commit 8e1b00c

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PATH
55
actionpack (< 4.0.0)
66
activesupport (>= 3.0.0, < 4.0.0)
77
bcrypt
8-
jsobfu (~> 0.1.6)
8+
jsobfu (~> 0.1.7)
99
json
1010
metasploit-model (~> 0.26.1)
1111
meterpreter_bins (= 0.0.7)
@@ -90,7 +90,7 @@ GEM
9090
hike (1.2.3)
9191
i18n (0.6.11)
9292
journey (1.0.4)
93-
jsobfu (0.1.6)
93+
jsobfu (0.1.7)
9494
rkelly-remix (= 0.0.6)
9595
json (1.8.1)
9696
mail (2.5.4)

lib/rex/exploitation/jsobfu.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ module Exploitation
1010
# from the gem available under the Rex namespace.
1111
#
1212
class JSObfu < ::JSObfu
13+
1314
end
1415

1516
end

metasploit-framework.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Gem::Specification.new do |spec|
5656
# Needed for some admin modules (cfme_manageiq_evm_pass_reset.rb)
5757
spec.add_runtime_dependency 'bcrypt'
5858
# Needed for Javascript obfuscation
59-
spec.add_runtime_dependency 'jsobfu', '~> 0.1.6'
59+
spec.add_runtime_dependency 'jsobfu', '~> 0.1.7'
6060
# Needed for some admin modules (scrutinizer_add_user.rb)
6161
spec.add_runtime_dependency 'json'
6262
# Things that would normally be part of the database model, but which

spec/lib/msf/core/exploit/remote/browser_exploit_server_spec.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,9 @@
240240
end
241241

242242
context 'when a new visitor requests the exploit' do
243+
before { JSObfu.disabled = true }
244+
after { JSObfu.disabled = false }
245+
243246
it 'calls send_response once' do
244247
server.should_receive(:send_response).once
245248
server.on_request_uri(cli, request)
@@ -278,6 +281,9 @@
278281
let(:tag) { 'joe' }
279282
let(:cookie) { "#{cookie_name}=#{tag}" }
280283

284+
before { JSObfu.disabled = true }
285+
after { JSObfu.disabled = false }
286+
281287
it 'calls send_response once' do
282288
server.should_receive(:send_response).once
283289
server.on_request_uri(cli, request)

0 commit comments

Comments
 (0)