Commit Graph

212 Commits (1b0487baa82a7c193e43387cdc8f58db79f57129)

Author SHA1 Message Date
Brent Cook 707b358ad6
Land #9786, disable aggregator for the Ruby 2.5 transition 2018-03-30 08:34:52 -07:00
James Barnett 135b7c6b92 Land #9762, Fix OpenSSL deprecation in Ruby 2.5
This PR replaces a deprecated method in the Ruby 2.5
OpenSSL library. It also bumps the ruby-version to use 2.5.

Fixes #9576
2018-03-27 14:24:07 -05:00
Jeffrey Martin bf6540585f
lock google-protobuf and grpc on 4.x 2018-01-19 16:15:09 -06:00
Jeffrey Martin 5458b58a74
restrict aggregator on arm for now 2017-10-18 13:21:02 -05:00
Jeffrey Martin c478133539
add aggregator >= 1.0.0 with cryptTLV support 2017-10-10 23:19:44 -05:00
Brent Cook 851c0f4373
disable metasploit-aggregator while we sort out crypttlv updates 2017-08-20 19:05:10 -05:00
Brent Cook 59cccfffad unpin dnsruby, new release is out 2017-08-10 10:48:03 -05:00
Brent Cook ff189147e7
rb-readline made a release, use 0.5.5 instead of git HEAD 2017-08-02 06:09:27 -05:00
Brent Cook 85e9be0705 only pin rb-readline on linux/osx 2017-07-23 12:13:15 -07:00
Brent Cook ea02558390 bump prerelease gems to fix specific issues with Framework
rb-readline has an issue with the latest curses release
  dnsruby changes the global thread behavior to abort on exception
2017-07-17 09:26:14 -05:00
Brent Cook dbef4ee816 kill cucumber in framework 2017-07-12 08:00:29 -05:00
Brent Cook 8d23d1e05d
move the xpath pin to test group instead 2017-07-12 05:11:09 -05:00
darkbushido e873c87f0b
trying rspec-retry 2017-06-20 14:02:32 -05:00
Brent Cook 63ae70f061 remove pry/method_source git binding, this is not a vital update 2017-05-26 23:03:44 -05:00
Brent Cook ce9cfa5727 bit-struct updated, no need for my branch anymore 2017-05-26 23:00:21 -05:00
Brent Cook 6485042162
update rubyntlm to use the released gem 2017-05-12 05:59:11 -05:00
Brent Cook c16e2fa88e
bump to prerelease rubyntlm to get rid of Ruby 2.4 warning msgs. 2017-04-14 14:06:19 -05:00
Jeffrey Martin 157d28ab3d
make metasploit-aggregator a framework package 2017-04-12 12:33:13 -05:00
Brent Cook 2276bd0c7d switch back to released octokit gem 2017-04-06 15:36:02 -05:00
Jeffrey Martin c845745f0b
remove platform restriction on metasploit-aggregator 2017-04-06 13:09:09 -05:00
Brent Cook 3237575024 add ruby 2.1-2.4, update gems with in-flight 2.4 fixes 2017-04-04 04:06:35 -05:00
Jeffrey Martin baf7e01ec8
Land #8108, temporarily fix bundles on aarch64 2017-03-14 15:48:29 -05:00
Brent Cook 50beade203 skip aggregator on arm platforms for now
the build of grpc fails for warnings
2017-03-06 04:10:32 -05:00
Jeffrey Martin f8c2bd4f52
expand remote sessions list detail retrieval 2017-02-02 15:21:09 -06:00
Jeffrey Martin 02966d31e1
point aggregator at paranoid branch 2017-02-02 14:31:25 -06:00
Jeffrey Martin 5bf54fef0f
create aggregator connection as plugin 2017-02-02 14:31:21 -06:00
David Maloney fd543f13af
fix deps 2016-05-13 13:34:18 -05:00
David Maloney c52f3dcb0e
update to rails 4.2.6
fix lost dep unlocks and upgrade rails to 4.2.6

MS-1400
2016-04-15 11:45:43 -05:00
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