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

Land #6392, @wchen-r7's 'def peer' cleanup, fixing #6362

bug/bundler_fix
Jon Hart 2015-12-24 08:53:32 -08:00
parent 43fb27d234 3c2e2c65e2
commit efdb6a8885
No known key found for this signature in database
GPG Key ID: 2FA9F0A3AFA8E9D3
34 changed files with 7 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/msf/core/auxiliary/redis.rb
View File

@ -31,10 +31,6 @@ module Msf
)
end
def peer
"#{rhost}:#{rport}"
end
def read_timeout
datastore['READ_TIMEOUT']
end

6
lib/msf/core/exploit/java/rmi/client.rb
View File

@ -51,12 +51,6 @@ module Msf
datastore['RPORT']
end
# Returns the RMI server peer
#
# @return [String]
def peer
"#{rhost}:#{rport}"
end
# Sends a RMI header stream
#

5
lib/msf/core/exploit/tcp.rb
View File

@ -82,6 +82,11 @@ module Exploit::Remote::Tcp
)
end
# Returns the rhost:rport
def peer
"#{rhost}:#{rport}"
end
#
# Establishes a TCP connection to the specified RHOST/RPORT
#

4
modules/auxiliary/admin/atg/atg_client.rb
View File

@ -190,10 +190,6 @@ class Metasploit3 < Msf::Auxiliary
response
end
def peer
"#{rhost}:#{rport}"
end
def protocol
datastore['PROTOCOL']
end

3
modules/auxiliary/admin/misc/sercomm_dump_config.rb
View File

@ -134,9 +134,6 @@ class Metasploit3 < Msf::Auxiliary
return nil
end
def peer
return "#{rhost}:#{rport}"
end
def fingerprint_endian
begin

4
modules/auxiliary/admin/mssql/mssql_escalate_dbowner_sqli.rb
View File

@ -89,10 +89,6 @@ class Metasploit3 < Msf::Auxiliary
end
end
def peer
"#{rhost}:#{rport}"
end
def get_username
# Setup query to check for database username
clue_start = Rex::Text.rand_text_alpha(8 + rand(4))

4
modules/auxiliary/admin/smb/delete_file.rb
View File

@ -40,10 +40,6 @@ class Metasploit3 < Msf::Auxiliary
], self.class)
end
def peer
"#{rhost}:#{rport}"
end
def smb_delete_files
vprint_status("#{peer}: Connecting to the server...")
connect()

4
modules/auxiliary/admin/smb/download_file.rb
View File

@ -40,10 +40,6 @@ class Metasploit3 < Msf::Auxiliary
], self.class)
end
def peer
"#{rhost}:#{rport}"
end
def smb_download
vprint_status("#{peer}: Connecting...")
connect()

4
modules/auxiliary/admin/smb/upload_file.rb
View File

@ -47,10 +47,6 @@ class Metasploit3 < Msf::Auxiliary
end
def peer
"#{rhost}:#{rport}"
end
def run_host(_ip)
begin
vprint_status("#{peer}: Connecting to the server...")

4
modules/auxiliary/dos/misc/ibm_sametime_webplayer_dos.rb
View File

@ -116,10 +116,6 @@ class Metasploit3 < Msf::Auxiliary
end
def peer
"#{rhost}:#{rport}"
end
def dos_user
length = 12000 # enough to overflow the end of allocated memory
msg = create_message(length)

4
modules/auxiliary/scanner/dlsw/dlsw_leak_capture.rb
View File

@ -42,10 +42,6 @@ class Metasploit3 < Msf::Auxiliary
], self.class)
end
def peer
"#{rhost}:#{rport}"
end
def get_response(size = 72)
connect
response = sock.get_once(size)

4
modules/auxiliary/scanner/elasticsearch/indices_enum.rb
View File

@ -31,10 +31,6 @@ class Metasploit3 < Msf::Auxiliary
], self.class)
end
def peer
"#{rhost}:#{rport}"
end
def run_host(ip)
vprint_status("#{peer} - Querying indices...")
begin

4
modules/auxiliary/scanner/http/netgear_sph200d_traversal.rb
View File

@ -36,10 +36,6 @@ class Metasploit3 < Msf::Auxiliary
], self.class)
end
def peer
"#{rhost}:#{rport}"
end
def extract_words(wordfile)
return [] unless wordfile && File.readable?(wordfile)
begin

4
modules/auxiliary/scanner/mysql/mysql_file_enum.rb
View File

@ -43,10 +43,6 @@ class Metasploit3 < Msf::Auxiliary
res
end
def peer
"#{rhost}:#{rport}"
end
def run_host(ip)
vprint_status("#{peer} - Login...")

3
modules/auxiliary/scanner/rdp/ms12_020_check.rb
View File

@ -124,9 +124,6 @@ class Metasploit3 < Msf::Auxiliary
"\x02\xf0\x80\x38"
end
def peer
"#{rhost}:#{rport}"
end
def check_rdp_vuln
# check if rdp is open

4
modules/auxiliary/scanner/rsync/modules_list.rb
View File

@ -56,10 +56,6 @@ class Metasploit3 < Msf::Auxiliary
)
end
def peer
"#{rhost}:#{rport}"
end
def read_timeout
datastore['READ_TIMEOUT']
end

4
modules/auxiliary/scanner/smtp/smtp_relay.rb
View File

@ -38,10 +38,6 @@ class Metasploit3 < Msf::Auxiliary
], self.class)
end
def peer
"#{rhost}:#{rport}"
end
def run_host(ip)
begin
connect

4
modules/auxiliary/scanner/ssh/ssh_version.rb
View File

@ -37,10 +37,6 @@ class Metasploit3 < Msf::Auxiliary
)
end
def peer
"#{rhost}:#{rport}"
end
def timeout
datastore['TIMEOUT'] <= 0 ? DEFAULT_TIMEOUT : datastore['TIMEOUT']
end

4
modules/auxiliary/scanner/ssl/openssl_ccs.rb
View File

@ -111,10 +111,6 @@ class Metasploit3 < Msf::Auxiliary
], self.class)
end
def peer
"#{rhost}:#{rport}"
end
def response_timeout
datastore['RESPONSE_TIMEOUT']
end

4
modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
View File

@ -170,10 +170,6 @@ class Metasploit3 < Msf::Auxiliary
end
def peer
"#{rhost}:#{rport}"
end
#
# Main methods
#

5
modules/exploits/linux/http/nginx_chunked_size.rb
View File

@ -33,7 +33,7 @@ class Metasploit4 < Msf::Exploit::Remote
['CVE', '2013-2028'],
['OSVDB', '93037'],
['URL', 'http://nginx.org/en/security_advisories.html'],
['URL', 'http://packetstormsecurity.com/files/121560/Nginx-1.3.9-1.4.0-Stack-Buffer-Overflow.html']
['PACKETSTORM', '121560']
],
'Privileged' => false,
'Payload' =>
@ -73,9 +73,6 @@ class Metasploit4 < Msf::Exploit::Remote
end
def peer
"#{rhost}:#{rport}"
end
def check
begin

4
modules/exploits/linux/misc/jenkins_java_deserialize.rb
View File

@ -54,10 +54,6 @@ class Metasploit3 < Msf::Exploit::Remote
], self.class)
end
def peer
"#{rhost}:#{rport}"
end
def exploit
unless vulnerable?
fail_with(Failure::Unknown, "#{peer} - Jenkins is not vulnerable, aborting...")

4
modules/exploits/multi/misc/hp_data_protector_exec_integutil.rb
View File

@ -129,10 +129,6 @@ class Metasploit3 < Msf::Exploit::Remote
end
end
def peer
"#{rhost}:#{rport}"
end
def build_pkt(fields)
data = "\xff\xfe" # BOM Unicode
fields.each do |v|

4
modules/exploits/multi/misc/java_jdwp_debugger.rb
View File

@ -147,10 +147,6 @@ class Metasploit3 < Msf::Exploit::Remote
end
def peer
"#{rhost}:#{rport}"
end
def default_timeout
datastore['RESPONSE_TIMEOUT']
end

4
modules/exploits/multi/misc/java_rmi_server.rb
View File

@ -106,10 +106,6 @@ class Metasploit3 < Msf::Exploit::Remote
end
end
def peer
"#{rhost}:#{rport}"
end
def primer
connect

3
modules/exploits/windows/misc/hp_dataprotector_cmd_exec.rb
View File

@ -87,9 +87,6 @@ class Metasploit3 < Msf::Exploit::Remote
Exploit::CheckCode::Detected
end
def peer
"#{rhost}:#{rport}"
end
def get_fingerprint
ommni = connect

3
modules/exploits/windows/misc/hp_dataprotector_exec_bar.rb
View File

@ -105,9 +105,6 @@ class Metasploit3 < Msf::Exploit::Remote
end
end
def peer
"#{rhost}:#{rport}"
end
def build_pkt(fields)
data = "\xff\xfe" # BOM Unicode

4
modules/exploits/windows/misc/hp_dataprotector_traversal.rb
View File

@ -101,10 +101,6 @@ class Metasploit3 < Msf::Exploit::Remote
register_file_for_cleanup("wbem\\mof\\good\\#{mof_name}")
end
def peer
"#{rhost}:#{rport}"
end
def build_pkt(fields)
data = "\xff\xfe" # BOM Unicode
fields.each do |v|

4
modules/exploits/windows/misc/solidworks_workgroup_pdmwservice_file_write.rb
View File

@ -66,10 +66,6 @@ class Metasploit3 < Msf::Exploit::Remote
], self.class)
end
def peer
"#{rhost}:#{rport}"
end
#
# Check
#

4
modules/exploits/windows/mysql/mysql_mof.rb
View File

@ -59,10 +59,6 @@ class Metasploit3 < Msf::Exploit::Remote
return Exploit::CheckCode::Safe
end
def peer
"#{rhost}:#{rport}"
end
def query(q)
rows = []

4
modules/exploits/windows/mysql/mysql_start_up.rb
View File

@ -64,10 +64,6 @@ class Metasploit3 < Msf::Exploit::Remote
Exploit::CheckCode::Safe
end
def peer
"#{rhost}:#{rport}"
end
def query(q)
rows = []

5
modules/post/multi/manage/play_youtube.rb
View File

@ -31,11 +31,6 @@ class Metasploit3 < Msf::Post
], self.class)
end
def peer
"#{session.session_host}:#{session.session_port}"
end
#
# The OSX version uses an apple script to do this
#

5
modules/post/osx/gather/safari_lastsession.rb
View File

@ -58,11 +58,6 @@ class Metasploit3 < Msf::Post
version
end
def peer
"#{session.session_host}:#{session.session_port}"
end
#
# Converts LastSession.plist to xml, and then read it
# @param filename [String] The path to LastSession.plist

18
modules/post/windows/gather/credentials/smartermail.rb
View File

@ -38,22 +38,6 @@ class Metasploit3 < Msf::Post
))
end
def r_host
if session.type =~ /meterpreter/
session.sock.peerhost
else
session.session_host
end
end
def peer
if session.type =~ /meterpreter/
"#{r_host} (#{sysinfo['Computer']})"
else
r_host
end
end
#
# Decrypt DES encrypted password string
#
@ -215,7 +199,7 @@ class Metasploit3 < Msf::Post
print_good "#{peer} - Found Username: '#{user}' Password: '#{pass}'"
report_cred(
ip: r_host,
ip: rhost,
port: port,
service_name: 'http',
user: user,