Tod Beardsley
8ebaee4b7c
Don't just trash local changes
2012-11-05 14:37:32 -06:00
Tod Beardsley
d3cb9c141d
No longer TODO on the deprecation duh
2012-11-05 12:32:36 -06:00
Tod Beardsley
c8fd6ded0c
Slightly better margins for deprecation
2012-11-05 12:15:11 -06:00
Tod Beardsley
628f676b21
Fill in the deprecation warning
2012-11-05 12:13:10 -06:00
Tod Beardsley
0d7de4b575
Allow for naming a git remote/branch
2012-11-05 11:56:05 -06:00
Tod Beardsley
df53409b2d
Make msfbase_dir an instance variable
2012-11-05 11:48:09 -06:00
Tod Beardsley
0f40fabfcd
Oops on is_svn
2012-11-05 11:46:50 -06:00
Tod Beardsley
b7eca59934
Allow for switching between git and svn
...
Depending on the kind of checkout, msfupdate should be smart about this.
This was first proposed by @corelanc0d3r I believe, but rejected because
it didn't seem to solve any immediate problem. Now, it does, as we are
ditching SVN Real Soon Now for performance reasons.
This change is minimal functionality and doesn't handle switching over
from one to the other.
2012-11-05 11:44:53 -06:00
James Lee
85dd212456
Merge branch 'bug/wrong-file_changed-argument' into rapid7
...
[Closes #965 ]
2012-11-05 09:54:30 -06:00
jvazquez-r7
04668c7d61
fix response codes check to avoid second tries to fail
2012-11-05 09:26:26 +01:00
jvazquez-r7
9576d26299
Merge branch 'bitweaver_traversal' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-bitweaver_traversal
2012-11-03 18:25:46 +01:00
sinn3r
10cccb34d8
Uh... I don't want that print_line(). Forgot to remove it.
2012-11-03 05:18:17 -05:00
sinn3r
4415849009
Another attempt to fix the regex
2012-11-03 05:17:32 -05:00
sinn3r
d449052472
Make <br /> tag optional
2012-11-02 18:25:48 -05:00
sinn3r
45dce9ff76
Modify regex
2012-11-02 16:44:27 -05:00
sinn3r
d4fc99e40c
Merge branch 'ms10_104_100_continue_support' of git://github.com/jvazquez-r7/metasploit-framework into jvazquez-r7-ms10_104_100_continue_support
2012-11-02 15:16:35 -05:00
sinn3r
1d26491b77
Ok... last fix, really
2012-11-02 15:09:30 -05:00
sinn3r
a161c1faa0
Final changes
2012-11-02 15:06:51 -05:00
sinn3r
ea5dc940d2
Move module to the correct directory
2012-11-02 14:52:28 -05:00
sinn3r
a9db59feb7
Cosmetic changes, mostly
2012-11-02 14:52:02 -05:00
sinn3r
51b15d8c09
Merge branch 'concrete5_member_list' of git://github.com/ChrisJohnRiley/metasploit-framework into ChrisJohnRiley-concrete5_member_list
2012-11-02 14:43:49 -05:00
sinn3r
00d0dc3e4d
Add CVE-2012-5192 - Bitweaver overlay_type module
2012-11-02 14:20:20 -05:00
sinn3r
38518478bd
Format/msftidy fixes
2012-11-02 11:24:34 -05:00
Chris John Riley
891ad4685c
$Id and $Revision
2012-11-02 11:24:34 -05:00
Chris John Riley
954ccf1ca1
Added ability to set extension on target
2012-11-02 11:24:33 -05:00
Chris John Riley
01b13480cb
Added concrete5.org references
2012-11-02 16:45:41 +01:00
Chris John Riley
f3e03ddb42
Concrete5 CMS member list scanner
2012-11-02 16:32:34 +01:00
sinn3r
4f47865636
Merge branch 'master' of github.com:rapid7/metasploit-framework
2012-11-02 01:16:54 -05:00
sinn3r
42b285c7f6
Merge branch '403labs-post-pgpass_creds'
2012-11-02 01:16:37 -05:00
sinn3r
1a162d7dd9
Use Rex table, fix 1.8 syntax issues, format fixes
2012-11-02 01:15:47 -05:00
sinn3r
c11779a144
Merge branch 'post-pgpass_creds' of git://github.com/403labs/metasploit-framework into 403labs-post-pgpass_creds
2012-11-01 22:50:17 -05:00
James Lee
4a1087d3fa
Merge branch 'rapid7' into bug/wrong-file_changed-argument
2012-11-01 16:53:06 -05:00
Tod Beardsley
b1b85bee44
Actually require PhpEXE mixin.
2012-11-01 14:53:18 -05:00
sinn3r
4615e710ce
Merge branch 'hp_imc_uam' of git://github.com/jvazquez-r7/metasploit-framework into jvazquez-r7-hp_imc_uam
2012-11-01 13:35:45 -05:00
jvazquez-r7
22fbfb3601
cleanup
2012-11-01 17:38:04 +01:00
jvazquez-r7
e720769747
Added module for ZDI-12-171
2012-11-01 17:17:45 +01:00
Luke Imhoff
76c3decffb
Update Gemfile(.lock) to use tag 0.3.0 for metasploit_data_models
...
Ensures that Gemfile uses same version as in gemcache.
2012-11-01 08:57:57 -05:00
Luke Imhoff
a745c3a4a0
metasploit_data_models 0.3.0 installed in gemcache
2012-11-01 08:56:00 -05:00
Luke Imhoff
558b8b0fcf
File renames and restructuring for metasploit_data_models 0.3.0
2012-11-01 08:43:06 -05:00
Luke Imhoff
6aed38f309
Update metasploit_data_models paths for version 0.3.0
2012-11-01 08:39:18 -05:00
sinn3r
d9139c010d
Merge branch 'dmaloney-r7-WinRM_piecemeal'
2012-10-31 15:15:17 -05:00
sinn3r
9736d35230
Fix syntax error
2012-10-31 15:14:46 -05:00
sinn3r
98c1272b92
Update the description about AllowUnencrypted
2012-10-31 15:14:46 -05:00
David Maloney
8711484438
minor fixups
2012-10-31 15:14:46 -05:00
David Maloney
09195ad9a7
Adds the WQL execution module
2012-10-31 15:14:46 -05:00
sinn3r
834d9028cd
Fix syntax error
2012-10-31 15:13:21 -05:00
sinn3r
c5262a3e64
Update the description about AllowUnencrypted
2012-10-31 15:11:00 -05:00
jvazquez-r7
c27a4d5de2
Merge branch 'master' into bug/handle-100-continue
2012-10-31 18:56:33 +01:00
Luke Imhoff
de07ca5f07
Merge branch 'bug/wrong-file_changed-argument' of github.com:/rapid7/metasploit-framework into bug/wrong-file_changed-argument
2012-10-31 11:49:02 -05:00
jvazquez-r7
ef0f415c51
related to #980 adds support for HttpClient
2012-10-31 17:46:57 +01:00