Commit Graph

17591 Commits (08ba2c70d3f0a4a2908b5f933e7fff314252b223)

Author SHA1 Message Date
Tod Beardsley d0bd23f339 Updating Meatballs1 mailmap per request 2013-03-21 14:08:48 -05:00
Console 302193f98b Various fixes and improvements
Chunk_length now varies according to targeturi and parameter
A few typographical inconsistences corrected
CMD option removed as its not being used
custom http request timeout removed
2013-03-21 19:03:39 +00:00
Trevor Rosen 5af14c4153 Merge pull request #1380 from todb-r7/feature/mailmap_and_commit_count
Godspeed, friends.
2013-03-21 09:57:46 -07:00
Console 8027615608 fixed comments left in by accident 2013-03-21 16:43:44 +00:00
Tod Beardsley c87a60fbc1 Minor update to mailmap. You should land this 2013-03-21 11:42:58 -05:00
Console 4edf5260f4 check function now tells user about delay 2013-03-21 16:40:45 +00:00
jvazquez-r7 f27333567f use bash or sh according to availability 2013-03-21 17:26:56 +01:00
jvazquez-r7 47ea8aea30 Merge branch 'download_exec_wget' of https://github.com/dougsko/metasploit-framework into dougsko-download_exec_wget 2013-03-21 17:09:20 +01:00
Console a714b430ca used normalize_uri 2013-03-21 14:05:08 +00:00
Console 5c9bec1552 commit fix branch for Console-struts-RCE 2013-03-21 13:40:16 +00:00
dougsko b7ee9e5699 Merge pull request #2 from jvazquez-r7/download_exec_mod
cleanup for download_exec
2013-03-21 06:00:18 -07:00
agix e567597223 Merge pull request #2 from todb-r7/exe_only_patch
Fix egypt's typo
2013-03-21 05:20:50 -07:00
jvazquez-r7 370f849e29 cleanup for download_exec 2013-03-21 09:24:02 +01:00
Doug P 39b1ad8bd6 spacing cleanup 2013-03-21 00:21:10 -04:00
Doug P 837d426ff0 removed an extra space 2013-03-21 00:18:35 -04:00
Doug P 08029ca2e8 edited Description 2013-03-21 00:17:55 -04:00
Doug P edd85ccd69 added wget support 2013-03-21 00:09:22 -04:00
Tod Beardsley bf85545b4d Fix egypt's typo 2013-03-20 17:15:14 -05:00
m-1-k-3 dcd2aebdcd feedback included 2013-03-20 21:34:30 +01:00
SphaZ 804e2cfa3a small fixup of unused old vars 2013-03-20 21:31:28 +01:00
Tod Beardsley 011b6899b0 Merge 'neinwechter/browser_autopwn-updates'
Brings in neinwechter's BAP fixes. Seems to not only be a more sane
strategy, but in practice, ends up with tons more shells for at least
MSIE which is what most people are using it for anyway.

[Closes #1612]
2013-03-20 15:26:09 -05:00
SphaZ b275797ba2 Used msf file mixin where possible and more in memory handling 2013-03-20 21:25:07 +01:00
doug 2fa95daaa6 Merge branch 'master' of https://github.com/rapid7/metasploit-framework 2013-03-20 16:11:40 -04:00
Tod Beardsley e377e30873 unscrewing syntax error 2013-03-20 15:04:31 -05:00
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