Commit Graph

1154 Commits (bddcb33507fee54094f033f21babbd90bbbe1b01)

Author SHA1 Message Date
Dhiru Kholia 1b6f6b8bf0 Land #2168 again
Adding Dhiru's module back now that things are straight.
2013-07-29 22:10:25 -05:00
Tod Beardsley 7e539332db Reverting disaster merge to 593363c5f with diff
There was a disaster of a merge at 6f37cf22eb that is particularly
difficult to untangle (it was a bad merge from a long-running local
branch).

What this commit does is simulate a hard reset, by doing thing:

 git checkout -b reset-hard-ohmu
 git reset --hard 593363c5f9
 git checkout upstream-master
 git checkout -b revert-via-diff
 git diff --no-prefix upstream-master..reset-hard-ohmy > patch
 patch -p0 < patch

Since there was one binary change, also did this:

 git checkout upstream-master data/exploits/CVE-2012-1535/Main.swf

Now we have one commit that puts everything back. It screws up
file-level history a little, but it's at least at a point where we can
move on with our lives. Sorry.
2013-07-29 21:47:52 -05:00
jvazquez-r7 300781823d Undo bad landing
This reverts commit e624ed18ad, reversing
changes made to 593363c5f9.
2013-07-29 17:39:12 -05:00
jvazquez-r7 b29d18d8b8 Merge branch 'ecryptfs-creds' of https://github.com/kholia/metasploit-framework 2013-07-29 16:41:41 -05:00
Dhiru Kholia 8379225e9b make msftidy happy (hopefully) 2013-07-29 23:42:29 +05:30
Dhiru Kholia 2de0a3e0f9 Add information gathering module for eCryptfs 2013-07-28 23:09:42 +05:30
jvazquez-r7 e828517ed8 Merge branch 'master' of https://github.com/rapid7/metasploit-framework 2013-07-22 17:10:45 -05:00
Tod Beardsley b4589c3c82 Expanding description 2013-07-22 15:19:30 -05:00
Rich Lundeen aa159f12b7 changed options wording 2013-07-22 11:15:22 -07:00
Rich Lundeen 57055ab754 added optional option 2013-07-22 11:13:29 -07:00
root 6bcdd37223 logged resolve_hostname to db 2013-07-19 11:14:14 -07:00
jvazquez-r7 6dec81cbdf Merge branch 'master' of https://github.com/rapid7/metasploit-framework 2013-07-06 10:38:19 -05:00
jvazquez-r7 b2e7f61814 Fix path build on total_commander 2013-07-06 10:15:30 -05:00
jvazquez-r7 df7209f28a Land #2067, @wchen-r7's fix for total_commander 2013-07-06 10:14:44 -05:00
jvazquez-r7 39f0359fa4 Land #2061, @wchen-r7's fix to make bitcoin_jacker use post mixins 2013-07-06 00:14:14 -05:00
sinn3r ca4e11c112 Use check_other more 2013-07-05 12:38:38 -05:00
sinn3r 98f49758af Don't need this line 2013-07-05 12:34:26 -05:00
sinn3r d3000c0066 These funcs want 'filename' 2013-07-05 12:29:16 -05:00
sinn3r 353db0884d Use expand_path from Msf::Post::File 2013-07-05 12:26:59 -05:00
sinn3r 18e5831ca8 Don't use begin/rescue to shut errors up and call it "file not found" 2013-07-05 12:22:05 -05:00
sinn3r dc90904e50 Avoid misleading error 2013-07-05 12:12:30 -05:00
jvazquez-r7 c859129339 Merge branch 'master' of https://github.com/rapid7/metasploit-framework 2013-07-05 12:06:05 -05:00
jvazquez-r7 bcf6d11442 Land #2049, @wchen-r7's had_pid? method work 2013-07-05 11:19:11 -05:00
jvazquez-r7 6477c6995d Merge branch 'enum_db_no_method' of https://github.com/wchen-r7/metasploit-framework 2013-07-05 09:35:34 -05:00
jvazquez-r7 a7d110367a Land #2064, @wchen-r7's fix for access uninitialized variable on enum_services 2013-07-05 09:30:23 -05:00
jvazquez-r7 b9dd3df05f Land #2068, @wchen-r7's fix to initialize variables on windows_autologin module 2013-07-05 09:09:17 -05:00
jvazquez-r7 4ed6a4d8d1 Land #2062, @wchen-r7's fix to avoid redundant check 2013-07-05 08:51:05 -05:00
jvazquez-r7 1ad4482ce2 Land #2069, @wchen-r7's patch to print info when using store_loot 2013-07-05 08:35:57 -05:00
jvazquez-r7 c459b0e937 Land #2045, @wchen-r7's fix for memory_grep module 2013-07-05 08:16:47 -05:00
sinn3r 2a32b59c88 Forgot to change var 'filename' 2013-07-05 01:37:35 -05:00
sinn3r 84050241f0 Fix target ID 2013-07-05 01:25:08 -05:00
sinn3r 1352731062 Make heap grep optional 2013-07-05 00:57:25 -05:00
sinn3r a52d38f359 Land #2052 - Fix regex 2013-07-03 16:55:07 -05:00
sinn3r ff49cc1c4f [SeeRM:#8135] - Be able to show where store_loot saves a file
If you don't print where store_loot saves the file, it can be a
pain in the butt to find it sometimes.
2013-07-03 12:29:01 -05:00
sinn3r 70c472fb7e [FixRM:#8134] - Handle registry_getvaldata return value properly
registry_getvaldata can return nil, can't always assume it's
gonna throw a string.
2013-07-03 12:23:14 -05:00
sinn3r 1064c050de [FixRM:#8132] - Fix undefined method '+' in total_commander.rb
The return value of registry_getvaldata can return nil when a
RequestError occurs, so you can't always assume it's gonna throw
you a string.
2013-07-03 12:10:23 -05:00
sinn3r 27653b661f [FixRM:#8131] & [FixRM:#8133] - Fix Base64 func usage
Instead of using Base64, these modules should use Rex.
2013-07-03 12:06:12 -05:00
sinn3r c40a605495 [FixRM:#8129] - Fix undefined method error in enum_services.rb
srv_conf may not have the 'Startup' key because it's only assigned
in service_info() when srvstart is 4, therefore it's possible to
cause an undefined method 'downcase' error.
2013-07-03 11:44:28 -05:00
sinn3r 534858a23b [FixRM:#8128] - Potential undefined method 'include' for nil
A lot of return values aren't checked, may result in undefined method X
bugs. The same type of issue is all over the place.
2013-07-03 11:40:24 -05:00
sinn3r 6198409e71 [FixRM:#8127] - Remove junk code that checks ARTIFACTS again
ARTIFACTS uses OptPath, which already checks the path. We don't need
to do this again.
2013-07-03 11:33:25 -05:00
sinn3r 944761a1dc [FixRM:#8126] - Use functions from Msf::Post::File
Some functions already exist in Msf::Post::File, should use them.
2013-07-03 11:30:05 -05:00
g0tmi1k 864f4e9d37 post/local_admin_search_enum~Regex fails,module 2
If the regex fails then the entire moudle would too
2013-07-03 00:43:08 +01:00
sinn3r a74f706bdb These modules should check PID before using it 2013-07-02 14:48:04 -05:00
sinn3r 6815eef8f4 Fix multiple issues with memory_grep
This fixes the following:
[FixRM:#8118] - Allows the module to be able to enumerate from
multiple processes with the same name.

[FixRM:#8120] - Allows the module to be able to actually read data
from the heap.
2013-07-01 18:57:00 -05:00
James Lee 1865e6c19d Fix requrires for enable_support_account 2013-07-01 16:22:39 -05:00
William Vu be1a0d3cae Land #2041, title and description cleanup 2013-07-01 15:55:13 -05:00
Tod Beardsley bc24f99f8d Various description and title updates 2013-07-01 15:37:37 -05:00
jvazquez-r7 1c6657ee86 Land #2034, @wchen-r7's patch for memory_grep 2013-07-01 13:34:57 -05:00
sinn3r 43c4f07e06 Use "unless"
Guidelines favor "unless".
2013-06-30 18:32:15 -05:00
jvazquez-r7 520a78e2c8 Add final cleanup for enable_support_account 2013-06-29 23:30:29 -05:00