Merge branch 'master' of github.com:rapid7/metasploit-framework into rapid7

bug/bundler_fix
James Lee 2013-01-12 14:08:47 -06:00
commit 5fc008566f
3 changed files with 7 additions and 3 deletions

2
.gitignore vendored
View File

@ -10,7 +10,7 @@
coverage coverage
data/meterpreter/ext_server_pivot.dll data/meterpreter/ext_server_pivot.dll
data/meterpreter/ext_server_pivot.x64.dll data/meterpreter/ext_server_pivot.x64.dll
doc doc/
external/source/meterpreter/java/bin external/source/meterpreter/java/bin
external/source/meterpreter/java/build external/source/meterpreter/java/build
external/source/meterpreter/java/extensions external/source/meterpreter/java/extensions

View File

@ -302,6 +302,10 @@ class OptPort < OptBase
return 'port' return 'port'
end end
def normalize(value)
value.to_i
end
def valid?(value) def valid?(value)
return false if empty_required_value?(value) return false if empty_required_value?(value)

View File

@ -24,8 +24,8 @@ class Metasploit3 < Msf::Exploit::Remote
This module has been tested across multiple versions of RoR 3.x and RoR 2.x This module has been tested across multiple versions of RoR 3.x and RoR 2.x
The technique used by this module requires the target to be running a fairly version The technique used by this module requires the target to be running a fairly recent
of Ruby 1.9 (since 2011 or so). Applications using Ruby 1.8 may still be version of Ruby 1.9 (since 2011 or so). Applications using Ruby 1.8 may still be
exploitable using the init_with() method, but this has not been demonstrated. exploitable using the init_with() method, but this has not been demonstrated.
}, },