From b46fb260a650a798bfc57314f960d0421166b62b Mon Sep 17 00:00:00 2001 From: sinn3r Date: Tue, 7 Aug 2012 15:59:01 -0500 Subject: [PATCH] Comply with msftidy *Knock, knock!* Who's there? Me, the msftidy nazi! --- modules/auxiliary/admin/tikiwiki/tikidblib.rb | 2 +- modules/auxiliary/admin/vmware/poweron_vm.rb | 11 +++--- .../auxiliary/admin/webmin/file_disclosure.rb | 2 +- modules/auxiliary/analyze/jtr_aix.rb | 2 -- .../dos/windows/llmnr/ms11_030_dnsapi.rb | 2 +- modules/auxiliary/dos/wireshark/cldap.rb | 2 +- modules/auxiliary/fuzzers/dns/dns_fuzzer.rb | 2 +- .../auxiliary/scanner/discovery/arp_sweep.rb | 4 +-- .../scanner/discovery/ipv6_neighbor.rb | 2 +- .../ipv6_neighbor_router_advertisement.rb | 2 +- .../auxiliary/scanner/discovery/udp_probe.rb | 2 +- .../auxiliary/scanner/http/blind_sql_query.rb | 2 +- .../auxiliary/scanner/http/enum_delicious.rb | 2 +- .../auxiliary/scanner/http/enum_wayback.rb | 2 +- .../auxiliary/scanner/http/httpbl_lookup.rb | 2 +- .../scanner/http/mod_negotiation_scanner.rb | 2 +- .../http/ms09_020_webdav_unicode_bypass.rb | 4 +-- modules/auxiliary/scanner/http/web_vulndb.rb | 2 +- .../mysql/mysql_authbypass_hashdump.rb | 4 +-- .../scanner/pcanywhere/pcanywhere_login.rb | 7 ++-- .../scanner/pcanywhere/pcanywhere_tcp.rb | 2 +- .../scanner/pcanywhere/pcanywhere_udp.rb | 2 +- .../auxiliary/scanner/scada/modbusdetect.rb | 4 +-- .../scanner/vmware/esx_fingerprint.rb | 2 +- .../scanner/vmware/vmware_enum_sessions.rb | 2 +- .../scanner/vmware/vmware_enum_vms.rb | 2 +- .../capture/http_javascript_keylogger.rb | 4 +-- modules/auxiliary/spoof/replay/pcap_replay.rb | 4 +-- modules/auxiliary/spoof/wifi/airpwn.rb | 2 +- modules/auxiliary/spoof/wifi/dnspwn.rb | 2 +- modules/encoders/php/base64.rb | 2 +- .../multi/http/php_cgi_arg_injection.rb | 35 ++++++++++--------- .../http/ca_arcserve_rpc_authbypass.rb | 2 +- modules/nops/sparc/random.rb | 2 +- .../singles/bsd/x86/shell_reverse_tcp_ipv6.rb | 2 +- .../payloads/singles/cmd/unix/bind_perl.rb | 2 +- modules/payloads/singles/cmd/unix/generic.rb | 2 +- modules/payloads/singles/cmd/unix/interact.rb | 2 +- .../payloads/singles/cmd/unix/reverse_perl.rb | 2 +- .../payloads/singles/cmd/windows/bind_perl.rb | 2 +- .../singles/cmd/windows/reverse_perl.rb | 2 +- .../singles/linux/x86/shell_reverse_tcp2.rb | 2 +- modules/payloads/singles/php/bind_perl.rb | 2 +- modules/payloads/singles/php/bind_php.rb | 2 +- modules/payloads/singles/php/reverse_perl.rb | 2 +- modules/payloads/singles/php/reverse_php.rb | 4 +-- modules/payloads/singles/tty/unix/interact.rb | 2 +- .../singles/windows/dns_txt_query_exec.rb | 4 +-- modules/payloads/stagers/java/bind_tcp.rb | 2 +- modules/payloads/stagers/java/reverse_tcp.rb | 2 +- modules/payloads/stagers/php/reverse_tcp.rb | 2 +- .../stagers/windows/reverse_ipv6_https.rb | 2 +- modules/payloads/stages/osx/x86/isight.rb | 2 +- .../stages/windows/patchupmeterpreter.rb | 2 +- modules/post/linux/gather/enum_protections.rb | 2 +- modules/post/multi/gather/dns_bruteforce.rb | 12 +++---- .../post/multi/gather/dns_reverse_lookup.rb | 10 +++--- modules/post/multi/gather/dns_srv_lookup.rb | 4 +-- modules/post/multi/gather/pidgin_cred.rb | 2 +- modules/post/multi/gather/ping_sweep.rb | 18 +++++----- modules/post/osx/gather/enum_adium.rb | 2 +- modules/post/windows/escalate/droplnk.rb | 2 +- modules/post/windows/gather/arp_scanner.rb | 2 +- .../windows/gather/credentials/outlook.rb | 2 +- modules/post/windows/gather/wmic_command.rb | 2 +- modules/post/windows/manage/download_exec.rb | 2 +- 66 files changed, 115 insertions(+), 116 deletions(-) diff --git a/modules/auxiliary/admin/tikiwiki/tikidblib.rb b/modules/auxiliary/admin/tikiwiki/tikidblib.rb index 04877acf5f..b8b060f594 100644 --- a/modules/auxiliary/admin/tikiwiki/tikidblib.rb +++ b/modules/auxiliary/admin/tikiwiki/tikidblib.rb @@ -17,7 +17,7 @@ class Metasploit3 < Msf::Auxiliary def initialize(info = {}) super(update_info(info, - 'Name' => 'TikiWiki information disclosure', + 'Name' => 'TikiWiki Information Disclosure', 'Description' => %q{ A vulnerability has been reported in Tikiwiki, which can be exploited by a anonymous user to dump the MySQL user & passwd just by creating a mysql diff --git a/modules/auxiliary/admin/vmware/poweron_vm.rb b/modules/auxiliary/admin/vmware/poweron_vm.rb index 6f6632c988..d8b299c7ef 100644 --- a/modules/auxiliary/admin/vmware/poweron_vm.rb +++ b/modules/auxiliary/admin/vmware/poweron_vm.rb @@ -23,8 +23,9 @@ class Metasploit3 < Msf::Auxiliary super( 'Name' => 'VMWare Power On Virtual Machine', 'Description' => %Q{ - This module will log into the Web API of VMWare and try to power on - a specified Virtual Machine.}, + This module will log into the Web API of VMWare and try to power on + a specified Virtual Machine. + }, 'Author' => ['TheLightCosine '], 'License' => MSF_LICENSE ) @@ -36,7 +37,7 @@ class Metasploit3 < Msf::Auxiliary OptString.new('PASSWORD', [ true, "The password to Authenticate with.", 'password' ]), OptString.new('VM', [true, "The VM to try to Power On"]) ], self.class) - + register_advanced_options([OptBool.new('SSL', [ false, 'Negotiate SSL for outgoing connections', true]),]) end @@ -68,8 +69,4 @@ class Metasploit3 < Msf::Auxiliary end end - - - - end diff --git a/modules/auxiliary/admin/webmin/file_disclosure.rb b/modules/auxiliary/admin/webmin/file_disclosure.rb index 989603e83b..7818eba7cb 100644 --- a/modules/auxiliary/admin/webmin/file_disclosure.rb +++ b/modules/auxiliary/admin/webmin/file_disclosure.rb @@ -18,7 +18,7 @@ class Metasploit3 < Msf::Auxiliary def initialize(info = {}) super(update_info(info, - 'Name' => 'Webmin file disclosure', + 'Name' => 'Webmin File Disclosure', 'Description' => %q{ A vulnerability has been reported in Webmin and Usermin, which can be exploited by malicious people to disclose potentially sensitive information. diff --git a/modules/auxiliary/analyze/jtr_aix.rb b/modules/auxiliary/analyze/jtr_aix.rb index 0517d32820..b612ae0f85 100644 --- a/modules/auxiliary/analyze/jtr_aix.rb +++ b/modules/auxiliary/analyze/jtr_aix.rb @@ -92,6 +92,4 @@ class Metasploit3 < Msf::Auxiliary end - - end diff --git a/modules/auxiliary/dos/windows/llmnr/ms11_030_dnsapi.rb b/modules/auxiliary/dos/windows/llmnr/ms11_030_dnsapi.rb index 249014afe9..cc4664d164 100644 --- a/modules/auxiliary/dos/windows/llmnr/ms11_030_dnsapi.rb +++ b/modules/auxiliary/dos/windows/llmnr/ms11_030_dnsapi.rb @@ -40,7 +40,7 @@ class Metasploit3 < Msf::Auxiliary [ 'OSVDB', '71780' ], [ 'MSB', 'MS11-030' ] ], - 'DisclosureDate' => 'April 12 2011') + 'DisclosureDate' => 'Apr 12 2011') register_options( [ diff --git a/modules/auxiliary/dos/wireshark/cldap.rb b/modules/auxiliary/dos/wireshark/cldap.rb index f78586b217..ee8b2b91a0 100644 --- a/modules/auxiliary/dos/wireshark/cldap.rb +++ b/modules/auxiliary/dos/wireshark/cldap.rb @@ -33,7 +33,7 @@ class Metasploit3 < Msf::Auxiliary [ 'URL', 'http://www.wireshark.org/security/wnpa-sec-2011-04.html' ], [ 'URL', 'https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5717' ], ], - 'DisclosureDate' => '2011-03-01')) + 'DisclosureDate' => 'Mar 1 2011')) register_options([ OptInt.new('RPORT', [true, 'The destination port', 389]), diff --git a/modules/auxiliary/fuzzers/dns/dns_fuzzer.rb b/modules/auxiliary/fuzzers/dns/dns_fuzzer.rb index 26705bea4d..cd7961e004 100644 --- a/modules/auxiliary/fuzzers/dns/dns_fuzzer.rb +++ b/modules/auxiliary/fuzzers/dns/dns_fuzzer.rb @@ -18,7 +18,7 @@ class Metasploit3 < Msf::Auxiliary def initialize super( - 'Name' => 'DNS and DNSSEC fuzzer', + 'Name' => 'DNS and DNSSEC Fuzzer', 'Description' => %q{ This module will connect to a DNS server and perform DNS and DNSSEC protocol-level fuzzing. Note that this module may inadvertently diff --git a/modules/auxiliary/scanner/discovery/arp_sweep.rb b/modules/auxiliary/scanner/discovery/arp_sweep.rb index 99951f015b..73f626da2e 100644 --- a/modules/auxiliary/scanner/discovery/arp_sweep.rb +++ b/modules/auxiliary/scanner/discovery/arp_sweep.rb @@ -74,7 +74,7 @@ class Metasploit3 < Msf::Auxiliary company = OUI_LIST::lookup_oui_company_name(reply.arp_saddr_mac) print_status("#{reply.arp_saddr_ip} appears to be up (#{company}).") report_host(:host => reply.arp_saddr_ip, :mac=>reply.arp_saddr_mac) - report_note(:host => reply.arp_saddr_ip, :type => "mac_oui", :data => company) + report_note(:host => reply.arp_saddr_ip, :type => "mac_oui", :data => company) end end @@ -87,7 +87,7 @@ class Metasploit3 < Msf::Auxiliary company = OUI_LIST::lookup_oui_company_name(reply.arp_saddr_mac) print_status("#{reply.arp_saddr_ip} appears to be up (#{company}).") report_host(:host => reply.arp_saddr_ip, :mac=>reply.arp_saddr_mac) - report_note(:host => reply.arp_saddr_ip, :type => "mac_oui", :data => company) + report_note(:host => reply.arp_saddr_ip, :type => "mac_oui", :data => company) end Kernel.select(nil, nil, nil, 0.50) end diff --git a/modules/auxiliary/scanner/discovery/ipv6_neighbor.rb b/modules/auxiliary/scanner/discovery/ipv6_neighbor.rb index 43f6d3ad49..6af11951a5 100644 --- a/modules/auxiliary/scanner/discovery/ipv6_neighbor.rb +++ b/modules/auxiliary/scanner/discovery/ipv6_neighbor.rb @@ -70,7 +70,7 @@ class Metasploit3 < Msf::Auxiliary begin found = {} hosts.each do |dhost| - + probe = buildprobe(@shost, @smac, dhost) capture.inject(probe) while(reply = getreply()) diff --git a/modules/auxiliary/scanner/discovery/ipv6_neighbor_router_advertisement.rb b/modules/auxiliary/scanner/discovery/ipv6_neighbor_router_advertisement.rb index 12faa5aa7f..229bc85b38 100644 --- a/modules/auxiliary/scanner/discovery/ipv6_neighbor_router_advertisement.rb +++ b/modules/auxiliary/scanner/discovery/ipv6_neighbor_router_advertisement.rb @@ -74,7 +74,7 @@ class Metasploit3 < Msf::Auxiliary def find_link_local(opts = {}) shost = opts['SHOST'] || datastore['SHOST'] || ipv6_link_address hosts = opts['HOSTS'] || [] - smac = @smac + smac = @smac timeout = opts['TIMEOUT_NEIGHBOR'] || datastore['TIMEOUT_NEIGHBOR'] network_prefix = Rex::Socket.addr_aton(shost)[0,8] diff --git a/modules/auxiliary/scanner/discovery/udp_probe.rb b/modules/auxiliary/scanner/discovery/udp_probe.rb index ec3cefee71..71649a12a2 100644 --- a/modules/auxiliary/scanner/discovery/udp_probe.rb +++ b/modules/auxiliary/scanner/discovery/udp_probe.rb @@ -514,6 +514,6 @@ class Metasploit3 < Msf::Auxiliary def probe_pkt_pca_nq(ip) return ["NQ", 5632] - end + end end diff --git a/modules/auxiliary/scanner/http/blind_sql_query.rb b/modules/auxiliary/scanner/http/blind_sql_query.rb index 6e6f6f45f4..b9ce76ec5a 100644 --- a/modules/auxiliary/scanner/http/blind_sql_query.rb +++ b/modules/auxiliary/scanner/http/blind_sql_query.rb @@ -437,7 +437,7 @@ class Metasploit3 < Msf::Auxiliary # 2% 50% max_diff_perc = 2 - min_diff_perc = 50 + min_diff_perc = 50 if normalr and truer if falser diff --git a/modules/auxiliary/scanner/http/enum_delicious.rb b/modules/auxiliary/scanner/http/enum_delicious.rb index ab06c002f2..a04c7fc52c 100644 --- a/modules/auxiliary/scanner/http/enum_delicious.rb +++ b/modules/auxiliary/scanner/http/enum_delicious.rb @@ -16,7 +16,7 @@ class Metasploit3 < Msf::Auxiliary include Msf::Auxiliary::Report def initialize(info = {}) super(update_info(info, - 'Name' => 'Pull Del.icio.us Links (URLs) for a domain', + 'Name' => 'Del.icio.us Domain Links (URLs) Enumerator', 'Description' => %q{ This module pulls and parses the URLs stored by Del.icio.us users for the purpose of replaying during a web assessment. Finding unlinked and old pages. diff --git a/modules/auxiliary/scanner/http/enum_wayback.rb b/modules/auxiliary/scanner/http/enum_wayback.rb index 605d9435d2..e3725f4616 100644 --- a/modules/auxiliary/scanner/http/enum_wayback.rb +++ b/modules/auxiliary/scanner/http/enum_wayback.rb @@ -17,7 +17,7 @@ class Metasploit3 < Msf::Auxiliary include Msf::Auxiliary::Report def initialize(info = {}) super(update_info(info, - 'Name' => 'Pull Archive.org stored URLs for a domain', + 'Name' => 'Archive.org Stored Domain URLs', 'Description' => %q{ This module pulls and parses the URLs stored by Archive.org for the purpose of replaying during a web assessment. Finding unlinked and old pages. diff --git a/modules/auxiliary/scanner/http/httpbl_lookup.rb b/modules/auxiliary/scanner/http/httpbl_lookup.rb index df9e9b61ea..b4b0f7b74f 100644 --- a/modules/auxiliary/scanner/http/httpbl_lookup.rb +++ b/modules/auxiliary/scanner/http/httpbl_lookup.rb @@ -18,7 +18,7 @@ class Metasploit3 < Msf::Auxiliary def initialize(info = {}) super(update_info(info, - 'Name' => 'Http:BL lookup', + 'Name' => 'Http:BL Lookup', 'Description' => %q{ This module can be used to enumerate information about an IP addresses from Project HoneyPot's HTTP Block List. diff --git a/modules/auxiliary/scanner/http/mod_negotiation_scanner.rb b/modules/auxiliary/scanner/http/mod_negotiation_scanner.rb index aabaa3750e..8b82ba5100 100644 --- a/modules/auxiliary/scanner/http/mod_negotiation_scanner.rb +++ b/modules/auxiliary/scanner/http/mod_negotiation_scanner.rb @@ -18,7 +18,7 @@ class Metasploit3 < Msf::Auxiliary def initialize(info = {}) super(update_info(info, - 'Name' => 'Apache HTTPD mod_negotiation scanner', + 'Name' => 'Apache HTTPD mod_negotiation Scanner', 'Description' => %q{ This module scans the webserver of the given host(s) for the existence of mod_negotiate. If the webserver has mod_negotiation enabled, the IP address will be displayed. diff --git a/modules/auxiliary/scanner/http/ms09_020_webdav_unicode_bypass.rb b/modules/auxiliary/scanner/http/ms09_020_webdav_unicode_bypass.rb index c19ab94da5..369dc94ca0 100644 --- a/modules/auxiliary/scanner/http/ms09_020_webdav_unicode_bypass.rb +++ b/modules/auxiliary/scanner/http/ms09_020_webdav_unicode_bypass.rb @@ -24,9 +24,9 @@ class Metasploit3 < Msf::Auxiliary super(update_info(info, 'Name' => 'MS09-020 IIS6 WebDAV Unicode Authentication Bypass', 'Description' => %q{ - This module attempts to to bypass authentication using the WebDAV IIS6 + This module attempts to to bypass authentication using the WebDAV IIS6 Unicode vulnerability discovered by Kingcope. The vulnerability appears - to be exploitable where WebDAV is enabled on the IIS6 server, and any + to be exploitable where WebDAV is enabled on the IIS6 server, and any protected folder requires either Basic, Digest or NTLM authentication. }, 'Author' => [ 'et', 'patrick' ], diff --git a/modules/auxiliary/scanner/http/web_vulndb.rb b/modules/auxiliary/scanner/http/web_vulndb.rb index d3314cb018..0fbb20fb4d 100644 --- a/modules/auxiliary/scanner/http/web_vulndb.rb +++ b/modules/auxiliary/scanner/http/web_vulndb.rb @@ -21,7 +21,7 @@ class Metasploit3 < Msf::Auxiliary def initialize(info = {}) super(update_info(info, - 'Name' => 'HTTP Vuln scanner', + 'Name' => 'HTTP Vuln Scanner', 'Description' => %q{ This module identifies common vulnerable files or cgis. }, diff --git a/modules/auxiliary/scanner/mysql/mysql_authbypass_hashdump.rb b/modules/auxiliary/scanner/mysql/mysql_authbypass_hashdump.rb index 91f9e347c6..8537c09e37 100644 --- a/modules/auxiliary/scanner/mysql/mysql_authbypass_hashdump.rb +++ b/modules/auxiliary/scanner/mysql/mysql_authbypass_hashdump.rb @@ -40,8 +40,8 @@ class Metasploit3 < Msf::Auxiliary ) deregister_options('PASSWORD') - register_options( [ - OptString.new('USERNAME', [ true, 'The username to authenticate as', "root" ]) + register_options( [ + OptString.new('USERNAME', [ true, 'The username to authenticate as', "root" ]) ], self.class ) end diff --git a/modules/auxiliary/scanner/pcanywhere/pcanywhere_login.rb b/modules/auxiliary/scanner/pcanywhere/pcanywhere_login.rb index 119af14262..b5d7337a54 100644 --- a/modules/auxiliary/scanner/pcanywhere/pcanywhere_login.rb +++ b/modules/auxiliary/scanner/pcanywhere/pcanywhere_login.rb @@ -21,10 +21,11 @@ class Metasploit3 < Msf::Auxiliary def initialize super( - 'Name' => 'pcAnywhere Login Scanner', + 'Name' => 'PcAnywhere Login Scanner', 'Version' => '$Revision$', - 'Description' => %q{This module will test pcAnywhere logins on a range of machines and - report successful logins. + 'Description' => %q{ + This module will test pcAnywhere logins on a range of machines and + report successful logins. }, 'Author' => ['TheLightCosine '], 'References' => diff --git a/modules/auxiliary/scanner/pcanywhere/pcanywhere_tcp.rb b/modules/auxiliary/scanner/pcanywhere/pcanywhere_tcp.rb index 7a512974a3..8c39d1dfa4 100644 --- a/modules/auxiliary/scanner/pcanywhere/pcanywhere_tcp.rb +++ b/modules/auxiliary/scanner/pcanywhere/pcanywhere_tcp.rb @@ -19,7 +19,7 @@ class Metasploit3 < Msf::Auxiliary def initialize super( - 'Name' => 'pcAnywhere TCP Service Discovery', + 'Name' => 'PcAnywhere TCP Service Discovery', 'Version' => '$Revision$', 'Description' => 'Discover active pcAnywhere services through TCP', 'Author' => 'hdm', diff --git a/modules/auxiliary/scanner/pcanywhere/pcanywhere_udp.rb b/modules/auxiliary/scanner/pcanywhere/pcanywhere_udp.rb index e053b69cf6..d598890afb 100644 --- a/modules/auxiliary/scanner/pcanywhere/pcanywhere_udp.rb +++ b/modules/auxiliary/scanner/pcanywhere/pcanywhere_udp.rb @@ -20,7 +20,7 @@ class Metasploit3 < Msf::Auxiliary def initialize super( - 'Name' => 'pcAnywhere UDP Service Discovery', + 'Name' => 'PcAnywhere UDP Service Discovery', 'Version' => '$Revision$', 'Description' => 'Discover active pcAnywhere services through UDP', 'Author' => 'hdm', diff --git a/modules/auxiliary/scanner/scada/modbusdetect.rb b/modules/auxiliary/scanner/scada/modbusdetect.rb index 5305547ffd..4f19d458ec 100644 --- a/modules/auxiliary/scanner/scada/modbusdetect.rb +++ b/modules/auxiliary/scanner/scada/modbusdetect.rb @@ -47,10 +47,10 @@ class Metasploit3 < Msf::Auxiliary # Theory: Whene sending a modbus request of some sort, the endpoint will return # with at least the same transaction-id, and protocol-id - if data + if data if data[0,4] == "\x21\x00\x00\x00" print_good("#{ip}:#{rport} - MODBUS - received correct MODBUS/TCP header") - else + else print_error("#{ip}:#{rport} - MODBUS - received incorrect data #{data[0,4].inspect} (not modbus/tcp?)") end else diff --git a/modules/auxiliary/scanner/vmware/esx_fingerprint.rb b/modules/auxiliary/scanner/vmware/esx_fingerprint.rb index 02dd407dff..9400b80f57 100644 --- a/modules/auxiliary/scanner/vmware/esx_fingerprint.rb +++ b/modules/auxiliary/scanner/vmware/esx_fingerprint.rb @@ -41,7 +41,7 @@ class Metasploit3 < Msf::Auxiliary def run_host(ip) - soap_data = + soap_data = %Q| diff --git a/modules/auxiliary/scanner/vmware/vmware_enum_sessions.rb b/modules/auxiliary/scanner/vmware/vmware_enum_sessions.rb index 80962a30ca..85eb6eb44a 100644 --- a/modules/auxiliary/scanner/vmware/vmware_enum_sessions.rb +++ b/modules/auxiliary/scanner/vmware/vmware_enum_sessions.rb @@ -55,7 +55,7 @@ class Metasploit3 < Msf::Auxiliary print_error "The Session is no longer Authenticated" else output = '' - vim_sessions.each do |vsession| + vim_sessions.each do |vsession| tmp_line = "Name: #{vsession['fullName']} \n\t" is_active = vim_session_is_active(vsession['key'],vsession['userName']) if is_active == :error diff --git a/modules/auxiliary/scanner/vmware/vmware_enum_vms.rb b/modules/auxiliary/scanner/vmware/vmware_enum_vms.rb index 94f084f5f0..589f80fa81 100644 --- a/modules/auxiliary/scanner/vmware/vmware_enum_vms.rb +++ b/modules/auxiliary/scanner/vmware/vmware_enum_vms.rb @@ -46,7 +46,7 @@ class Metasploit3 < Msf::Auxiliary if vim_do_login(datastore['USERNAME'], datastore['PASSWORD']) == :success virtual_machines = vim_get_vms - virtual_machines.each do |vm| + virtual_machines.each do |vm| print_good YAML.dump(vm) report_note( :host => rhost, diff --git a/modules/auxiliary/server/capture/http_javascript_keylogger.rb b/modules/auxiliary/server/capture/http_javascript_keylogger.rb index c02b0525a6..9c4aed7cd3 100644 --- a/modules/auxiliary/server/capture/http_javascript_keylogger.rb +++ b/modules/auxiliary/server/capture/http_javascript_keylogger.rb @@ -207,12 +207,12 @@ class Metasploit3 < Msf::Auxiliary

-
+

Keylogger Demo Form

This form submits data to the Metasploit listener for demonstration purposes.

- +
Username:
Password:
diff --git a/modules/auxiliary/spoof/replay/pcap_replay.rb b/modules/auxiliary/spoof/replay/pcap_replay.rb index fb232ae93c..5b3541b49c 100644 --- a/modules/auxiliary/spoof/replay/pcap_replay.rb +++ b/modules/auxiliary/spoof/replay/pcap_replay.rb @@ -17,10 +17,10 @@ class Metasploit3 < Msf::Auxiliary def initialize super( - 'Name' => 'Pcap replay utility', + 'Name' => 'Pcap Replay Utility', 'Version' => '$Revision$', 'Description' => %q{ - replay a pcap capture file + Replay a pcap capture file }, 'Author' => 'amaloteaux', 'License' => MSF_LICENSE diff --git a/modules/auxiliary/spoof/wifi/airpwn.rb b/modules/auxiliary/spoof/wifi/airpwn.rb index d7b134d212..915d5dc5ae 100644 --- a/modules/auxiliary/spoof/wifi/airpwn.rb +++ b/modules/auxiliary/spoof/wifi/airpwn.rb @@ -20,7 +20,7 @@ class Metasploit3 < Msf::Auxiliary def initialize super( - 'Name' => 'Airpwn TCP hijack', + 'Name' => 'Airpwn TCP Hijack', 'Version' => '$Revision$', 'Description' => %q{ TCP streams are 'protected' only in so much as the sequence diff --git a/modules/auxiliary/spoof/wifi/dnspwn.rb b/modules/auxiliary/spoof/wifi/dnspwn.rb index 7a2686225c..3fbc7ca8f4 100644 --- a/modules/auxiliary/spoof/wifi/dnspwn.rb +++ b/modules/auxiliary/spoof/wifi/dnspwn.rb @@ -21,7 +21,7 @@ class Metasploit3 < Msf::Auxiliary def initialize super( - 'Name' => 'DNSpwn DNS hijack', + 'Name' => 'DNSpwn DNS Hijack', 'Version' => '$Revision$', 'Description' => %q{ Race DNS responses and replace DNS queries diff --git a/modules/encoders/php/base64.rb b/modules/encoders/php/base64.rb index 6c9d69930f..f6d545d303 100644 --- a/modules/encoders/php/base64.rb +++ b/modules/encoders/php/base64.rb @@ -18,7 +18,7 @@ class Metasploit3 < Msf::Encoder def initialize super( - 'Name' => 'PHP Base64 encoder', + 'Name' => 'PHP Base64 Encoder', 'Version' => '$Revision$', 'Description' => %q{ This encoder returns a base64 string encapsulated in diff --git a/modules/exploits/multi/http/php_cgi_arg_injection.rb b/modules/exploits/multi/http/php_cgi_arg_injection.rb index 0e61c04583..d85fe44aed 100644 --- a/modules/exploits/multi/http/php_cgi_arg_injection.rb +++ b/modules/exploits/multi/http/php_cgi_arg_injection.rb @@ -29,8 +29,11 @@ class Metasploit3 < Msf::Exploit::Remote a system-defined manner" from the RFC) and then passes them to the CGI binary." }, - 'Author' => [ 'egypt', 'hdm', #original msf exploit - 'jjarmoc' ], #added URI encoding obfuscation + 'Author' => + [ + 'egypt', 'hdm', #original msf exploit + 'jjarmoc' #added URI encoding obfuscation + ], 'License' => MSF_LICENSE, 'Version' => '$Revision$', 'References' => [ @@ -99,9 +102,9 @@ class Metasploit3 < Msf::Exploit::Remote qs = args.join() uri = "#{target_uri}?#{qs}" - + #print_status("URI: #{target_uri}?#{qs}") # Uncomment to preview URI - + # Has to be all on one line, so gsub out the comments and the newlines payload_oneline = " [ - "#{rand_dash}#{rand_encode("d")}", + "#{rand_dash}#{rand_encode("d")}", "#{rand_dash}#{rand_dash}#{rand_encode("define")}" ], "-s" => [ - "#{rand_dash}#{rand_encode("s")}", - "#{rand_dash}#{rand_dash}#{rand_encode("syntax-highlight")}", + "#{rand_dash}#{rand_encode("s")}", + "#{rand_dash}#{rand_dash}#{rand_encode("syntax-highlight")}", "#{rand_dash}#{rand_dash}#{rand_encode("syntax-highlighting")}" - ], + ], "-T" => [ - "#{rand_dash}#{rand_encode("T")}", + "#{rand_dash}#{rand_encode("T")}", "#{rand_dash}#{rand_dash}#{rand_encode("timing")}" ], "-n" => [ - "#{rand_dash}#{rand_encode("n")}", + "#{rand_dash}#{rand_encode("n")}", "#{rand_dash}#{rand_dash}#{rand_encode("no-php-ini")}" ] } equivs = opt_equivs[opt] - equivs ? equivs[rand(opt_equivs[opt].length)] : opt + equivs ? equivs[rand(opt_equivs[opt].length)] : opt end @@ -170,12 +173,12 @@ class Metasploit3 < Msf::Exploit::Remote # Randomly URI encode characters from string, up to max times. chars = []; if max > datastore["URIENCODING"] then max = datastore["URIENCODING"] end - if string.length == 1 + if string.length == 1 if rand(2) > 0 chars << 0 end - else - if max > 0 + else + if max > 0 max.times { chars << rand(string.length)} end end @@ -194,7 +197,7 @@ class Metasploit3 < Msf::Exploit::Remote def rand_space datastore["URIENCODING"] > 0 ? ["%20","%09","+"][rand(3)] : "+" end - + def rand_dash datastore["URIENCODING"] > 0 ? ["-","%2d","%2D"][rand(3)] : "-" end diff --git a/modules/exploits/windows/http/ca_arcserve_rpc_authbypass.rb b/modules/exploits/windows/http/ca_arcserve_rpc_authbypass.rb index 36c1f62f94..5c0ae66c86 100644 --- a/modules/exploits/windows/http/ca_arcserve_rpc_authbypass.rb +++ b/modules/exploits/windows/http/ca_arcserve_rpc_authbypass.rb @@ -106,7 +106,7 @@ class Metasploit3 < Msf::Exploit::Remote user = resp[user_index+1].gsub(/\"/, "") pass = "" - + if pass_index pass = resp[pass_index+1].gsub(/\"/, "") end diff --git a/modules/nops/sparc/random.rb b/modules/nops/sparc/random.rb index c9696900df..41856b584b 100644 --- a/modules/nops/sparc/random.rb +++ b/modules/nops/sparc/random.rb @@ -79,7 +79,7 @@ class Metasploit3 < Msf::Nop def initialize super( - 'Name' => 'SPARC NOP generator', + 'Name' => 'SPARC NOP Generator', 'Alias' => 'sparc_simple', 'Version' => '$Revision$', 'Description' => 'SPARC NOP generator', diff --git a/modules/payloads/singles/bsd/x86/shell_reverse_tcp_ipv6.rb b/modules/payloads/singles/bsd/x86/shell_reverse_tcp_ipv6.rb index bb1e32bbfa..8d3f86dea1 100644 --- a/modules/payloads/singles/bsd/x86/shell_reverse_tcp_ipv6.rb +++ b/modules/payloads/singles/bsd/x86/shell_reverse_tcp_ipv6.rb @@ -50,7 +50,7 @@ module Metasploit3 )) register_options([ OptInt.new('SCOPEID', [false, "IPv6 scope ID, for link-local addresses", 0]) - ]) + ]) end end diff --git a/modules/payloads/singles/cmd/unix/bind_perl.rb b/modules/payloads/singles/cmd/unix/bind_perl.rb index 6ea72cf395..9c2af17181 100644 --- a/modules/payloads/singles/cmd/unix/bind_perl.rb +++ b/modules/payloads/singles/cmd/unix/bind_perl.rb @@ -21,7 +21,7 @@ module Metasploit3 def initialize(info = {}) super(merge_info(info, - 'Name' => 'Unix Command Shell, Bind TCP (via perl)', + 'Name' => 'Unix Command Shell, Bind TCP (via Perl)', 'Version' => '$Revision$', 'Description' => 'Listen for a connection and spawn a command shell via perl', 'Author' => ['Samy ', 'cazz'], diff --git a/modules/payloads/singles/cmd/unix/generic.rb b/modules/payloads/singles/cmd/unix/generic.rb index 1a914aff27..e5ecff7522 100644 --- a/modules/payloads/singles/cmd/unix/generic.rb +++ b/modules/payloads/singles/cmd/unix/generic.rb @@ -21,7 +21,7 @@ module Metasploit3 def initialize(info = {}) super(merge_info(info, - 'Name' => 'Unix Command, Generic command execution', + 'Name' => 'Unix Command, Generic Command Execution', 'Version' => '$Revision$', 'Description' => 'Executes the supplied command', 'Author' => 'hdm', diff --git a/modules/payloads/singles/cmd/unix/interact.rb b/modules/payloads/singles/cmd/unix/interact.rb index 601fb82f6c..b4ff6a881b 100644 --- a/modules/payloads/singles/cmd/unix/interact.rb +++ b/modules/payloads/singles/cmd/unix/interact.rb @@ -21,7 +21,7 @@ module Metasploit3 def initialize(info = {}) super(merge_info(info, - 'Name' => 'Unix Command, Interact with established connection', + 'Name' => 'Unix Command, Interact with Established Connection', 'Version' => '$Revision$', 'Description' => 'Interacts with a shell on an established socket connection', 'Author' => 'hdm', diff --git a/modules/payloads/singles/cmd/unix/reverse_perl.rb b/modules/payloads/singles/cmd/unix/reverse_perl.rb index 4f8379e88c..56c81e5482 100644 --- a/modules/payloads/singles/cmd/unix/reverse_perl.rb +++ b/modules/payloads/singles/cmd/unix/reverse_perl.rb @@ -21,7 +21,7 @@ module Metasploit3 def initialize(info = {}) super(merge_info(info, - 'Name' => 'Unix Command Shell, Reverse TCP (via perl)', + 'Name' => 'Unix Command Shell, Reverse TCP (via Perl)', 'Version' => '$Revision$', 'Description' => 'Creates an interactive shell via perl', 'Author' => 'cazz', diff --git a/modules/payloads/singles/cmd/windows/bind_perl.rb b/modules/payloads/singles/cmd/windows/bind_perl.rb index cf96be6776..e4009a30a1 100644 --- a/modules/payloads/singles/cmd/windows/bind_perl.rb +++ b/modules/payloads/singles/cmd/windows/bind_perl.rb @@ -21,7 +21,7 @@ module Metasploit3 def initialize(info = {}) super(merge_info(info, - 'Name' => 'Windows Command Shell, Bind TCP (via perl)', + 'Name' => 'Windows Command Shell, Bind TCP (via Perl)', 'Version' => '$Revision$', 'Description' => 'Listen for a connection and spawn a command shell via perl (persistent)', 'Author' => ['Samy ', 'cazz', 'patrick'], diff --git a/modules/payloads/singles/cmd/windows/reverse_perl.rb b/modules/payloads/singles/cmd/windows/reverse_perl.rb index a589713d0b..b1f367e93d 100644 --- a/modules/payloads/singles/cmd/windows/reverse_perl.rb +++ b/modules/payloads/singles/cmd/windows/reverse_perl.rb @@ -21,7 +21,7 @@ module Metasploit3 def initialize(info = {}) super(merge_info(info, - 'Name' => 'Windows Command, Double reverse TCP connection (via perl)', + 'Name' => 'Windows Command, Double reverse TCP connection (via Perl)', 'Version' => '$Revision$', 'Description' => 'Creates an interactive shell via perl', 'Author' => ['cazz', 'patrick'], diff --git a/modules/payloads/singles/linux/x86/shell_reverse_tcp2.rb b/modules/payloads/singles/linux/x86/shell_reverse_tcp2.rb index 172d9c4a00..43b011afc9 100644 --- a/modules/payloads/singles/linux/x86/shell_reverse_tcp2.rb +++ b/modules/payloads/singles/linux/x86/shell_reverse_tcp2.rb @@ -28,7 +28,7 @@ module Metasploit3 # We decoded skape's shellcode by using irb -r metasm-shell # and: puts shellcode.decode super(merge_info(info, - 'Name' => 'Linux Command Shell, Reverse TCP Inline - Metasm demo', + 'Name' => 'Linux Command Shell, Reverse TCP Inline - Metasm Demo', 'Version' => '$Revision$', 'Description' => 'Connect back to attacker and spawn a command shell', 'Author' => ['skape', 'Yoann Guillot', 'Julien Tinnes '], diff --git a/modules/payloads/singles/php/bind_perl.rb b/modules/payloads/singles/php/bind_perl.rb index 5a8df37a87..727934ec3b 100644 --- a/modules/payloads/singles/php/bind_perl.rb +++ b/modules/payloads/singles/php/bind_perl.rb @@ -21,7 +21,7 @@ module Metasploit3 def initialize(info = {}) super(merge_info(info, - 'Name' => 'PHP Command Shell, Bind TCP (via perl)', + 'Name' => 'PHP Command Shell, Bind TCP (via Perl)', 'Version' => '$Revision$', 'Description' => 'Listen for a connection and spawn a command shell via perl (persistent)', 'Author' => ['Samy ', 'cazz'], diff --git a/modules/payloads/singles/php/bind_php.rb b/modules/payloads/singles/php/bind_php.rb index cbf76b5428..05a6cfb67d 100644 --- a/modules/payloads/singles/php/bind_php.rb +++ b/modules/payloads/singles/php/bind_php.rb @@ -23,7 +23,7 @@ module Metasploit3 def initialize(info = {}) super(merge_info(info, - 'Name' => 'PHP Command Shell, Bind TCP (via php)', + 'Name' => 'PHP Command Shell, Bind TCP (via PHP)', 'Version' => '$Revision$', 'Description' => 'Listen for a connection and spawn a command shell via php', 'Author' => ['egypt', 'diaul ',], diff --git a/modules/payloads/singles/php/reverse_perl.rb b/modules/payloads/singles/php/reverse_perl.rb index b635cd196c..75688bdf78 100644 --- a/modules/payloads/singles/php/reverse_perl.rb +++ b/modules/payloads/singles/php/reverse_perl.rb @@ -23,7 +23,7 @@ module Metasploit3 def initialize(info = {}) super(merge_info(info, - 'Name' => 'PHP Command, Double reverse TCP connection (via perl)', + 'Name' => 'PHP Command, Double reverse TCP connection (via Perl)', 'Version' => '$Revision$', 'Description' => 'Creates an interactive shell via perl', 'Author' => 'cazz', diff --git a/modules/payloads/singles/php/reverse_php.rb b/modules/payloads/singles/php/reverse_php.rb index e280df2c13..5fae8bcbea 100644 --- a/modules/payloads/singles/php/reverse_php.rb +++ b/modules/payloads/singles/php/reverse_php.rb @@ -23,7 +23,7 @@ module Metasploit3 def initialize(info = {}) super(merge_info(info, - 'Name' => 'PHP Command Shell, Reverse TCP (via php)', + 'Name' => 'PHP Command Shell, Reverse TCP (via PHP)', 'Version' => '$Revision$', 'Description' => 'Reverse PHP connect back shell with checks for disabled functions', 'Author' => 'egypt', @@ -66,7 +66,7 @@ module Metasploit3 if Rex::Socket.is_ipv6?(ipaddr) uri = "tcp://[#{ipaddr}]" socket_family = "AF_INET6" - end + end shell=<<-END_OF_PHP_CODE $ipaddr='#{ipaddr}'; diff --git a/modules/payloads/singles/tty/unix/interact.rb b/modules/payloads/singles/tty/unix/interact.rb index 6ef95f2dd8..6ae32bb7ab 100644 --- a/modules/payloads/singles/tty/unix/interact.rb +++ b/modules/payloads/singles/tty/unix/interact.rb @@ -21,7 +21,7 @@ module Metasploit3 def initialize(info = {}) super(merge_info(info, - 'Name' => 'Unix TTY, Interact with established connection', + 'Name' => 'Unix TTY, Interact with Established Connection', 'Version' => '$Revision$', 'Description' => 'Interacts with a TTY on an established socket connection', 'Author' => 'hdm', diff --git a/modules/payloads/singles/windows/dns_txt_query_exec.rb b/modules/payloads/singles/windows/dns_txt_query_exec.rb index adf5eb6cea..e737b31c04 100644 --- a/modules/payloads/singles/windows/dns_txt_query_exec.rb +++ b/modules/payloads/singles/windows/dns_txt_query_exec.rb @@ -240,10 +240,10 @@ copy_piece_to_heap: rep movsb ; copy from ESI to EDI push edi ; save target for next copy push edi ; 2 more times to make sure it's at esp+8 - push edi ; + push edi ; inc ebx ; increment sequence xchg #{bufferreg},edx ; restore start of heap - jmp dnsquery ; try to get the next piece, if any + jmp dnsquery ; try to get the next piece, if any prepare_payload: mov #{bufferreg},edx diff --git a/modules/payloads/stagers/java/bind_tcp.rb b/modules/payloads/stagers/java/bind_tcp.rb index 20f163346d..84a06fe4f9 100644 --- a/modules/payloads/stagers/java/bind_tcp.rb +++ b/modules/payloads/stagers/java/bind_tcp.rb @@ -21,7 +21,7 @@ module Metasploit3 def initialize(info = {}) super(merge_info(info, - 'Name' => 'Java Bind TCP stager', + 'Name' => 'Java Bind TCP Stager', 'Version' => '$Revision$', 'Description' => 'Listen for a connection', 'Author' => [ diff --git a/modules/payloads/stagers/java/reverse_tcp.rb b/modules/payloads/stagers/java/reverse_tcp.rb index d21ec0e6b8..809ae34114 100644 --- a/modules/payloads/stagers/java/reverse_tcp.rb +++ b/modules/payloads/stagers/java/reverse_tcp.rb @@ -21,7 +21,7 @@ module Metasploit3 def initialize(info = {}) super(merge_info(info, - 'Name' => 'Java Reverse TCP stager', + 'Name' => 'Java Reverse TCP Stager', 'Version' => '$Revision$', 'Description' => 'Connect back stager', 'Author' => [ diff --git a/modules/payloads/stagers/php/reverse_tcp.rb b/modules/payloads/stagers/php/reverse_tcp.rb index bd79b0b656..e6b8632d85 100644 --- a/modules/payloads/stagers/php/reverse_tcp.rb +++ b/modules/payloads/stagers/php/reverse_tcp.rb @@ -22,7 +22,7 @@ module Metasploit3 def initialize(info = {}) super(merge_info(info, - 'Name' => 'PHP Reverse TCP stager', + 'Name' => 'PHP Reverse TCP Stager', 'Version' => '$Revision$', 'Description' => 'Reverse PHP connect back stager with checks for disabled functions', 'Author' => 'egypt', diff --git a/modules/payloads/stagers/windows/reverse_ipv6_https.rb b/modules/payloads/stagers/windows/reverse_ipv6_https.rb index 7f3695422a..ccedd4625f 100644 --- a/modules/payloads/stagers/windows/reverse_ipv6_https.rb +++ b/modules/payloads/stagers/windows/reverse_ipv6_https.rb @@ -65,7 +65,7 @@ module Metasploit3 } )) end - + # # Do not transmit the stage over the connection. We handle this via HTTPS # diff --git a/modules/payloads/stages/osx/x86/isight.rb b/modules/payloads/stages/osx/x86/isight.rb index a645f5b06b..398a6d5fc5 100644 --- a/modules/payloads/stages/osx/x86/isight.rb +++ b/modules/payloads/stages/osx/x86/isight.rb @@ -29,7 +29,7 @@ module Metasploit3 def initialize(info = {}) super(update_info(info, - 'Name' => 'Mac OS X x86 iSight photo capture', + 'Name' => 'Mac OS X x86 iSight Photo Capture', 'Version' => '$Revision$', 'Description' => 'Inject a Mach-O bundle to capture a photo from the iSight (staged)', 'Author' => 'ddz', diff --git a/modules/payloads/stages/windows/patchupmeterpreter.rb b/modules/payloads/stages/windows/patchupmeterpreter.rb index 0d06c2a683..a3b0de3f09 100644 --- a/modules/payloads/stages/windows/patchupmeterpreter.rb +++ b/modules/payloads/stages/windows/patchupmeterpreter.rb @@ -27,7 +27,7 @@ module Metasploit3 def initialize(info = {}) super(update_info(info, - 'Name' => 'Windows Meterpreter (skape/jt injection)', + 'Name' => 'Windows Meterpreter (skape/jt Injection)', 'Version' => '$Revision$', 'Description' => 'Inject the meterpreter server DLL (staged)', 'Author' => 'skape', diff --git a/modules/post/linux/gather/enum_protections.rb b/modules/post/linux/gather/enum_protections.rb index 9b5d6d3b15..2d35f6dc1a 100644 --- a/modules/post/linux/gather/enum_protections.rb +++ b/modules/post/linux/gather/enum_protections.rb @@ -84,7 +84,7 @@ class Metasploit3 < Msf::Post apps.each do |a| output = which(env_paths, a) - if output + if output print_good("#{a} found: #{output}") report_note( diff --git a/modules/post/multi/gather/dns_bruteforce.rb b/modules/post/multi/gather/dns_bruteforce.rb index 4e3c04d974..0e1a9de563 100644 --- a/modules/post/multi/gather/dns_bruteforce.rb +++ b/modules/post/multi/gather/dns_bruteforce.rb @@ -79,10 +79,10 @@ class Metasploit3 < Msf::Post cmd = "/usr/bin/host " end while(not name_list.nil? and not name_list.empty?) - 1.upto(thread_num) do - a << framework.threads.spawn("Module(#{self.refname})", false, name_list.shift) do |n| - next if n.nil? - vprint_status("Trying #{n.strip}.#{domain}") + 1.upto(thread_num) do + a << framework.threads.spawn("Module(#{self.refname})", false, name_list.shift) do |n| + next if n.nil? + vprint_status("Trying #{n.strip}.#{domain}") r = cmd_exec(cmd, "#{n.strip}.#{domain}") case session.platform @@ -92,8 +92,8 @@ class Metasploit3 < Msf::Post process_nix(r, "#{n.strip}.#{domain}") end end - a.map {|x| x.join } - end + a.map {|x| x.join } + end end end diff --git a/modules/post/multi/gather/dns_reverse_lookup.rb b/modules/post/multi/gather/dns_reverse_lookup.rb index 4b70ee0700..b5106ac795 100644 --- a/modules/post/multi/gather/dns_reverse_lookup.rb +++ b/modules/post/multi/gather/dns_reverse_lookup.rb @@ -79,9 +79,9 @@ class Metasploit3 < Msf::Post cmd = "/usr/bin/host" end while(not iplst.nil? and not iplst.empty?) - 1.upto(thread_num) do - a << framework.threads.spawn("Module(#{self.refname})", false, iplst.shift) do |ip_add| - next if ip_add.nil? + 1.upto(thread_num) do + a << framework.threads.spawn("Module(#{self.refname})", false, iplst.shift) do |ip_add| + next if ip_add.nil? r = cmd_exec(cmd, " #{ip_add}") case platform when /win/ @@ -110,8 +110,8 @@ class Metasploit3 < Msf::Post end end end - a.map {|x| x.join } - end + a.map {|x| x.join } + end end end end diff --git a/modules/post/multi/gather/dns_srv_lookup.rb b/modules/post/multi/gather/dns_srv_lookup.rb index 0f615be570..d3af7104a1 100644 --- a/modules/post/multi/gather/dns_srv_lookup.rb +++ b/modules/post/multi/gather/dns_srv_lookup.rb @@ -94,7 +94,7 @@ class Metasploit3 < Msf::Post end while(not srvrcd.nil? and not srvrcd.empty?) - 1.upto(thread_num) do + 1.upto(thread_num) do a << framework.threads.spawn("Module(#{self.refname})", false, srvrcd.shift) do |srv| next if srv.nil? r = cmd_exec(cmd, ns_opt + "#{srv}#{domain}") @@ -116,7 +116,7 @@ class Metasploit3 < Msf::Post end end a.map {|x| x.join } - end + end end end diff --git a/modules/post/multi/gather/pidgin_cred.rb b/modules/post/multi/gather/pidgin_cred.rb index 429352ef8e..e440007563 100644 --- a/modules/post/multi/gather/pidgin_cred.rb +++ b/modules/post/multi/gather/pidgin_cred.rb @@ -112,7 +112,7 @@ class Metasploit3 < Msf::Post def check_pidgin(purpledir) - path = "" + path = "" print_status("Checking for Pidgin profile in: #{purpledir}") session.fs.dir.foreach(purpledir) do |dir| if dir =~ /\.purple/ diff --git a/modules/post/multi/gather/ping_sweep.rb b/modules/post/multi/gather/ping_sweep.rb index a92cf28322..427b8ebee7 100644 --- a/modules/post/multi/gather/ping_sweep.rb +++ b/modules/post/multi/gather/ping_sweep.rb @@ -81,14 +81,14 @@ class Metasploit3 < Msf::Post ip_found = [] while(not iplst.nil? and not iplst.empty?) - 1.upto(thread_num) do - a << framework.threads.spawn("Module(#{self.refname})", false, iplst.shift) do |ip_add| - next if ip_add.nil? - if platform =~ /solaris/i + 1.upto(thread_num) do + a << framework.threads.spawn("Module(#{self.refname})", false, iplst.shift) do |ip_add| + next if ip_add.nil? + if platform =~ /solaris/i r = cmd_exec(cmd, "-n #{ip_add} 1") - else + else r = cmd_exec(cmd, count + ip_add) - end + end if r =~ /(TTL|Alive)/i print_status "\t#{ip_add} host found" ip_found << ip_add @@ -96,9 +96,9 @@ class Metasploit3 < Msf::Post vprint_status("\t#{ip_add} host not found") end - end - a.map {|x| x.join } - end + end + a.map {|x| x.join } + end end rescue Rex::TimeoutError, Rex::Post::Meterpreter::RequestError rescue ::Exception => e diff --git a/modules/post/osx/gather/enum_adium.rb b/modules/post/osx/gather/enum_adium.rb index 60536238f9..4080645f98 100644 --- a/modules/post/osx/gather/enum_adium.rb +++ b/modules/post/osx/gather/enum_adium.rb @@ -135,7 +135,7 @@ class Metasploit3 < Msf::Post # # Make a copy of the file we want to convert and steal # - fpath = "#{base}#{file}" + fpath = "#{base}#{file}" rand_name = "/tmp/#{Rex::Text.rand_text_alpha(5)}" tmp = exec("cp #{fpath} #{rand_name}") diff --git a/modules/post/windows/escalate/droplnk.rb b/modules/post/windows/escalate/droplnk.rb index eade4d1d3b..d2f0231d8e 100644 --- a/modules/post/windows/escalate/droplnk.rb +++ b/modules/post/windows/escalate/droplnk.rb @@ -12,7 +12,7 @@ class Metasploit3 < Msf::Post def initialize(info={}) super( update_info( info, - 'Name' => 'Windows Escalate SMB Icon LNK dropper', + 'Name' => 'Windows Escalate SMB Icon LNK Dropper', 'Description' => %q{ This module drops a shortcut (LNK file) that has a ICON reference existing on the specified remote host, causing SMB and WebDAV diff --git a/modules/post/windows/gather/arp_scanner.rb b/modules/post/windows/gather/arp_scanner.rb index 8da64cc56d..13b3a29063 100644 --- a/modules/post/windows/gather/arp_scanner.rb +++ b/modules/post/windows/gather/arp_scanner.rb @@ -66,7 +66,7 @@ class Metasploit3 < Msf::Post while(not iplst.nil? and not iplst.empty?) 1.upto(threads) do a << framework.threads.spawn("Module(#{self.refname})", false, iplst.shift) do |ip_text| - next if ip_text.nil? + next if ip_text.nil? h = ws.inet_addr(ip_text) ip = h["return"] h = iphlp.SendARP(ip,0,6,6) diff --git a/modules/post/windows/gather/credentials/outlook.rb b/modules/post/windows/gather/credentials/outlook.rb index 6fc08e9056..a236496258 100644 --- a/modules/post/windows/gather/credentials/outlook.rb +++ b/modules/post/windows/gather/credentials/outlook.rb @@ -188,7 +188,7 @@ class Metasploit3 < Msf::Post print_status(" Outgoing Mail Server (SMTP) User Name: #{smtp_user}") print_status(" Outgoing Mail Server (SMTP) Password: #{smtp_decrypted_password}") end - + smtp_use_ssl = get_valdata(k, 'SMTP Use SSL') if smtp_use_ssl == nil print_status(" SMTP Use SSL: No") diff --git a/modules/post/windows/gather/wmic_command.rb b/modules/post/windows/gather/wmic_command.rb index 05add2751d..1aaaf6bb75 100644 --- a/modules/post/windows/gather/wmic_command.rb +++ b/modules/post/windows/gather/wmic_command.rb @@ -19,7 +19,7 @@ class Metasploit3 < Msf::Post def initialize(info={}) super( update_info( info, - 'Name' => 'Windows Gather Run Specified WMIC command', + 'Name' => 'Windows Gather Run Specified WMIC Command', 'Description' => %q{ This module will execute a given WMIC command options or read WMIC commands options from a resource file and execute the commands in the specified Meterpreter session.}, diff --git a/modules/post/windows/manage/download_exec.rb b/modules/post/windows/manage/download_exec.rb index 94d85a031f..d95e323fe8 100644 --- a/modules/post/windows/manage/download_exec.rb +++ b/modules/post/windows/manage/download_exec.rb @@ -40,7 +40,7 @@ class Metasploit3 < Msf::Post register_advanced_options( [ OptString.new('EXEC_STRING', [false, 'Execution parameters when run from download directory' ]), - OptInt.new('EXEC_TIMEOUT', [true, 'Execution timeout', 60 ]), + OptInt.new('EXEC_TIMEOUT', [true, 'Execution timeout', 60 ]), OptBool.new( 'DELETE', [true, 'Delete file after execution', false ]), ], self.class)