Commit Graph

37188 Commits (6bee4e759b294953e3322a63ed28b5a61e186b7f)

Author SHA1 Message Date
darkbushido 6bee4e759b
trying to add the postgres service to travis.yml 2016-03-02 16:21:51 -06:00
darkbushido 7eb1dcddcb
Moving the metasploit gems out of the development group 2016-03-02 16:09:24 -06:00
darkbushido bc2e38067e
changing the travis.yml to work with GCE 2016-03-02 15:57:53 -06:00
David Maloney b702d25055
Land #6629, Relation all deprecation
lands Brian's pr to fix the Relation#all deprecation
Merge branch 'staging/MS-1163/relation-all-is-deprecated' into staging/rails-upgrade
2016-03-02 10:52:24 -06:00
Brian Patterson 30043bc519
Changed .all to .load in workspace.rb in order to eager load the relation and fix the 4.0 rails deprecation 2016-03-01 11:48:55 -06:00
dmaloney-r7 49eb592a04 Merge pull request #6622 from gmikeska-r7/staging/MS-1166/ignore-is-deprecated
replace deprecated 'ignore' with 'transient'
2016-03-01 11:06:44 -06:00
Gregory Mikeska c2f7360a9a
replace deprecated 'ignore' with 'transient' 2016-02-29 14:57:09 -06:00
Fernando Arias cbcd431772
Updated Gemfile.lock 2016-02-26 15:41:39 -06:00
Fernando Arias c4c5944b25
Merge branch 'staging/rails-upgrade' into staging/MS-888/engines-is-deprecated
Conflicts:
	Gemfile.lock
	metasploit-framework.gemspec
2016-02-26 15:35:34 -06:00
Gregory Mikeska 2277a97065
Modify gemfile to point to topic branch on metasploit-concern 2016-02-25 11:12:49 -06:00
Gregory Mikeska cbc5b296e4
implement engines method locally instead of adding refinement 2016-02-25 11:05:17 -06:00
darkbushido 2ec7149ae7
Logging deprecations to STDERR 2016-02-25 10:59:50 -06:00
David Maloney c0c6dc7a18
point to other staging brnaches for gems
the gem dependencies that have been modified
so far are being pulled in from their staging branches
on github instead of rubygems for this branch
2016-02-22 11:31:58 -06:00
Brent Cook 95484c81fd
Land #6526, fix browser exploit server spec 2016-02-15 16:23:04 -06:00
Brent Cook 1f58ad15ac Browser::Exploit::Server needs to have vprint* 2016-02-15 16:21:24 -06:00
Brent Cook 3d1861b3f4 Land #6526, integrate {peer} string into logging by default 2016-02-15 15:19:26 -06:00
Brent Cook 4db2840af9
Land #6385, add .apk template support for msfvenom 2016-02-15 14:27:08 -06:00
Metasploit 93cc7d58ba
Bump version of framework to 4.11.11 2016-02-12 15:38:50 -08:00
Kyle Gray 88e1124519
Land #6568, fix for msfvenom symlink not working
In installer environments, $0 doesn't match __FILE__ because of the way the gem's binstub wrapper calls it.
2016-02-12 12:35:00 -06:00
James Lee 541e3972f0
No real reason for this check
And it breaks stuff when msfvenom is run as a symlink
2016-02-12 10:49:18 -06:00
wchen-r7 b2765a296f
Land #6547, IBM Tivoli Storage Manager Fastback Denial of Service 2016-02-11 22:05:21 -06:00
wchen-r7 3121093898 Update metadata, plus other minor changes 2016-02-11 22:04:05 -06:00
William Vu 1ec87d6250
Land #6565, top 100 Adobe passwords 2016-02-11 13:15:52 -06:00
Brent Cook e8cc818126
Land #6516, allow Android meterpreter to launch activities 2016-02-10 23:22:29 -06:00
Brent Cook ed5cf821b2 bump payloads to 1.1.0 2016-02-10 23:21:20 -06:00
Brent Cook db19a7d9b3 Merge branch 'upstream-master' 2016-02-10 23:15:21 -06:00
Brent Cook d22d51ffc5
Land #6480, add Meterpreter message obfuscation 2016-02-10 22:58:01 -06:00
Brent Cook ff1cb4a2a4 update payload sizes 2016-02-10 22:44:17 -06:00
Brent Cook 27ec6a861c update gemfile.lock 2016-02-10 22:41:41 -06:00
OJ 4ac7c5e298 Updaed the gemspec to point to the new payloads gem 2016-02-11 14:36:17 +10:00
OJ 44eb2d6a80
Merge branch 'upstream/master' into default-xor 2016-02-11 14:30:18 +10:00
Jay Turla aeb1d80e0d Adding top 100 adobe passwords 2016-02-11 08:55:45 +08:00
Brent Cook 2386cb1344
Land #6527, add support for importing Burp suite vuln exports 2016-02-10 13:19:21 -06:00
William Webb c874699b82 removed ranking 2016-02-10 11:45:09 -06:00
William Webb 4c6cb03548 more build errors 2016-02-10 11:40:21 -06:00
William Webb 72f5a33804 addressed CI errors 2016-02-10 11:34:05 -06:00
William Webb 51604fa24a made necessary inheritance changes 2016-02-10 10:59:11 -06:00
William Vu fc491ffa3e
Land #6555, Content-Length fix for HP modules 2016-02-10 10:39:08 -06:00
William Vu 5b3fb99231
Land #6549, module option for X-Jenkins-CLI-Port 2016-02-10 10:34:33 -06:00
William Vu c67360f436 Remove extraneous whitespace 2016-02-10 09:44:01 -06:00
wchen-r7 8a3bc83c4d Resolve #6553, remove unnecessary content-length header
Rex will always generate a content-length header, so the module
doesn't have to do this anymore.

Resolve #6553
2016-02-09 21:25:56 -06:00
Brent Cook c590fdd443
Land #6501, Added Dlink DCS Authenticated RCE Module 2016-02-09 17:19:33 -06:00
William Vu 5f0add2a8b
Land #6541, typo fix for cisco_ssl_vpn 2016-02-09 17:13:24 -06:00
William Vu 240cbb91be s/resp/res/ 2016-02-09 17:12:09 -06:00
William Vu 92d4929b3d
Land #6543, msu_finder link update 2016-02-09 17:06:23 -06:00
William Vu 32c26271d2
Land #6544, s/method/http_method/ http_traversal 2016-02-09 17:04:11 -06:00
Brent Cook bb556e5b87
Land #6529, added a file PR history exploration tool 2016-02-09 17:01:58 -06:00
Brent Cook 7fe61dce70 added support for GITHUB_OAUTH_TOKEN 2016-02-09 17:01:19 -06:00
William Vu ae2fbeb6ec
Land #6548, .mailmap update 2016-02-09 16:45:39 -06:00
William Vu 75febfdde0 Move @hdm to the former employees section
:')
2016-02-09 16:43:11 -06:00