David Maloney
7d0cf73af7
Fix multi-meter_inject error msg
...
Was trying to coerce the exception class
to string rather than calling .message
Results in a stacktrace.
FIXRM #8460
2013-10-08 11:11:38 -05:00
Tod Beardsley
4266b88a20
Move author name to just 'joev'
...
[See #2476 ]
2013-10-07 12:50:04 -05:00
Meatballs
c460f943f7
Merge branch 'master' into data_dir
...
Conflicts:
modules/exploits/windows/local/always_install_elevated.rb
plugins/sounds.rb
scripts/meterpreter/powerdump.rb
scripts/shell/spawn_meterpreter.rb
2013-10-02 20:17:11 +01:00
Tod Beardsley
4dc88cf60f
Expand descriptions for ease of use.
2013-09-30 13:30:31 -05:00
Tod Beardsley
7cc2ad55a6
Land #1770 , unattend.xml snarfing modules
2013-09-27 16:04:38 -05:00
Tod Beardsley
d869b1bb70
Unless, unless everywhere.
2013-09-27 15:55:57 -05:00
Tod Beardsley
ae655e42d2
Touchups: boolean check, unless, and TODO comment
2013-09-27 15:54:03 -05:00
Tod Beardsley
37e4d58f4a
Call CSV text/plain so it can be viewed normally
...
Otherwise, things parsing through the loot table will treat it as binary
data, and not display it in a normal texty way, even though it's totally
readable with just a little squinting.
2013-09-27 15:48:48 -05:00
Tod Beardsley
5e77dccd48
Add a ref to an example unattend.xml
2013-09-27 15:45:57 -05:00
Meatballs
7ba846ca24
Find and replace
2013-09-26 20:34:48 +01:00
Tod Beardsley
f47d4d7927
Revert change for resolve_hosts after #2415
2013-09-24 12:47:00 -05:00
Tod Beardsley
c547e84fa7
Prefer Ruby style for single word collections
...
According to the Ruby style guide, %w{} collections for arrays of single
words are preferred. They're easier to type, and if you want a quick
grep, they're easier to search.
This change converts all Payloads to this format if there is more than
one payload to choose from.
It also alphabetizes the payloads, so the order can be more predictable,
and for long sets, easier to scan with eyeballs.
See:
https://github.com/bbatsov/ruby-style-guide#collections
2013-09-24 12:33:31 -05:00
Tod Beardsley
8db1a389eb
Land #2304 fix post module require order
...
Incidentally resolve conflict on current_user_psexec to account for the
new powershell require.
2013-09-23 16:52:23 -05:00
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
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
Meatballs
c5daf939d1
Stabs tabassassin
2013-09-05 20:36:52 +01: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
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
jvazquez-r7
c04e6b2b14
Reduce code complexity on check_ipv6
2013-08-28 17:13:21 -05:00
jvazquez-r7
f339510816
Use OptPort
2013-08-28 17:10:22 -05:00
jvazquez-r7
ad8b6ec1ef
Avoid redefine builtin datastore options
2013-08-28 17:08:22 -05:00
jvazquez-r7
ad1b9fbaef
Use datastore options to avoid complex logic around args
2013-08-28 17:00:10 -05:00
jvazquez-r7
c68986e6eb
Favor unless over if not
2013-08-28 16:50:44 -05:00
jvazquez-r7
3a2a2a9cc0
Beautify metadata
2013-08-28 16:48:36 -05:00
bmerinofe
c31a2332be
Juan changes applied
2013-08-28 19:53:54 +02:00
jvazquez-r7
1042dbe56a
Land #2108 , @jiuweigui's post module to get info from prefetch files
2013-08-28 10:01:06 -05:00
jvazquez-r7
0fbe411be7
Ensure use Ruby File
2013-08-28 09:55:21 -05:00
jvazquez-r7
5c32bb4a8e
Beautify metadata
2013-08-28 09:32:23 -05:00
jvazquez-r7
4f8ba82d02
Make gather_pf_info return a prefetch entry
2013-08-28 09:29:49 -05:00
jvazquez-r7
904bd12663
Fix print over nil or empty string
2013-08-28 09:27:18 -05:00
jvazquez-r7
ef3085823c
Use default timeout value
2013-08-28 09:26:46 -05:00
jvazquez-r7
8ac82b8b18
Beautify timezone_key_values function
2013-08-28 09:25:49 -05:00
jvazquez-r7
bc593aab4f
Avoid confusion between variable and method name
2013-08-28 09:24:32 -05:00
Joe Vennix
f823290a4c
Add nc check. Prints successful binary match.
...
* kills session nil check
2013-08-27 17:21:18 -05:00
sinn3r
13996b98cf
Correct action description for recording
...
The correct description is recording
2013-08-27 12:39:46 -05:00
sinn3r
a91b38cbf4
Land #2276 - osx webcam and record_mic post modules
2013-08-27 12:28:14 -05:00
Joe Vennix
067b8f3c59
Adds session existence check. Moves error log path to datastore option.
2013-08-27 11:44:21 -05:00
Joe Vennix
8a8f80e097
Move error log path to datastore option.
2013-08-27 11:43:20 -05:00
sinn3r
728d0a0e65
Land #2240 - OSX keylogger
2013-08-27 11:36:58 -05:00
sinn3r
a9459ef703
Update module title for naming style consistency
2013-08-27 11:36:26 -05:00
sinn3r
16ace44f2d
Move keylogger.rb to post/osx/capture/keylog_recorder
...
To match the naming consistency with Windows
2013-08-27 11:35:00 -05:00
Joe Vennix
5cc4ef09d1
Move previous error log path to method. Renames the #check method.
2013-08-27 11:25:00 -05:00
Joe Vennix
87c03237a9
Fix discrepencies between unix/osx with whereis cmd.
2013-08-27 03:17:14 -05:00
Joe Vennix
98b21471ed
fix some bugs in cups_root_file_read module.
2013-08-27 03:03:08 -05:00
bmerinofe
2b577552a2
OptEnum option changed
2013-08-26 15:25:23 +02:00
bmerinofe
64d21c7216
added portproxy post meterpreter module
2013-08-26 14:44:41 +02:00
Joe Vennix
34404ee067
Commit cups module. Tested on osx 10.7, 10.8, and unpatched ubuntu 12.0.4.
2013-08-25 14:30:11 -05:00
jiuweigui
2ebfdcc84b
Fix to description
2013-08-24 19:32:01 +03:00
jiuweigui
73f4259156
Fix based on suggestions
2013-08-24 19:14:48 +03:00
Joe Vennix
2d3f599498
Moves ruby_dl helpers to proper place in repo.
...
* Adds fail_with methods and moves timeouts to constants.
2013-08-23 17:17:19 -05:00
Joe Vennix
ba00395cfd
Set filename to osx_mic_rec instead of webcam.
2013-08-23 15:52:24 -05:00
Joe Vennix
6c4ad6a976
Move modules to post/osx/manage.
2013-08-23 15:38:58 -05:00
Joe Vennix
c3b98262bf
Seriously ,stop writing things to my desktop.
2013-08-23 15:16:41 -05:00
Joe Vennix
7ebe6635ea
Finish fixing ruby 1.8.7 regressions. Works on 10.8 and 10.7.
2013-08-23 15:06:48 -05:00
jiuweigui
514d2b4721
Fix to make msftidy happy.
2013-08-21 21:46:44 +03:00
jiuweigui
0cc499faf7
Minor deletes related to filetime change.
2013-08-21 14:47:50 +03:00
jiuweigui
3a2433dac9
Remove unneeded filetime read
2013-08-21 12:18:07 +03:00
sinn3r
86d6bce8c4
[FixRM #8312 ] - Fix file handle leaks
...
Fix file handle leaks for [SeeRM #8312 ]
2013-08-18 20:31:13 -05:00
Joe Vennix
f843743294
Adds fixes from @wchen-r7.
2013-08-18 18:46:51 -05:00
Joe Vennix
017309d02d
Minor fixes to keylogger.
2013-08-18 16:29:34 -05:00
Joe Vennix
1cdf77df7d
OSX keylogger module finally working.
2013-08-18 16:21:38 -05:00
jiuweigui
0063d4e06c
Extend description & add Win2k3 section to WinXP section.
2013-08-16 14:44:08 +03:00
jiuweigui
8602e744da
Add support for Win2k3
2013-08-16 02:46:16 +03:00