Commit Graph

19629 Commits (c04e6b2b142d2ea8f22bf39f50440e71330faf41)

Author SHA1 Message Date
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
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
sinn3r 10e9b97a88 Land #2180 - Accepting args for x64 osx exec payload 2013-08-02 00:45:09 -05:00
Joe Vennix 592176137a Rewrite osx x64 cmd payload to accept args.
[SeeRM #8260]
2013-07-31 08:50:28 -05:00
jvazquez-r7 12871c2fa4 Land @todbr7's recovery for @jvazquez-r7's disaster with #2168 landing 2013-07-29 22:22:14 -05:00
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 9f5f191a6b Add Main.swf from 593363c 2013-07-29 21:53:40 -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 6f37cf22eb Merge branch 'master' of https://github.com/rapid7/metasploit-framework 2013-07-29 17:28:35 -05:00
jvazquez-r7 e624ed18ad Merge branch 'landing-pr2168' 2013-07-29 17:23:15 -05:00
jvazquez-r7 438fbababd Land #2158, @kholia's post module to collect .ecryptfs info 2013-07-29 17:21:10 -05:00
jvazquez-r7 b29d18d8b8 Merge branch 'ecryptfs-creds' of https://github.com/kholia/metasploit-framework 2013-07-29 16:41:41 -05:00
jvazquez-r7 05be76ecb7 Merge branch 'master' of https://github.com/rapid7/metasploit-framework 2013-07-29 16:41:22 -05:00
jvazquez-r7 593363c5f9 Land #2154, @wchen-r7's msfcli optimizations and refactoring 2013-07-29 16:38:32 -05:00
sinn3r ab75d00f8a Land #2169 - Description update 2013-07-29 14:24:57 -05:00
Tod Beardsley 9304bbe938 Land #3 from @Meatballs1, more better description 2013-07-29 13:37:08 -05:00
sinn3r be5bbd64be Show some examples 2013-07-29 13:26:39 -05:00
sinn3r 5efcbbd474 Land #2167 - PineApp Mail-SeCure livelog.html Exec 2013-07-29 13:18:18 -05:00
sinn3r 7967426db1 Land #2166 - PineApp Mail-SeCure ldapsyncnow.php EXEC 2013-07-29 13:16:42 -05:00
Meatballs 7801eadbc2 psh description 2013-07-29 19:14:12 +01:00
sinn3r baa0b983c8 Land #2165 - PineApp Mail-SeCure test_li_connection.php CMD EXEC 2013-07-29 13:13:55 -05:00
Dhiru Kholia 8379225e9b make msftidy happy (hopefully) 2013-07-29 23:42:29 +05:30
sinn3r 5cbe464963 Missed this var 2013-07-29 12:21:40 -05:00
sinn3r 8f94e9a362 Forget about it 2013-07-29 12:14:14 -05:00
jvazquez-r7 455569aee8 Merge branch 'master' of https://github.com/rapid7/metasploit-framework 2013-07-29 12:10:12 -05:00
jvazquez-r7 3a05993f16 Make msftidy happy and warn user about long times 2013-07-29 11:45:30 -05:00
jvazquez-r7 0851974408 Land #2162, @Meatballs1's exploit for ms13-005 2013-07-29 11:43:31 -05:00
sinn3r 434ffa143e Make sure we don't end up loading aux and exploits together 2013-07-29 11:33:27 -05:00
sinn3r 701cde010b Init all payloads if not set when module is an exploit 2013-07-29 11:25:41 -05:00
Meatballs 5c7f33a1da Merge remote-tracking branch 'origin/ms13-005' into ms13-005 2013-07-29 17:03:30 +01:00
Meatballs 9ad99ed4ca I am a git genius 2013-07-29 17:01:57 +01:00
sinn3r 312c7f0564 Use full path to check module class instead 2013-07-29 11:01:13 -05:00
Meatballs 0329caec5f Revert "Fixup psh datastore"
This reverts commit aa64f5cd58.
2013-07-29 17:00:28 +01:00
Tod Beardsley 37312f2aa9 Module, singular 2013-07-29 10:58:36 -05:00
Tod Beardsley 11e9cca855 Spelling and description touch ups. 2013-07-29 10:57:19 -05:00
sinn3r c5edd554b0 refname doesn't show module type, so use arg 2013-07-29 10:56:04 -05:00
sinn3r ed7dd8dbce Ensure consistent module naming style 2013-07-29 10:51:19 -05:00
Meatballs 09a49ebc18 Revert datastore changes 2013-07-29 16:35:47 +01:00
sinn3r 97adb2a49e Move get_stdout inside 'describe Msfcli' statement 2013-07-28 23:37:33 -05:00
sinn3r f274a9605a Change path for msfcli rspec, and use spec_helper 2013-07-28 23:33:46 -05:00
sinn3r 1a85262afd Refactor msfcli, delete the bash test script, add rspec for msfcli 2013-07-28 19:51:44 -05:00
Meatballs aa64f5cd58 Fixup psh datastore 2013-07-28 21:53:11 +01:00