04fd322c99
Merge branch 'master' of git://github.com/rapid7/metasploit-framework
2012-10-23 22:38:59 -05:00
b3e02f119c
Merge branch 'payload_ambiguity' of git://github.com/bonsaiviking/metasploit-framework into bonsaiviking-payload_ambiguity
2012-10-23 22:30:47 -05:00
18fb30074a
Merge branch 'master' of github.com:rapid7/metasploit-framework
2012-10-23 16:33:38 -05:00
77c8548855
Merge branch 'dmaloney-r7-WinRM_piecemeal'
2012-10-23 16:33:16 -05:00
8c1304557f
Code cleanup
2012-10-23 16:32:26 -05:00
be9a954405
Merge remote branch 'jlee-r7/cleanup/post-requires'
2012-10-23 15:08:25 -05:00
67c46fc97a
Merge branch 'WinRM_piecemeal' of git://github.com/dmaloney-r7/metasploit-framework into dmaloney-r7-WinRM_piecemeal
2012-10-23 14:03:44 -05:00
910644400d
References EDB cleanup
...
All other types of references use String arguments, but approximately half
of the EDB references use Fixnums. Fix this by using Strings here too.
2012-10-23 21:02:09 +02:00
21f6127e29
Platform windows cleanup
...
Change all Platform 'windows' to 'win', as it internally is an alias
anyway and only causes unnecessary confusion to have two platform names
that mean the same.
2012-10-23 20:33:01 +02:00
9c95c7992b
Require's for all the include's
2012-10-23 13:24:05 -05:00
8deead3bd2
Fix payload ambiguity with php/bind_tcp_ipv6 stager
...
Was seeing this in framework.log:
[w(0)] core: The module php/meterpreter/bind_tcp is ambiguous with
php/meterpreter/bind_tcp.
Added handler_type_alias based on windows/bind_ipv6_tcp stager.
2012-10-23 12:31:14 -05:00
e19f2d235c
Actually use the timeout in winrm cmd
2012-10-23 11:29:32 -05:00
33ce74fe8c
Merge branch 'msftidy-1' of git://github.com/schierlm/metasploit-framework into schierlm-msftidy-1
2012-10-23 02:10:56 -05:00
2335c582c3
Null response handling
2012-10-23 00:25:31 -05:00
8356cbc055
Merge branch 'master' of git://github.com/rapid7/metasploit-framework
2012-10-22 22:34:11 -05:00
1ce3655062
Merge branch 'jlee-r7-08-067-rescue-crashed-service'
2012-10-22 17:57:33 -05:00
b2db3e133d
Rescue when the service is crashed
...
Failed exploit attempts leave the service in a state where the port is
still open but login attmempts reset the connection. Rescue that and
give the user an indication of what's going on.
2012-10-22 17:57:30 -05:00
a9def564e7
Add a missing post require
2012-10-22 17:18:14 -05:00
f71f83095b
Merge branch 'WinRM_piecemeal' of git://github.com/dmaloney-r7/metasploit-framework into dmaloney-r7-WinRM_piecemeal
2012-10-22 17:13:37 -05:00
04fd990741
bad indent
2012-10-22 17:03:40 -05:00
e08cedec2e
Requested revisions/cleanup
...
minor fixes to spacing, some typos, and abse64 switched to Rex
2012-10-22 17:01:00 -05:00
cf2ec4e598
Merge branch '08-067-rescue-crashed-service' of git://github.com/jlee-r7/metasploit-framework into jlee-r7-08-067-rescue-crashed-service
2012-10-22 16:51:56 -05:00
af918b84a0
Merge branch 'standardize_authorship' of git://github.com/mubix/metasploit-framework into mubix-standardize_authorship
2012-10-22 16:47:03 -05:00
28f47e9aa0
fix spacing for all authors
2012-10-22 17:22:37 -04:00
a13a88ce28
fix spacing
2012-10-22 17:07:58 -04:00
7437d9844b
standardizing author info
2012-10-22 17:01:58 -04:00
dafb56f6b6
Merge branch 'dmaloney-r7-findpids' into rapid7
...
[Closes #950 ]
2012-10-22 15:52:07 -05:00
5b18a34ad4
References cleanup
...
Uppercase MSB, spaces in URLs.
2012-10-22 22:37:01 +02:00
4f9385aab1
Merge pull request #1 from jlee-r7/dmaloney-r7-findpids
...
Use opts.usage instead of a Table
2012-10-22 13:28:03 -07:00
651f9b9c8f
Use opts.usage instead of a Table
2012-10-22 15:16:55 -05:00
f9ac55c221
Infohash key cleanups
...
Replace obvious typos in infohash keys. Note that this *does*
affect the behaviour as those keys have been ignored before.
2012-10-22 21:24:36 +02:00
12de87e682
Merge branch 'rapid7' into mubix-remove_delicious
...
[Closes #946 ]
2012-10-22 14:18:05 -05:00
7dc6aa331b
Rescue when the service is crashed
...
Failed exploit attempts leave the service in a state where the port is
still open but login attmempts reset the connection. Rescue that and
give the user an indication of what's going on.
2012-10-22 14:15:58 -05:00
e9f7873afc
Version cleanup
...
Remove all values that are neither 0 nor $Revision$.
2012-10-22 20:57:02 +02:00
49948faa9b
remove non-functional enum_delicious module
2012-10-22 14:46:52 -04:00
04a6021631
Privileged cleanup: auxiliary modules can't
2012-10-22 20:36:49 +02:00
39e81d3e53
Arch/Platform cleanup: aux modules need neither
2012-10-22 20:28:02 +02:00
e769abc868
Platform cleanup: platform should be lowercase
2012-10-22 20:14:39 +02:00
657d527f8d
DisclosureDate cleanup: Try parsing all dates
...
Fix all dates unparsable by `Date.strptime(value, '%b %d %Y')`
2012-10-22 20:04:21 +02:00
70ac7c8345
Author cleanup: fix unmatched angle brackets
2012-10-22 19:45:27 +02:00
d337d5204b
Author cleanup: One module did not have an author
2012-10-22 18:38:18 +02:00
469f04d3c4
Merge branch 'mubix-dns_postmods'
2012-10-22 02:04:46 -05:00
a3c86f386b
Merge branch 'dns_postmods' of git://github.com/mubix/metasploit-framework into mubix-dns_postmods
2012-10-22 01:57:21 -05:00
d5bb7b1e5b
Fix all-inclusive rescue on resolve_hostname as well
2012-10-22 02:32:51 -04:00
6a281b22c4
Fix all-inclusive rescue per @wchen-r7 suggestion
2012-10-22 02:22:56 -04:00
997d5b9a22
Merge branch 'post_enum_proxy' of git://github.com/mubix/metasploit-framework into mubix-post_enum_proxy
2012-10-22 00:45:06 -05:00
716f4ab3d2
Merge branch 'post_clone_proxy' of git://github.com/mubix/metasploit-framework into mubix-post_clone_proxy
2012-10-22 00:41:36 -05:00
e6df113a05
Merge branch 'dns_postmods' of git://github.com/mubix/metasploit-framework into mubix-dns_postmods
2012-10-21 23:44:50 -05:00
84d1c2315c
change to OptPath
2012-10-21 22:27:20 -04:00
d22010e3ba
Merge branch 'lincoln-corelan-turboftp_exploit'
2012-10-21 16:40:06 -05:00
sinn3r
Tod Beardsley
Michael Schierl
James Lee
Daniel Miller
David Maloney
Rob Fuller
dmaloney-r7