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

184 Commits (05dbee7a94bf611e9ec45faecc5797e96a7ab536)

Author SHA1 Message Date
William Vu 22d08fdf39 Revert #6748, premature Gemfile* changes 2016-04-06 14:52:22 -05:00
David Maloney fea142dc6e
unlock gemfile deps first 
unlock the gemfile deps

MS-1330
 2016-04-04 13:55:53 -05:00
Brent Cook b8d53dde4a Merge branch 'upstream-master' into staging/rails-upgrade 2016-03-29 15:56:50 -05:00
wchen-r7 57984706b8 Resolve merge conflict with Gemfile 2016-03-24 18:13:31 -05:00
David Maloney b878e762c0
pin rake version to 1.x line 
rake 11 remvoes the last_comment method which
causes a error when trying to run rake jobs
current guidance is to pin the version back to
before the change

MS-1230
 2016-03-10 15:39:06 -06:00
David Maloney 1911d0cd17
missed credential 2016-03-09 15:39:06 -06:00
David Maloney ca18996272
setup rails staging branch 
rails 4.1 baby!
 2016-03-09 15:35:00 -06:00
David Maloney 88697a5d3f
Merge branch 'master' into staging/rails-upgrade 2016-03-08 15:22:04 -06:00
darkbushido 7eb1dcddcb
Moving the metasploit gems out of the development group 2016-03-02 16:09:24 -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
wchen-r7 b0cfb4aacf Add info -d to show module documentation in .md 2016-02-16 22:44:03 -06:00
Luke Imhoff 4f2ed69daa Update fivemat to rspec 3 compatible version 
MS-673
 2015-12-10 21:47:22 -06:00
Luke Imhoff d38ed931a5 Update to rspec 3.3 in Gemfile 
MSP-13484
 2015-12-10 21:47:22 -06:00
Brent Cook 1b951b36fe remove -db / -pcap / -all gemspecs, merge into one 2015-11-11 15:01:50 -06:00
William Vu e6202e3eda Revert "Land #6060, Gemfile/gemspec updates" 
This reverts commit 8f4046da40, reversing
changes made to 2df149b0a5.
 2015-11-08 19:32:15 -06:00
Brent Cook 725d61d6e4 remove -db / -pcap / -all gemspecs, merge into one 2015-11-04 08:34:56 -06:00
darkbushido 542937415b updating the gemspecs to use the pre-release versions of the other metasploit gems 2015-04-29 14:07:50 -05:00
Matt Buck 4ae8c622d1
Upgrade factory_girls 
MSP-12322
 2015-03-18 11:28:08 -05:00
Matt Buck 2cd5be021b
Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb
	metasploit-framework-db.gemspec
	metasploit-framework.gemspec
 2015-01-08 13:12:27 -06:00
Luke Imhoff 633b4b9e51
Disable simplecov on travis-ci 
MSP-11671

`bundler install --without coverage` will not install `simplecov`.
Running without simplecov changes the average runtime of `rake
cucumber:boot` from (n=13) 112.50 seconds to (n=10) 32.17 seconds
(-71.41%). (-73.68% from 2c1203ba49d49603aec169eed053ab929ccdedc6.)  Raw
data:
https://docs.google.com/spreadsheets/d/1vCRi_38Go3Wfq670eDCXMTSSXL1blSbk6NQsgpOqfYw/edit?usp=sharing.
 2014-12-05 11:58:09 -06:00
Matt Buck 66fde33a0c
Get framework working on rails 4 branch with new gemspecs 2014-11-12 14:06:51 -06:00
Matt Buck 02ec1fb234
Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-11-12 10:13:34 -06:00
Trevor Rosen 8511dc4131
Merge branch 'landing/4135' into upstream-master 
Land #4135

* Improve Bundle management:
* Option to install w/out DB group
* Option to install w/out pcap support
 2014-11-10 09:26:42 -06:00
Luke Imhoff 122928d952
Remove redundant rb-readline from Gemfile 
MSP-11585

The entry in the gemspec is sufficient.
 2014-11-06 14:51:10 -06:00
Luke Imhoff 06222911f6
Move pcap bundler group to metasploit-framework-pcap.gemspec 
MSP-11578

This will allow Metasploit Pro to use the
metasploit-framework-pcap.gemspec to ensure it has the correct version of
gems that were previously only in metasploit-framework's Gemfile and so
weren't being checked for version compatibility when Pro used
metasploit-framework.gemspec.
 2014-11-05 09:40:57 -06:00
Luke Imhoff a56a063b84
Move db bundler group to metasploit-framework-db.gemspec 
MSP-11578

This will allow Metasploit Pro to use the
metasploit-framework-db.gemspec to ensure it has the correct version of
gems that were previously only in metasploit-framework's Gemfile and so
weren't being checked for version compatibility when Pro used
metasploit-framework.gemspec.
 2014-11-05 08:58:46 -06:00
darkbushido 2d7c517e2f
Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile.lock
 2014-11-04 15:34:25 -06:00
James Lee 867329d4b3 Fix readline by mucking with load path 2014-10-29 22:14:49 -05:00
Matt Buck 25d1caabb5
Merge branch 'master' into staging/rails-4.0 
Conflicts:
	Gemfile
	Gemfile.lock
	metasploit-framework.gemspec
 2014-10-14 15:20:15 -05:00
James Lee a65ee6cf30
Land #3373, recog 
Conflicts:
	Gemfile
	Gemfile.lock
	data/js/detect/os.js
	lib/msf/core/exploit/remote/browser_exploit_server.rb
	modules/exploits/android/browser/webview_addjavascriptinterface.rb
 2014-10-03 18:05:58 -05:00
Matt Buck 478dbd32f2
Bump to newly-released versions of gems 
MSP-11412
 2014-10-03 12:07:23 -05:00
Matt Buck f748256e47
Use the prerelease versions of the gems 
MSP-11412
 2014-10-03 10:29:10 -05:00
Matt Buck 04dbfb9ad6
Bump metasploit gem dependencies 
MSP-11412
 2014-10-02 18:11:13 -05:00
Matt Buck 71efeb0c26
Also PATH out the deps for metasploit-credential and metasploit_data_models 
MSP-11412
 2014-10-02 14:08:35 -05:00
Matt Buck 05c71af03c PATH out the deps to metasploit-concern and metasploit-model, for the moment 2014-10-02 13:29:50 -05:00
jvazquez-r7 80d36ec08a
Land #3833, @darkbushido's cucumber fixes 2014-09-19 11:03:41 -05:00
Luke Imhoff 39d302a120
Update metasploit_data_models 
MSP-11359

Include fix for loading from metasploit_data_models/lib.
 2014-09-18 12:35:26 -05:00
Luke Imhoff 03cc69d902
Update gems 
MSP-11359
 2014-09-18 11:33:22 -05:00
Luke Imhoff 21d6e4afb3
Move metasploit-concern to gemspec 
MSP-11359

The dependency on `metasploit-concern` should not have been in the db
group as `Metasploit::Concern.run` is called for
`Msf::Exploit:Remote::HttpServer`, which works without the db group
installed.  This is a fix for a bug from #3781.
 2014-09-18 09:33:57 -05:00
darkbushido 93cd53a800
setting cucumber-rails require to false in Gemfile 
this stops the warning about cucumber being double required from showing up
 2014-09-11 15:47:42 -05:00
Joe Vennix 6ade4d8dab
Kill empty line in Gemfile. 2014-09-11 14:47:17 -05:00
Joe Vennix 37e6173d1f
Make Metasploit::Concern a first-class dep. 
Also adds a Concern hook to HttpServer, so Pro can more
easily change its behavior.
 2014-09-11 13:28:45 -05:00
darkbushido 19a063e861
cucumber rails is not required by default anymore 2014-09-04 13:04:08 -05:00
darkbushido 3b75b98148
updating to rails 4 2014-09-03 12:20:51 -05:00
darkbushido 13a0b8da83
Merge branch 'master' into aruba-testing-with-updated-master 
Conflicts:
	Gemfile.lock
	config/cucumber.yml
	features/support/env.rb
	features/support/hooks.rb
	lib/tasks/cucumber.rake
 2014-09-02 13:56:02 -05:00
Luke Imhoff bfc509c18a
Add feature that tests --yaml is favored over others 
MSP-11153
 2014-08-27 16:46:23 -05:00
Luke Imhoff 1857c6ae39
Add aruba 
MSP-11153

aruba adds steps for testing commandline applications with cucumber.
 2014-08-27 14:22:20 -05:00
Luke Imhoff 2f48f7c48c
rails generate cucumber:install 
MSP-11153

Add cucumber-rails for testing msfconsole's loading of database.yml from
different paths.
 2014-08-27 14:10:04 -05:00
darkbushido 984f073c7d
changing from cucumber to cucumber-rails 
using the MSF_DATABASE_CONFIG to tell msfconsole where to find the database.yml
 2014-08-27 13:44:34 -05:00
darkbushido 2877cdc362 Merge branch 'master' into aruba-testing 2014-08-25 14:09:37 -05:00