adam/metasploit-gs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,919 Commits 27 Branches 1,043 Tags
478cd2ed5c4e4651a5fa4e9ed7ccf8fb795bd2cf
Commit Graph

11597 Commits

Author SHA1 Message Date
Christian Mehlmauer 5a0e11fb72 revert file check 2016-01-21 20:21:41 +01:00
Christian Mehlmauer 390b46dd25 also check file for existance 2016-01-19 23:55:49 +01:00
Christian Mehlmauer b45e22b64d use .any? 2016-01-19 23:16:10 +01:00
Christian Mehlmauer aaa1174ca5 fix rspec errors without database 2016-01-19 20:28:58 +01:00
Metasploit a030179577 Bump version of framework to 4.11.8 2016-01-15 15:17:13 -08:00
Brent Cook 59660dd6d0 Land #6465, remove unneeded meterpreter extension post-installation copies 2016-01-15 17:04:14 -06:00
OJ e7e63d92be Land #6467 : fix missing requires in payloads 
Fixes #6460
 2016-01-15 07:42:14 +10:00
Brent Cook e1be57d658 Land #6458, Backport net-ssh AES CTR ciphers 2016-01-14 14:44:49 -06:00
Brent Cook 544b681981 Land #6451, Backport net-ssh Diffie-Hellman Group Exchange SHA-256 key exchange 2016-01-14 14:43:52 -06:00
Brent Cook 28cf943bcb Fix a couple of missing requires in payloads. 
This pops up occasionally. This fixes a couple of anecdotal reports of missing
requires that cause the loader to fail, depending on the directory sort order.

It also fixes the problem as reported in #6460
 2016-01-14 13:17:26 -06:00
Brent Cook 8479d01029 Land #6450, add TLS support to MSSQL 2016-01-14 12:17:40 -06:00
Brent Cook 37178cda06 Land #6449, properly handle HttpServer resource collisions 2016-01-14 12:15:18 -06:00
David Maloney f7ce0dfedf remove the merge extension intialiser 
this initialiser conflicts with the gemfication
of framework and causes permissions issues

MS-972
 2016-01-12 14:08:54 -06:00
Manuel Mancera 4ab58caa93 Fix the help option for vulns command 2016-01-11 22:19:44 +01:00
Christopher Moore 96b6eb6b06 remove extraneous comma 2016-01-10 17:13:15 +00:00
Christopher Moore b7e3d97935 remove extra spacing 2016-01-10 17:12:41 +00:00
Christopher Moore b3e42c3611 add missing coding preamble 2016-01-10 17:10:23 +00:00
Christopher Moore 8f72166f66 add missing coding preamble 2016-01-10 17:08:58 +00:00
Christopher Moore 9ff5ffd1ac fix erroneous comment 2016-01-09 17:56:11 +00:00
Christopher Moore 888be6133c KEx availability depends on OpenSSL support 2016-01-09 13:45:23 +00:00
Christopher Moore 3a5805faaf add CTR mode to support the new ciphers 2016-01-08 01:43:21 +00:00
Christopher Moore 5a710e4969 add aes128-ctr encryption algorithm 2016-01-08 01:15:17 +00:00
Christopher Moore f82e32372e add aes192-ctr encryption algorithm 2016-01-08 01:14:09 +00:00
Christopher Moore 3dc822588f add aes256-ctr encryption algorithm 2016-01-08 01:12:27 +00:00
Christopher Moore 77cd28c136 add dh group exchange sha256 kex to net-ssh lib 2016-01-08 00:58:48 +00:00
Louis Sato 192505fe2d killing threads and closing sockets more elegantly 2016-01-07 17:57:32 -06:00
Metasploit dea4f35b0e Bump to 4.11.7 2016-01-07 15:56:59 -08:00
Jonathan Harms 5266860cec Squashed more commits back into 1 2016-01-07 17:53:49 -06:00
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
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 7f9b804060 Land #6410, remove JtR binaries, update for independent framework releases 2016-01-06 14:16:49 -06:00
wchen-r7 6e65d1d871 Land #6411, chinese caidao asp/aspx/php backdoor bruteforce 2016-01-06 12:03:17 -06:00
wchen-r7 480913cb32 Add rspec 2016-01-06 01:41:13 -06:00
nixawk c3158497c0 rebuild / add check_setup / send_request 2016-01-05 15:10:26 +08: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
Chris Doughty 44ece87480 Merge branch 'master' into framework-as-a-gem 2016-01-04 09:04:32 -06:00
nixawk 370351ca88 chinese caidao asp/aspx/php backdoor bruteforce 2015-12-31 15:17:01 +08:00
Brent Cook bcd1a6d45e make JSON key format a little more standard, emit options 2015-12-30 16:00:09 -06:00
Chris Doughty 2a0ae144df Fixup rubocop warnings for cleanup purposes 2015-12-30 14:33:02 -06:00
Chris Doughty bb857e7a33 Add new line after json output for cleaner usability 2015-12-30 14:32:31 -06:00
Chris Doughty 8090bbc750 Changes to support framework as a gem 2015-12-30 11:00:45 -06:00
Chris Doughty 3f98511d7c Cleanup logic to force an output type 2015-12-29 15:11:16 -06:00
Chris Doughty 29ea553e03 Adding a json formatting option to the info command 2015-12-29 13:57:35 -06:00
Brent Cook e23b5c5435 Land #6179, add NTP initial crypto nak spoofing module 2015-12-24 15:46:18 -06:00
Brent Cook eec6a6f905 Land #6304, simplify Meterpreter livelness checks 2015-12-24 15:42:17 -06:00
Jon Hart beb2fa9f92 Use bind_addresses rather than bind_address; fixes #6394 2015-12-24 09:20:21 -08:00
Jon Hart efdb6a8885 Land #6392, @wchen-r7's 'def peer' cleanup, fixing #6362 2015-12-24 08:53:32 -08:00