Commit Graph

36848 Commits

Author SHA1 Message Date
Christopher Moore 3dc822588f
add aes256-ctr encryption algorithm 2016-01-08 01:12:27 +00:00
Brent Cook 8cead41f74
Land #6448, set the high-level require to metasploit/credential 2016-01-07 16:18:22 -06:00
darkbushido e38ff7079a
changing the require to start at metasploit_credentials 2016-01-07 15:49:49 -06:00
Brent Cook eb0b66a4cf
Land #6390, report exceptions on bind/listen failure 2016-01-06 21:44:06 -06:00
Brent Cook 6062d991ec
Land #6410, update to metasploit-framework 4.11.6 2016-01-06 14:41:59 -06:00
Brent Cook 6d157aafdb update for metasploit-framework 4.11.6 2016-01-06 14:41:24 -06:00
Brent Cook 7f9b804060
Land #6410, remove JtR binaries, update for independent framework releases 2016-01-06 14:16:49 -06:00
Chris Doughty 97ae09729c Add john.conf to data dir as referenced by: lib/metasploit/framework/jtr/cracker.rb 2016-01-06 13:00:05 -06:00
Chris Doughty ae57bce262 Adding wordlists back to path 2016-01-06 12:54:25 -06:00
Brent Cook 388bfec46c
Land #6415, update rspec3 conventions 2016-01-06 12:14:15 -06:00
wchen-r7 6e65d1d871
Land #6411, chinese caidao asp/aspx/php backdoor bruteforce 2016-01-06 12:03:17 -06:00
wchen-r7 92503c0ff6 Remove extra check_setup call 2016-01-06 11:01:35 -06:00
William Vu d23119a07c
Land #6440, SCADAPASS wordlist 2016-01-06 10:36:44 -06:00
Vex Woo 741180c761 Merge pull request #8 from wchen-r7/pr6411
rspec and username fix for caidao LoginScanner
2016-01-06 16:26:06 +08:00
wchen-r7 bdda8650a2 Do not support username, because the backdoor doesn't use one 2016-01-06 02:02:11 -06:00
wchen-r7 480913cb32 Add rspec 2016-01-06 01:41:13 -06:00
JT bf764deefb Add SCADA Default UserPass List
This list was based on SCADAPASS: https://github.com/scadastrangelove/SCADAPASS
2016-01-06 12:25:29 +08:00
Jon Hart d626d7f0c9
Land #6416, @all3g's rewrite/improvements to redis_server 2016-01-05 19:02:26 -08:00
Vex Woo f2fb8f7cc4 Merge pull request #7 from jhart-r7/pr/fixup-6416
Make Redis command configurable
2016-01-06 09:30:40 +08:00
Jon Hart b20ade416b
Land #6425, @bcook-r7's update to Nokogiri. security++ 2016-01-05 16:32:26 -08:00
Jon Hart 90ea88e5ba
Make command used configurable 2016-01-05 16:23:10 -08:00
Jon Hart 3ccdd12ecb
Put peer first in all prints 2016-01-05 16:09:50 -08:00
Jon Hart 1d997234cb
Remove unnecessary degistering of RHOST 2016-01-05 16:08:18 -08:00
wchen-r7 6cfaf93337
Land #6433, Add D-Link DCS-931L File Upload 2016-01-05 13:16:11 -06:00
wchen-r7 7259d2a65c Use unless instead of if ! 2016-01-05 13:05:01 -06:00
nixawk 8a76bbafff Add peer to vprint_error 2016-01-06 01:51:23 +08:00
Vex Woo 7bd549ae36 Merge pull request #6 from jhart-r7/pr/fixup-6416
Fixup redis_server PR 6416
2016-01-06 01:36:55 +08:00
Jon Hart eef154420b This is a scanner, so vprint things that occur frequently 2016-01-05 09:06:36 -08:00
Jon Hart 63324bd77d Rescue correct exceptions 2016-01-05 09:05:32 -08:00
Jon Hart 1b48556456 Use cleaner hash syntax 2016-01-05 09:05:32 -08:00
nixawk 9714923824 ensure disconnect / remove self.class from register_options 2016-01-06 00:54:54 +08:00
William Vu 9f1ceb4b3b
Land #6426, enable_rdp typo fix 2016-01-05 10:17:25 -06:00
William Vu 938cc2e4c4
Land #6429, LHOST tab completion nil fix 2016-01-05 10:16:47 -06:00
William Vu be340774ea
Land #6432, Piata SSH scanner wordlist 2016-01-05 10:15:17 -06:00
William Vu 22baaf4eb2
Land #6434, SAP ICM wordlist update 2016-01-05 10:00:15 -06:00
William Vu 6cb9ad0d72
Land #6435, unaligned def/end fix 2016-01-05 09:59:25 -06:00
nixawk c3158497c0 rebuild / add check_setup / send_request 2016-01-05 15:10:26 +08:00
nixawk cbbbd9a7e7 end is not aligned with def 2016-01-05 14:07:43 +08:00
nixawk 20cd156047 replace auxiliary/scanner/misc/redis_server with auxiliary/scanner/redis/redis_server 2016-01-05 13:14:40 +08:00
JT 66e2d945d8 Add more SAP ICM paths 2016-01-05 13:05:46 +08:00
Brendan Coles 7907c93047 Add D-Link DCS-931L File Upload module 2016-01-05 04:15:38 +00:00
JT 913e8ec525 Update piata_ssh_userpass.txt 2016-01-05 11:28:54 +08:00
JT 713828d0b6 Add piata wordlist
Add user and pass wordlist from Piata Mass SSH scanner
2016-01-05 11:27:04 +08:00
wchen-r7 f058564e7f
Land #6430, Update egghunter.rb - Add msfenv requirements 2016-01-04 18:42:43 -06:00
Tod Beardsley 868b6f8b2c
Land #6424, update year strings. 2016-01-04 16:31:25 -06:00
Tod Beardsley 04e1675ed6
Update COPYING, too. 2016-01-04 16:31:01 -06:00
x90" * 365 cedb4b7340 Update egghunter.rb msfenv requirements
On Stock Kali 2.0 (after apt-get upgrade), the following command errors ./egghunter.rb --list-formats.  Adding the require 'msfenv' to the file alleviates the issue.

root@kali:/usr/share/metasploit-framework/tools/exploit# ./egghunter.rb --list-formats
/usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require': cannot load such file -- rkelly (LoadError)
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/share/metasploit-framework/lib/rex/proto/http/response.rb:5:in `<top (required)>'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/share/metasploit-framework/lib/rex/proto/http.rb:4:in `<top (required)>'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/share/metasploit-framework/lib/rex/proto.rb:2:in `<top (required)>'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/share/metasploit-framework/lib/rex.rb:79:in `<top (required)>'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/share/metasploit-framework/lib/msf/core.rb:17:in `<top (required)>'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/share/metasploit-framework/lib/msf/base.rb:17:in `<top (required)>'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from ./egghunter.rb:9:in `<main>'
2016-01-04 17:21:21 -05:00
James Lee 2dd59a932b
Clean up some warnings 2016-01-04 16:02:43 -06:00
James Lee 05d8f9d186
Make sure addr is not nil
See http://ruby-doc.org/stdlib-2.2.2/libdoc/socket/rdoc/Socket/Ifaddr.html#method-i-addr
Which says:
    Returns the address of *ifaddr*. nil is returned if address is not
    available in *ifaddr*.

I ran into this with a teql interface, but who knows what else might
trigger it.
2016-01-04 15:58:03 -06:00
William Vu 3990c021c2
Land #6318, updates for ssh_identify_pubkeys 2016-01-04 13:27:38 -06:00