Christian Mehlmauer
de88908493
code style
2014-12-11 23:30:20 +01:00
URI Assassin
35d3bbf74d
Fix up comment splats with the correct URI
...
See the complaint on #4039 . This doesn't fix that particular
issue (it's somewhat unrelated), but does solve around
a file parsing problem reported by @void-in
2014-10-17 11:47:33 -05:00
Brandon Turner
05f0d09828
Merge branch staging/electro-release into master
...
On August 15, shuckins-r7 merged the Metasploit 4.10.0 branch
(staging/electro-release) into master. Rather than merging with
history, he squashed all history into two commits (see
149c3ecc63
and
82760bf5b3
).
We want to preserve history (for things like git blame, git log, etc.).
So on August 22, we reverted the commits above (see
19ba7772f3
).
This merge commit merges the staging/electro-release branch
(62b81d6814
) into master
(48f0743d1b
). It ensures that any changes
committed to master since the original squashed merge are retained.
As a side effect, you may see this merge commit in history/blame for the
time period between August 15 and August 22.
2014-08-22 10:50:38 -05:00
Brandon Turner
19ba7772f3
Revert "Various merge resolutions from master <- staging"
...
This reverts commit 149c3ecc63
.
Conflicts:
lib/metasploit/framework/command/base.rb
lib/metasploit/framework/common_engine.rb
lib/metasploit/framework/require.rb
lib/msf/core/modules/namespace.rb
modules/auxiliary/analyze/jtr_postgres_fast.rb
modules/auxiliary/scanner/smb/smb_login.rb
msfconsole
2014-08-22 10:17:44 -05:00
joev
5654370316
Remove hashdump functionality from enum_osx.
...
There is a specific hashdump module that is more up-to-date, no need to duplicate
functionality (and code).
2014-08-18 11:40:11 -05:00
Samuel Huckins
149c3ecc63
Various merge resolutions from master <- staging
...
* --ask option ported to new location
* --version option now works
* MSF version updated
* All specs passing
2014-08-15 11:33:31 -05:00
William Vu
92963d4999
Fix broken NTLM hash format
2014-06-30 11:35:28 -05:00
William Vu
90fb07ba6d
Use downcase instead of upcase
2014-06-27 14:12:10 -05:00
William Vu
aaeca5ce5b
Remove user field from PBKDF2 hash
2014-06-27 11:26:45 -05:00
William Vu
6e1fa8ff5a
Refactor OS X hashdump creds
2014-06-26 15:10:35 -05:00
William Vu
29f5344d26
Drop merge of service_data, since it doesn't exist
2014-06-16 09:27:01 -05:00
William Vu
2f1032d617
Add a missing comma and a comment
2014-06-13 15:48:14 -05:00
William Vu
72fdf6a607
Get rid of the rest of the service stuff
2014-06-13 15:45:13 -05:00
William Vu
277c9d68bc
Remove service_name, since it doesn't make sense
2014-06-12 18:37:00 -05:00
William Vu
3a1578bead
Don't use getaddress with session.session_host
2014-06-12 18:29:46 -05:00
William Vu
86671796b7
Refactor autologin_password creds
2014-06-12 13:54:52 -05:00
Tod Beardsley
d6a63433a6
Space at EOL
2013-12-26 10:37:18 -06:00
sinn3r
78db7429d0
Turns out the latest Safari is still vulnerable.
...
The version check is currently disabled because turns out the latest
Safari (6.1.1) is still vulnerable - I can still loot it in plain
text.
2013-12-24 19:27:45 -06:00
sinn3r
a26e12b746
Updates descriiption and improves regex for safari_lastsession.rb
...
This updates two things for the safari_lastsession post module:
1. The description is updated: More information is added to describe
how Safari would end up storing the Gmail credential in the last
session state, and what it means to you as an attacker.
2. Regex update for the domain to search for: Before the module starts
extract the session data, it needs to know which domain to extract from.
Originally I only added mail.google.com, but turns out the sensitive info
can be found in accounts.google.com, so I added that one.
2013-12-24 14:00:55 -06:00
William Vu
9434d60021
Remove EOL whitespace from OS X hashdump
2013-12-19 10:39:49 -06:00
sinn3r
8dfa2e6963
Land #2734 - OSX Gather Autologin Password as Root
2013-12-18 15:37:45 -06:00
sinn3r
5011c4d928
The "unless" Ruby nazi is in town
2013-12-18 15:28:31 -06:00
sinn3r
5ec3d5f3f6
Raise specific exceptions
2013-12-18 15:27:49 -06:00
sinn3r
10e16673a7
There must be read_file
2013-12-17 16:42:49 -06:00
sinn3r
21feae0bbc
Make sure the file path is readable when it's ~/
2013-12-17 16:38:58 -06:00
jvazquez-r7
7ec96876d9
Delete unnecessary includes
2013-12-17 15:57:09 -06:00
sinn3r
374ef71c12
Favor read_file instead
2013-12-17 15:34:52 -06:00
sinn3r
ea6ba2b159
Add post module to get LastSession.plist
...
LastSession.plist sometimes contains sensitive information such as
usernames and passwords. It'd be nice to keep this in loot.
2013-12-17 13:07:30 -06:00
jvazquez-r7
2ef3caa9d7
Land #2735 , @jvennix-r7 support of 10.8+ on osx hashdump
2013-12-10 09:39:04 -06:00
Joe Vennix
06b651de7b
Revert read_file to cat so that pipe will work.
2013-12-09 19:30:08 -06:00
Joe Vennix
450716c788
Remove meterpreter support from osx autologin gather.
2013-12-09 19:19:20 -06:00
Joe Vennix
6d1d45c691
Add user param to nt_hash call.
2013-12-09 10:28:06 -06:00
sinn3r
9c5991980a
Land #2733 - Disable meterpreter support because they're not stable
2013-12-09 02:50:36 -06:00
Joe Vennix
dea35252af
Kill unused method.
2013-12-08 14:35:49 -06:00
Joe Vennix
df76651834
Make sure loot is named correctly.
2013-12-08 14:31:18 -06:00
Joe Vennix
7f3ab14179
Make pipe part of /bin/bash cmd.
2013-12-08 14:27:28 -06:00
Joe Vennix
9b34a8f1ad
Supports 10.3
2013-12-08 14:26:16 -06:00
Joe Vennix
f981a04918
Fix MATCHUSER bug.
...
* Also add spacing and indentation for better readability.
* Refactors grab_shadow_blob method.
2013-12-08 14:21:48 -06:00
Joe Vennix
eacab1b2ad
Fix description, kill dead constant.
2013-12-07 22:28:16 -06:00
Joe Vennix
969f45fd32
Refactor OSX hashdump post module.
...
* Adds support for MATCHUSER regex option
* Adds support for OSX 10.8 and 10.9 hashes (PBKDF2)
* DRYs up a bunch of older code, adds lots of helper fns
* Ends up shaving off ~20 lines
2013-12-07 22:22:23 -06:00
Joe Vennix
3066e62711
Fix typo, fix no-autologin users bug.
2013-12-07 19:27:36 -06:00
Joe Vennix
4cb788b9de
Adds osx autologin password post module.
2013-12-07 19:01:35 -06:00
Joe Vennix
c6eac67ab5
Kill meterpreter support for osx media modules.
...
There is some bug that I haven't been able to track down that causes the
osx call to run the event queue to just hang on latest OSX + Java/python
meterpreter. I tried rewriting these modules using OSX's new Media API,
but I run into the same problem. Until I find a solution, we should mark
these shell-only.
2013-12-07 17:46:26 -06:00
sinn3r
19293d89dd
Land #2704 - rm script launcher and fix file_exists?
2013-12-02 15:05:01 -06:00
Peter Toth
44e37f1b98
Improved meterpreter compatibility
2013-12-02 21:43:58 +01:00
jvazquez-r7
7e379376dc
Land #2635 , @peto01 and @jvennix-r7's osx post module to manage volumes
2013-12-02 09:22:23 -06:00
jvazquez-r7
cc2b7950bf
Do minor cleanup to mount_share
2013-12-02 09:21:36 -06:00
joev
040a629f34
Kill meterpreter support.
...
* Meterpreter seems to fall over on the cmd escaping, and dies if you
try to pass it an array of args (python/java meterpreter on various versions
of osx).
2013-12-01 20:17:43 -06:00
joev
2de9a4f3c1
Add support for 10.5 shares.
2013-12-01 20:13:54 -06:00
Peter Toth
95a98529c4
Removed script launcher wrapper and fixed the file_exists so that the module now detects input
2013-11-27 21:38:20 +01:00
joev
6561f149a8
DRY up URL_REGEX constant.
2013-11-27 06:16:25 -06:00
joev
b0416b802d
Change the Recent shares implementation.
...
* Allows us to see protocol of Recent Shares
* Parses protocol from file share URL
2013-11-27 06:08:48 -06:00
joev
e876155e1a
More tweaks to mount_share.
...
* Adds some docs to some of the methods to further distinguish
the separate sets of shares.
2013-11-27 05:45:46 -06:00
joev
485e38ebca
Some code tweaks to post/osx/mount_share.
...
* Make PROTOCOL an Enum
* Move path override options to advanced section
* More Enumerable rework
* Move one-off regexes back to inline, pull out protocol list
2013-11-27 05:22:12 -06:00
Peter Toth
4a6511311d
Code improvements according to feedback
2013-11-22 15:35:45 +01:00
Peter Toth
3afa21c721
Added favorite and recent shares to the output
2013-11-21 23:55:24 +01:00
jvazquez-r7
f6f0d81149
Land #2632 , @peto01 OSX VPN Manager post module
2013-11-18 09:49:14 -06:00
jvazquez-r7
0a930ef6e1
Clean osx vpn post module
2013-11-18 09:47:52 -06:00
Peter Toth
7db42efdd4
Code restructure and more robust error handling
2013-11-14 13:44:49 +01:00
jvazquez-r7
2b19490095
Fix Exception handling
2013-11-13 13:57:15 -06:00
jvazquez-r7
95f371a1a6
Move screen_capture to the capture folder
2013-11-13 13:41:11 -06:00
jvazquez-r7
f65e82523b
Clean screen_capture
2013-11-13 13:40:41 -06:00
Peter Toth
0c096c10fb
Submitting first version for pull request
2013-11-13 17:03:38 +01:00
Peter Toth
f5760d5e4c
Removed unnecessary delay
2013-11-13 16:25:47 +01:00
Peter Toth
c4a8bfb175
Tighter error handling
2013-11-13 16:19:38 +01:00
Peter Toth
78199409dd
Changes according to feedback
2013-11-13 14:13:40 +01:00
Peter Toth
92da6760ef
Modified module to use windows/screen_spy code
2013-11-13 13:30:20 +01:00
Peter Toth
3fdaf4de94
Work in progress
2013-11-13 13:11:27 +01:00
Peter Toth
76660b858c
In progress
2013-11-13 12:32:49 +01:00
Peter Toth
049111cd94
In progress
2013-11-13 11:21:39 +01:00
Peter Toth
d9c402c035
Fixed the module name
2013-11-13 08:57:50 +01:00
Peter Toth
2d9e8e09e6
Minor bugfix
2013-11-13 02:07:06 +01:00
Peter Toth
1fed50c96a
General improvements according to feedback
2013-11-13 01:54:42 +01:00
Peter Toth
6e12553393
Changed option SNAP_FILETYPE to FILETYPE
2013-11-13 00:51:58 +01:00
Peter Toth
779cb48b76
General improvements addressing feedback
2013-11-13 00:42:00 +01:00
Peter Toth
c5f21ef463
added osx vpn module
2013-11-12 12:47:33 +01:00
Peter Toth
b722fee15c
added OSX module screen_capture
2013-11-12 12:32:30 +01:00
Tod Beardsley
5d86ab4ab8
Catch mis-formatted bracket comments.
2013-10-15 14:52:12 -05:00
Tod Beardsley
c83262f4bd
Resplat another common boilerplate.
2013-10-15 14:07:48 -05:00
Tod Beardsley
23d058067a
Redo the boilerplate / splat
...
[SeeRM #8496 ]
2013-10-15 13:51:57 -05:00
Tod Beardsley
4266b88a20
Move author name to just 'joev'
...
[See #2476 ]
2013-10-07 12:50:04 -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
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
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
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
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
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
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