98c387cc81
Merge pull request #886 from todb-r7/fix-msfupdate
...
Fix msfupdate for #7297
2012-10-10 09:23:28 -07:00
09f34268d2
Deal with blank or missing config-dir better
...
Just deleting at an index will be surprising when you've already deleted
the wait/nowait. Use an Array#compact strategy instead.
Also, always define a sensible config-dir, even if none is given. If the
user wants to pass one especially, they can.
[FixRM #7297 ]
2012-10-10 10:18:40 -05:00
f247379bb1
Handle the old wait/nowait shift behavior.
...
The old msfupdate would shift the first argument off the stack
regardless what it was. We have two possible candaidates now, wait and
nowait. Shouldn't be any others.
[SeeRM #7297 ]
2012-10-10 09:50:30 -05:00
21d1a5857a
Adding Iterations options
2012-10-10 12:32:30 +02:00
f2dd4d4e53
Upgrade KissFFT to 1.3.0 and Gemize
2012-10-09 23:57:55 -05:00
9a0a063048
Whitespace at EOL
2012-10-09 16:56:22 -05:00
32680df7ec
Merge branch 'todb-r7-fix-msfupdate' into rapid7
...
[Closes #883 ][Closes #882 ]
2012-10-09 16:54:25 -05:00
a31984c0ab
Always provide --config-dir for msfupdate
...
Otherwise, you will run into problems described in #882 .
2012-10-09 16:25:06 -05:00
7b45ef6038
Applying changes. Blocks -Begin .. End- deleted
2012-10-09 21:52:49 +02:00
db4ba472d5
[ Closes #881 ]
2012-10-09 13:29:31 -05:00
22f7c42b85
Merge branch 'master' into feature/updated-mobile
2012-10-09 12:58:19 -05:00
5ce26c4524
Merge branch 'bug/activerecord-dep' of https://github.com/jlee-r7/metasploit-framework into jlee-r7-bug/activerecord-dep
2012-10-09 11:18:02 -05:00
1ba57af00a
Merge branch 'master' into bug/windows-pro-modules
2012-10-09 11:15:45 -05:00
2d1fd1c305
Pass file size to read for faster reads on Windows
2012-10-09 11:04:05 -05:00
4fa3631e34
avoiding the python support on the barracuda one if cannot be tested
2012-10-09 18:01:23 +02:00
f33411abd1
Merge branch 'python_payload_support' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-python_payload_support
2012-10-09 18:00:44 +02:00
592851e155
Add requires for active_support deps in use
...
Hash for #assert_valid_keys, Module for #parent.
2012-10-09 02:05:08 -05:00
b3e27b16d5
Derp, include is a class method
2012-10-09 01:52:19 -05:00
a12aed7ffc
Don't really need these keywords
2012-10-09 00:49:05 -05:00
b657fd31cc
Merge branch 'php_include' of https://github.com/ethicalhack3r/metasploit-framework into ethicalhack3r-php_include
2012-10-09 00:45:46 -05:00
227418bd11
Make AR a soft dependency again
...
Ensures that the absence of activerecord does not prevent msfconsole
from loading. This returns us to the previous state of affairs where it
is possible to use the framework entirely without a database.
To test:
1. rm -rf lib/gemcache/ruby/1.9.1/gems/activerecord*
2. remove any locally installed versions of activerecord
3. msfconsole
msfconsole should load up with a warning like so:
[-] ***
[-] * WARNING: No database support: LoadError cannot load such file -- active_record
[-] ***
... and should still be functional.
2012-10-08 23:07:04 -05:00
c094508119
Support Python payload
...
Pretty sure if the app is run on Unix/Apache, or supports perl and
ruby, chances are python works too.
2012-10-08 22:17:11 -05:00
3888c5212f
Change file header comment to new format
2012-10-08 21:30:42 -05:00
03e2cda9e1
Make sample modules conform to modern mod format
...
Wow, these are old.
2012-10-08 21:23:38 -05:00
562612f96c
Merge branch 'hmoore-r7-module-loader'
2012-10-08 17:52:26 -05:00
8f07a18d74
Fix comment indentation
2012-10-08 17:29:36 -05:00
eb0f0fee0c
Correct an extra parenthesis
2012-10-08 17:20:25 -05:00
8cdb76d269
Switch to normal String API vs ActiveSupport method
2012-10-08 17:18:40 -05:00
b356b403b0
Merge branch 'phptax' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-phptax
2012-10-09 00:10:31 +02:00
2dce6e6347
FIXRM #7292 by using hex class names
2012-10-08 17:03:41 -05:00
93469604a7
Fix missed rename when adding fastlib under directory
...
I missed a spot where I referenced the nested_paths as nested_pathnams
after I renamed the variable. Now, Msf::ModuleManager#add_module_paths
has rspec tests.
Rspec can be invoked with `rake` as the default task or `rake spec`
explicitly.
I changed RuntimeError to ArgumentError since that error was more
specific to having a bad argument error. I adding missing dependencies
to the Gemfile and a require to msf/core/db_manager.rb where it errored
out trying to access Msf::Config when I just did require 'msf/core' in
the spec.
2012-10-08 16:14:37 -05:00
6bb1b83de3
Align the comments with the space indents for now
2012-10-08 16:09:12 -05:00
286b86949b
Prefix with host:port for readability
2012-10-08 15:23:26 -05:00
06e2994b7e
connectiontype to find and python payload support
2012-10-08 15:13:27 -05:00
abb4bdd408
metadata formatting, and a little res gotcha
2012-10-08 15:00:51 -05:00
cdf8956a10
Merge branch 'avaya_ccr_imageupload_exec' of https://github.com/jvazquez-r7/metasploit-framework into jvazquez-r7-avaya_ccr_imageupload_exec
2012-10-08 14:57:13 -05:00
44d7ab8ca2
Merge branch 'todb-r7-fix-msfupdate' into rapid7
...
[Closes #847 ]
2012-10-08 14:32:00 -05:00
04aa69192d
Dang typo
2012-10-08 13:35:13 -05:00
ef9d627e13
Added module for ZDI-12-106
2012-10-08 20:04:01 +02:00
8ff4442f9e
Add PhpTax pfilez exec module
...
This module exploits a vuln found in PhpTax. When generating a
PDF, the icondrawpng() function in drawimage.php does not
properly handle the pfilez parameter, which will be used in a
exec() statement, and results in arbitrary code execution.
2012-10-08 12:46:56 -05:00
114b7886fa
Add back EOF newlines
2012-10-08 12:42:34 -05:00
b0957da1e2
Fixing bug reported with 1.8.7
...
This avoids the incompat with `const_defined?`
[FixRM #7291 ]
2012-10-08 12:40:27 -05:00
10dafcd09f
Fix 1.8 compat with Module#const_defined?
...
Before 1.9, const_defined? only takes one parameter.
2012-10-08 12:40:18 -05:00
ef6dad2bc3
Fix loading binary modules on Windows
...
[#36737359 , #36401509 ]
Failed to follow HACKING guideline #5 , open files in binary mode, so
Pro modules were being truncated on Windows installs.
2012-10-08 09:12:23 -05:00
95fef5d607
Merge remote branch 'dalton/master'
2012-10-08 08:28:23 -05:00
e9b70a3a4f
Merge branch 'avaya_winpmd_unihostrouter' of https://github.com/jvazquez-r7/metasploit-framework into jvazquez-r7-avaya_winpmd_unihostrouter
2012-10-07 15:35:30 -05:00
0acd9e4eec
Merge branch 'ms10_002_ropdb_update' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-ms10_002_ropdb_update
2012-10-07 17:49:45 +02:00
e4af1b7338
Merge branch 'cve_2012_1535_flash_rop_update' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-cve_2012_1535_flash_rop_update
2012-10-07 17:25:19 +02:00
40983460bf
added module for avaya winpmd bof, osvdb 73269
2012-10-07 12:05:13 +02:00
bdb9b75e1e
Use RopDb, and print what target the module has selected.
2012-10-07 01:42:29 -05:00
HD Moore
Tod Beardsley
Borja Merino
James Lee
sinn3r
Luke Imhoff
jvazquez-r7