Commit Graph

4625 Commits

Author SHA1 Message Date
Tod Beardsley e885ab45b6 Land #1734 Metasploit side for ip resolv 2013-09-23 16:18:40 -05:00
James Lee 9a555d8701 Fix the modules added since the branch 2013-09-17 18:25:12 -05:00
James Lee 150f0f644e Merge branch 'rapid7' into bug/osx-mods-load-order
Conflicts:
	modules/post/windows/gather/enum_dirperms.rb
2013-09-17 18:21:13 -05:00
Joe Vennix 84f015320a Probably helps to use the right alternate exploit name. 2013-09-12 16:16:49 -05:00
Joe Vennix 14577441ca Deprecates windows persistence post module. 2013-09-12 16:10:48 -05:00
James Lee 58b634dd27 Remove unnecessary requires from post mods 2013-09-12 14:36:01 -05:00
James Lee 41f23d5268 Fix merge fail
The whitespace fixes from @tabassassin somehow hosed this change.

See
845bf7146b
and
6daa90a4a5
2013-09-11 16:22:35 -05:00
jvazquez-r7 4f1db80c24 Fix requires in new post modules 2013-09-10 11:13:07 -05:00
Tod Beardsley aff35a615b Grammar fixes in descriptions 2013-09-09 15:09:53 -05:00
jvazquez-r7 ffa600ff8b Fix really the check method 2013-09-06 10:21:18 -05:00
jvazquez-r7 9b9e1592fd Retab changes 2013-09-06 10:13:38 -05:00
jvazquez-r7 a64f960bfc Merge for retab 2013-09-06 10:12:55 -05:00
jvazquez-r7 d9fed860a5 Fix check method 2013-09-06 10:11:06 -05:00
Tab Assassin b3b8cee870 Retab changes for PR #1473 2013-09-05 16:19:05 -05:00
Tab Assassin 0ba4e1da65 Merge for retab 2013-09-05 16:18:56 -05:00
Tab Assassin 2e9096d427 Retab changes for PR #1734 2013-09-05 14:59:41 -05:00
Tab Assassin 322ed35bb4 Merge for retab 2013-09-05 14:59:34 -05:00
Tab Assassin 2846a5d680 Retab changes for PR #1770 2013-09-05 14:57:40 -05:00
Tab Assassin 269c1a26cb Merge for retab 2013-09-05 14:57:32 -05:00
Tab Assassin 26b8364dcb Retab changes for PR #1789 2013-09-05 14:44:21 -05:00
Tab Assassin 789be1fe3e Merge for retab 2013-09-05 14:44:14 -05:00
Tab Assassin b720fc215b Retab changes for PR #1910 2013-09-05 14:40:18 -05:00
Tab Assassin fc8ad8c633 Merge for retab 2013-09-05 14:40:11 -05:00
Meatballs c5daf939d1 Stabs tabassassin 2013-09-05 20:36:52 +01:00
Tab Assassin 874ed2ac17 Retab changes for PR #2107 2013-09-05 14:30:08 -05:00
Tab Assassin 27564b2de2 Merge for retab 2013-09-05 14:30:03 -05:00
Tab Assassin 845bf7146b Retab changes for PR #2304 2013-09-05 13:41:25 -05:00
Tab Assassin adf9ff356c Merge for retab 2013-09-05 13:41:23 -05:00
Tab Assassin 9f3a5dc5d0 Retab new modules 2013-09-04 12:32:53 -05:00
Tab Assassin 999b802468 Merge branch 'master' into retab/rumpus 2013-09-04 12:32:05 -05:00
Meatballs a8e77c56bd Updates 2013-09-03 22:46:20 +01:00
William Vu cc838401fb Land #2314, metasploit_pcaplog title correction 2013-09-03 15:21:00 -06:00
William Vu b9ceed0c53 Land #2313, lockout_keylogger title correction 2013-09-03 15:20:20 -06:00
Meatballs ac0c493cf9 Merge branch 'master' of github.com:rapid7/metasploit-framework into local_win_priv_keyring 2013-09-03 21:33:11 +01:00
Tab Assassin 84aaf2334a Retab new material 2013-09-03 11:47:26 -05:00
Tab Assassin 0c1e6546af Update from master 2013-09-03 11:45:39 -05:00
Tod Beardsley 6daa90a4a5 Msftidy: use binary on File.open always
msftidy is complaining, here:

keylog_recorder.rb:116 - [WARNING] File.open without binary mode

Not sure how this managed to hit upstream/master with msftidy warnings.
Protip, use an msftidy pre-commit hook. We have just such a hook script
in tools/dev, as a matter of fact, so it's just a symlink away:

https://github.com/rapid7/metasploit-framework/blob/master/tools/dev/pre-commit-hook.rb
2013-09-03 10:35:50 -05:00
Tod Beardsley 8acabe457c Trailing whitespace fixup 2013-09-03 10:32:48 -05:00
Tod Beardsley ca8dacb93b Minor module description updates for grammar. 2013-09-03 10:31:45 -05:00
Meatballs 13244efecf Spacing and bugfixes 2013-09-02 21:57:11 +01:00
Meatballs 051ef0bdfa Refactor to common post module 2013-09-02 20:24:54 +01:00
sinn3r bcc0152274 Correct metasploit_pcaplog's naming style
The naming style nazi is in town. ph33r.
2013-08-31 18:25:06 -05:00
sinn3r a4bcc1f82f Correct module naming style
You know what it is.
2013-08-31 18:17:06 -05:00
Tab Assassin 41e4375e43 Retab modules 2013-08-30 16:28:54 -05:00
James Lee 63adde2429 Fix load order in posts, hopefully forever 2013-08-29 13:37:50 -05:00
jvazquez-r7 66886eed7a Land #2283, @bmerinofe's post module for PortProxy Port Forwarding 2013-08-28 17:34:14 -05:00
jvazquez-r7 f477711268 Provide more information about installing IPv6 2013-08-28 17:22:50 -05:00
jvazquez-r7 43badfaa1c Move the check_ipv6 call to the run metod 2013-08-28 17:20:11 -05:00
jvazquez-r7 05863cb1cc Delete vague exception handling only done on one place 2013-08-28 17:17:05 -05:00
jvazquez-r7 6b8c7cbe24 Omit parentheses for method call with no args 2013-08-28 17:15:28 -05:00