infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
37,188 Commits
7 Branches
556 Tags
421 MiB
Commit Graph

37188 Commits (6bee4e759b294953e3322a63ed28b5a61e186b7f)

Author SHA1 Message Date
Jonathan Harms 675100946b Initial SSL working OK 2016-01-07 17:53:48 -06:00
wchen-r7 6a2b4c2530 Fix #6445, Unexpected HttpServer terminations 
Fix #6445

Problem:
When an HttpServer instance is trying to register a resource that
is already taken, it causes all HttpServers to terminate, which
is not a desired behavior.

Root Cause:
It appears the Msf::Exploit::Remote::TcpServer#stop_service method
is causing the problem. When the service is being detected as an
HttpServer, the #stop method used actually causes all servers to
stop, not just for a specific one. This stopping route was
introduced in 04772c8946, when Juan
noticed that the java_rmi_server exploit could not be run again
after the first time.

Solution:
Special case the stopping routine on the module's level, and not
universal.
 2016-01-07 16:55:41 -06: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
Spencer McIntyre 24290dc169 Address x86/Bmp polyglot encoder feedback 2016-01-07 10:23:32 -05:00
joev 22a0d970da Don't delete the payload after running. 2016-01-07 02:26:01 -06:00
joev fb99c61089 Remove print_status statement. 2016-01-07 01:17:49 -06:00
joev 210f065427 Add a background option for the echo cmdstager. 2016-01-07 01:16:08 -06:00
Brent Cook eb0b66a4cf
Land #6390, report exceptions on bind/listen failure 2016-01-06 21:44:06 -06:00
Josh 4e99c873c8 Fix issue when target_pid == current_pid 2016-01-06 19:58:07 -06:00
Josh 60c506d7fb Replace error handling methods 2016-01-06 18:53:54 -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
Spencer McIntyre cca0ba3efe Add an x86/Bitmap polyglot encoder 2016-01-05 23:17:34 -05: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
g0tmi1k d7061e8110 OCD fixes 2016-01-05 23:28:56 +00: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
James Lee ad399d5101
Adopt Contributor Covenant 1.3.0 2016-01-05 09:29:02 -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