infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,567 Commits
7 Branches
556 Tags
421 MiB
Commit Graph

17567 Commits (714fc83cfe5253e77268b028b2b2645d2b16564c)

Author SHA1 Message Date
Tod Beardsley fd20eba35e Expanding the title and desc for external_ip 
Also allowing the capitalization on "via" to be small.
 2013-03-20 14:42:12 -05:00
Brandon Turner 52df05c42d Merge branch 'release' into master 
This is effectively an empty commit, but keeps master a descendant of
release.

Conflicts:
	db/schema.rb
	lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.6.2/spec/dummy/db/schema.rb
	lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.6.3/spec/dummy/db/schema.rb
 2013-03-20 13:35:25 -05:00
Tod Beardsley a00bbe25cb Merge branch 'bturner-r7/update-mdm' into release 
This lands the Mdm update to release. It shouldn't conflict with master
but if it does, please tell todb@metasploit.com how you resolved it.

[See #1620]
 2013-03-20 13:29:57 -05:00
Brandon Turner 49963ad4f1 Update MDM in gemcache 2013-03-20 13:23:40 -05:00
Brandon Turner fbec01870b Update metasploit-data-models to 0.6.3 
This updates activerecord to 3.2.13 due to recent vulns.
 2013-03-20 13:23:39 -05:00
Brandon Turner f05216f98a Update MDM in gemcache 2013-03-20 12:51:21 -05:00
Brandon Turner 8cca4c2306 Update metasploit-data-models to 0.6.3 
This updates activerecord to 3.2.13 due to recent vulns.
 2013-03-20 12:39:31 -05:00
jvazquez-r7 072fca9f6c Merge branch 'post_linux_manage_download_exec' of https://github.com/jasbro/metasploit-framework into jasbro-post_linux_manage_download_exec 2013-03-20 18:02:51 +01:00
Joshua Abraham aa22a820e2 Merge pull request #2 from jvazquez-r7/post_download_exec_work 
check if curl is on the path
 2013-03-20 10:01:20 -07:00
jvazquez-r7 54f22ed06c check if curl is on the path 2013-03-20 17:31:48 +01:00
Joshua Abraham 9948d1ec12 change from vcmd_exec to a method in the module 2013-03-19 20:40:25 -04:00
jvazquez-r7 26dec4eb8f last cleanup for sami_ftpd_list 2013-03-19 21:32:05 +01:00
jvazquez-r7 42efe5955b Merge branch 'osvdb-90815' of https://github.com/dougsko/metasploit-framework into dougsko-osvdb-90815 2013-03-19 21:31:46 +01:00
sinn3r cce74246d8 Merge branch 'master' of github.com:rapid7/metasploit-framework 2013-03-19 15:03:24 -05:00
dougsko 8611109ffd Merge pull request #1 from jvazquez-r7/sami_ftp_work 
cleanup for sami_ftpd_list
 2013-03-19 12:12:20 -07:00
jvazquez-r7 27778e6ea9 fix comma typo 2013-03-19 19:20:39 +01:00
jvazquez-r7 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
Tod Beardsley 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
jvazquez-r7 b19c51aa81 cleanup for sami_ftpd_list 2013-03-19 19:04:14 +01:00
Tod Beardsley 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
Tasos Laskos 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
m-1-k-3 9fc0f9a927 initial commit 2013-03-19 17:31:01 +01:00
dougsko e2a9245b08 Changed target to Windows XP 2013-03-19 13:20:23 -03:00
Tasos Laskos 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
sinn3r be9d4ec393 New pt for virtualprotect, and readjust size to 0x401 2013-03-19 09:25:06 -05:00
sinn3r 0c0d15024a No tabs for these 2013-03-19 08:39:47 -05:00
sinn3r 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
sinn3r 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
sinn3r 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
agix e3c530362a Merge pull request #1 from todb-r7/exe_only_patch 
Exe only patch : avoid merge conflict and don't use win32pe_only everywhere by default.
 2013-03-18 15:50:45 -07:00
Tod Beardsley 1873053a34 Restore win32pe as the default (not _only) 2013-03-18 15:55:01 -05:00
Tod Beardsley 3a183ffa94 Retabbed for consistent whitespace 2013-03-18 15:40:26 -05:00
Tod Beardsley 418a373f6c Avoid merge conflict over Id SVN tag 2013-03-18 15:39:16 -05:00
Tod Beardsley 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
Tod Beardsley 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
dougsko fb90a1b497 Uses IP address length in offset calculation 2013-03-18 16:18:04 -03:00
Luke Imhoff 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
Luke Imhoff 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
jvazquez-r7 4aab1cc5df delete debug code 2013-03-18 16:28:39 +01:00
jvazquez-r7 dffec1cd41 added module for cve-2012-4914 2013-03-17 21:12:40 +01:00
Doug P 3d92d6e977 removed the handler call 2013-03-15 16:48:53 -04:00
Doug P a96283029e made payload size a little smaller 2013-03-15 16:08:43 -04:00
Doug P 8b5c782b54 changed Platform from Windows to win 2013-03-15 15:13:52 -04:00
Doug P 8f4b3d073a Explicitly set EXITFUNC to thread 2013-03-15 14:52:39 -04:00
Doug P e9af05a178 made recommended changes 2013-03-15 11:35:12 -04:00
Joshua Abraham 07d78af421 Linux post module to download and run a command 2013-03-15 10:13:56 -04:00
Luke Imhoff 0f6b05321e Configure travis-ci to use database for rake spec 
[#46224565]
 2013-03-15 08:48:20 -05:00
Luke Imhoff 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
Tod Beardsley c322b91a83 Fully deprecates msfupdate over SVN 
Once this lands, SVN users will no longer be able to update over SVN.
 2013-03-14 15:21:33 -05:00
Doug P 4bb64a0f41 Merge branch 'master' of https://github.com/rapid7/metasploit-framework 2013-03-14 16:10:10 -04:00