26dec4eb8f
last cleanup for sami_ftpd_list
2013-03-19 21:32:05 +01:00
42efe5955b
Merge branch 'osvdb-90815' of https://github.com/dougsko/metasploit-framework into dougsko-osvdb-90815
2013-03-19 21:31:46 +01:00
cce74246d8
Merge branch 'master' of github.com:rapid7/metasploit-framework
2013-03-19 15:03:24 -05:00
8611109ffd
Merge pull request #1 from jvazquez-r7/sami_ftp_work
...
cleanup for sami_ftpd_list
2013-03-19 12:12:20 -07:00
27778e6ea9
fix comma typo
2013-03-19 19:20:39 +01:00
a9e51e32ad
Merge branch 'java_rop_update' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-java_rop_update
2013-03-19 19:20:19 +01:00
6618c098c4
Merges 'bug/obsolete-activerecord-patch'
...
Not only does this remove the patch, but adds in specs to cover the test
cases that the patch resolved. Verified all steps and landed #1592 before
landing #1611 , so this is complete.
[Closes #1611 ]
2013-03-19 13:10:42 -05:00
b19c51aa81
cleanup for sami_ftpd_list
2013-03-19 19:04:14 +01:00
d987693238
Merges 'feature/rake-db'
...
Implements rake db tasks for Metasploit Framework. Woot! Verified all
steps listed in #1592 as well.
[Closes #1592 ]
2013-03-19 12:56:59 -05:00
11c38d925b
Auxiliary::Web::Path: Fuzzable API update
...
[FIXRM #7817 ]
Path object was using an outdated fuzzable API which was causing
scan errors.
2013-03-19 18:41:52 +02:00
e2a9245b08
Changed target to Windows XP
2013-03-19 13:20:23 -03:00
ad39a5cdc3
Auxiliary::Web::HTTP#_request: elog => print_error
...
[SEERM #7815 ]
Switched form elog to print_error to make reporting bugs easier on users.
2013-03-19 17:18:44 +02:00
be9d4ec393
New pt for virtualprotect, and readjust size to 0x401
2013-03-19 09:25:06 -05:00
0c0d15024a
No tabs for these
2013-03-19 08:39:47 -05:00
07a3f15292
Merge branch 'coolpdf_image_stream_bof' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-coolpdf_image_stream_bof
2013-03-19 08:38:30 -05:00
116f5b87f0
Merge branch 'axigen_file_access' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-axigen_file_access
2013-03-19 08:33:58 -05:00
ea4c88bc2c
Java Rop null-byte free
...
Our new heap spray routine does not like double nulls, so we need
to adjust our ROP.
2013-03-18 23:42:17 -05:00
afcbaffa2b
Revert "add -R capability like hosts -R"
...
Pulling out the set_rhosts_from_addrs -- that's not required for
grep-like functionality, and adding this method to the global namespace
is undesirable.
This reverts commit 52596ae3b4
2013-03-18 15:28:19 -05:00
91e3f4cca6
Merge 'kernelsmith/msfconsole-grep'
...
Resolved a conflict between grep and go_pro (go_pro was added after
grep). Adds @kernelsmith's grep command. Josh is determined to have
msfconsole be his default shell, it seems.
[Closes #1320 ]
Conflicts:
lib/msf/ui/console/command_dispatcher/core.rb
2013-03-18 14:39:45 -05:00
fb90a1b497
Uses IP address length in offset calculation
2013-03-18 16:18:04 -03:00
2075a7b46c
Remove active_record patch
...
[#46141013 ]
Version 3.2.12 of activerecord contains the changes that the original
patch made so the patch is no longer needed.
2013-03-18 11:32:21 -05:00
f1a4fd937a
Specs for activerecord patch
...
[#46141013 ]
Spec the desired behavior for ConnectionPool prior to removing the patch
to sync with upstream 3.2.12.
2013-03-18 11:01:45 -05:00
4aab1cc5df
delete debug code
2013-03-18 16:28:39 +01:00
dffec1cd41
added module for cve-2012-4914
2013-03-17 21:12:40 +01:00
3d92d6e977
removed the handler call
2013-03-15 16:48:53 -04:00
a96283029e
made payload size a little smaller
2013-03-15 16:08:43 -04:00
8b5c782b54
changed Platform from Windows to win
2013-03-15 15:13:52 -04:00
8f4b3d073a
Explicitly set EXITFUNC to thread
2013-03-15 14:52:39 -04:00
e9af05a178
made recommended changes
2013-03-15 11:35:12 -04:00
07d78af421
Linux post module to download and run a command
2013-03-15 10:13:56 -04:00
0f6b05321e
Configure travis-ci to use database for rake spec
...
[#46224565 ]
2013-03-15 08:48:20 -05:00
2604fad164
Allow use of rake db tasks
...
[#46224565 ]
The following rake tasks are added and work similar to how they work in
rails apps:
* db:create
* db:drop
* db:migrate
* db:migrate:status
* db:rollback
* db:schema:dump
* db:schema:load
* db:seed (but no db seeds defined at this time)
* db:setup
* db:version
The hidden task db:test:prepare is also available, which means `rake
spec` can depend on it so that the test database is dropped and
recreated from the development database when running specs (Although
there are yet to be database tests, this branch is in preparation for
that work that will be split between multiple developers.)
2013-03-14 15:46:18 -05:00
4bb64a0f41
Merge branch 'master' of https://github.com/rapid7/metasploit-framework
2013-03-14 16:10:10 -04:00
bbbf395659
got everything working and cleaned up
2013-03-14 16:02:41 -04:00
40e801d345
Merge branch 'feature/loot-manipulation'
...
Committed this a little backwards which ended up with a merge conflict.
My bad. This should be all copacetic now.
[Fixes #1586 ]
Conflicts:
lib/msf/ui/console/command_dispatcher/db.rb
2013-03-14 14:50:58 -05:00
f46ec73ff0
Fix up usage help for loot cmd
2013-03-14 14:37:15 -05:00
3dca63fee2
Make it clear that you're deleting all loot
...
You don't get to delete just one chunk of loot.
2013-03-14 14:37:15 -05:00
56611230ff
fixed header
2013-03-14 14:37:15 -05:00
0ca0cd5ee1
loot add/remove command for msfconsole
2013-03-14 14:37:15 -05:00
d8f46e3df4
Merge branch 'module/fb_cnct_target_214' of https://github.com/zeroSteiner/metasploit-framework into zeroSteiner-module/fb_cnct_target_214
2013-03-14 16:27:58 +01:00
b86b70c31c
Merge branch 'openpli-shell' of https://github.com/m-1-k-3/metasploit-framework into m-1-k-3-openpli-shell
2013-03-14 15:58:14 +01:00
02f90b5bbd
cleanup for dopewars
2013-03-14 15:53:19 +01:00
4d9f2bbb06
Merge branch 'master' of https://github.com/dougsko/metasploit-framework into dougsko-master
2013-03-14 15:51:47 +01:00
b4554d2095
Merge pull request #3 from jvazquez-r7/openpli_work
...
works very good
2013-03-14 07:43:52 -07:00
6ccfa0ec18
cleanup for dreambox_openpli_shell
2013-03-14 15:02:21 +01:00
7403239de7
cleanup for psexec_ntdsgrab
2013-03-14 13:40:45 +01:00
9ae2c8e718
Merge branch 'ntdsgrab4' of https://github.com/R3dy/metasploit-framework into R3dy-ntdsgrab4
2013-03-14 13:39:41 +01:00
9366e3fcc5
last adjustment
2013-03-14 11:18:52 +01:00
0140caf1f0
Merge branch 'master' of git://github.com/rapid7/metasploit-framework into openpli-shell
2013-03-14 10:55:52 +01:00
97023413cb
Added advanced option for temp filenames prefix
2013-03-14 01:50:52 -05:00
jvazquez-r7
sinn3r
dougsko
Tod Beardsley
Tasos Laskos
Luke Imhoff
Joshua Abraham
m-1-k-3
m-1-k-3
Trenton Ivey