Commit Graph

323 Commits (7790f14af2d5a137792461b9dd6bf1e1c4a292ab)

Author SHA1 Message Date
Brent Cook 3771a78564 update to metasploit-payloads 0.0.3 2015-05-04 16:17:57 -05:00
Brent Cook e6ea5511ca update linux and windows meterpreters to use metasploit-payloads 2015-05-04 09:44:36 -05:00
darkbushido 3e9c2a6c09
bumping mdm and creds 2015-04-30 15:51:19 -05:00
Matt Buck 6157bc137a
Upgrade Redcarpet 2015-04-30 11:51:40 -05: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 8163c3cdda Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	plugins/nessus.rb
2015-04-28 15:33:46 -05:00
Matt Buck 83baf7039b
Update metasploit gem deps 2015-04-28 15:27:24 -05:00
Matt Buck 33b142d71c
Update mdm 2015-04-27 15:39:47 -05:00
Matt Buck 35a50dfc0d
Upgrade mdm 2015-04-27 15:27:32 -05:00
Matt Buck 6a4d63ca4f Drop explicit IPAddr to String coercion
MSP-12611
2015-04-27 10:48:13 -05:00
Matt Buck 81b8a91774
Update metasploit-credential 2015-04-22 15:00:52 -05:00
darkbushido 13f19601d5
updatingg metasploit-gems 2015-04-21 15:42:15 -05:00
Brent Cook 1d5a054cb0
Land #5166, update redcarpet for XSS vuln 2015-04-20 22:09:16 -05:00
Matt Buck 563c1a7192
Revert not null constraints on timestamps
MSP-12184
2015-04-17 14:17:41 -05:00
Brent Cook 2ee28916f7 bump meterpreter_bins to 0.0.22 2015-04-16 22:21:12 -05:00
Luke Imhoff 4629b1551c
Update to redcarpet 3.2.3
MSP-12565

Version 3.2.3 fixes a XSS via parse_line (OSVDB-120415).
2015-04-16 08:28:31 -05:00
Matt Buck cf2be4bf33
Update metasploit gem deps 2015-04-15 14:10:23 -05:00
Matt Buck e82fb5f836
Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	lib/msf/ui/console/command_dispatcher/db.rb
	metasploit-framework-db.gemspec
	metasploit-framework.gemspec
2015-04-15 14:04:35 -05:00
Matt Buck 1e7a6bf3e9
Update metasploit gem dependencies to released versions 2015-04-15 13:06:33 -05:00
Luke Imhoff b9bce90759
Update to metasploit-concern 0.4.0 prerelease
MSP-12550

Properly shows Metasploit::Credential::Core::ToCredential is not loaded.
2015-04-14 15:03:20 -05:00
Brent Cook 0e864e1631 update bins to 0.0.21 2015-04-14 10:45:49 -05:00
Matt Buck 9f15824e2a
Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
2015-04-10 15:35:27 -05:00
Matt Buck 2b02670d38
Update mdm 2015-04-07 11:19:41 -05:00
Luke Imhoff f038fc5466
Update revision of metasploit_data_models/staging/rails-4.0 2015-04-07 10:55:18 -05:00
Matt Buck f29434b9ac
Update deps 2015-04-06 11:59:10 -05:00
Matt Buck 5e2d6c27c3
Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	db/schema.rb
	lib/msf/core/db_manager/session.rb
	metasploit-framework-db.gemspec
2015-04-06 11:27:00 -05:00
Fernando Arias 6455862484 Merge branch 'staging/rails-4.0' of github.com:rapid7/metasploit-framework into staging/rails-4.0
Conflicts:
	Gemfile.lock
	metasploit-framework.gemspec
2015-04-03 13:56:38 -05:00
Brent Cook 0d78834083 update meterpreter binaries 2015-04-03 05:47:18 -05:00
James Lee bf2d37c511
Axe superfluous line in Gemfile
Covered by the gemspec
2015-03-30 14:57:12 -05:00
James Lee d3dd7ecfc5
Update to latest schema 2015-03-30 14:10:06 -05:00
James Lee 2ab4584079
Merge remote-tracking branch 'upstream/master' into staging/single-vuln-push 2015-03-30 13:50:52 -05:00
Samuel Huckins 18e3a78285
Using latest released MDM 2015-03-30 12:51:12 -05:00
Trevor Rosen 2815462375
Update Mdm to staging hash 2015-03-27 15:16:33 -05:00
Trevor Rosen 27e05d7d73
Update Gemfile 2015-03-27 15:10:37 -05:00
Matt Buck 2fb4877870
Update deps 2015-03-24 16:28:13 -05:00
Brent Cook afe17e1f33 bump meterpreter bins to 0.0.17 2015-03-23 17:15:49 -05:00
James Lee 96195f317e
Use staging branch of mdm 2015-03-20 16:35:46 -05:00
OJ 830f328aba Bump meterpreter_bins version 2015-03-20 06:23:10 +10:00
Matt Buck bd47a1533b Update mdm 2015-03-18 16:37:54 -05:00
Matt Buck 652d7d077e Update mdm and run migrations 2015-03-18 16:21:03 -05:00
Matt Buck 5d0cc4a7e4
Update mdm 2015-03-18 15:20:20 -05:00
Matt Buck 4ae8c622d1
Upgrade factory_girls
MSP-12322
2015-03-18 11:28:08 -05:00
Matt Buck f29a3f69e9 Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	metasploit-framework-db.gemspec
2015-03-17 15:47:48 -05:00
Matt Buck 861fd3174a
Update metasploit gem deps 2015-03-16 15:47:11 -05:00
James Lee cb41154712
Make a MatchResult when sessions are reported 2015-03-10 15:17:57 -05:00
David Maloney 261159aa66
update lockfile 2015-03-10 14:38:01 -05:00
James Lee b37a975108
Use metasploit_data_models staging branch 2015-03-09 01:28:27 -05:00
David Maloney 8d6ba0e775
fix transient factory bug
pulled re-released metasploit-credential to fix
bug by a hidden change to factories

MSP-1244
2015-03-04 14:58:49 -06:00
David Maloney 6b9cf40110
update gemfile.lock
update gemfile lock for new credential version

MSP-12244
2015-03-04 12:29:04 -06:00
HD Moore 4fd2f6867f Switch to rb-readline-r7 for now 2015-02-21 11:30:40 -06:00
Trevor Rosen 62fbf81f8a
Update Gemfile.lock and schema.rb 2015-02-18 15:17:17 -06:00
OJ 73435c6d1c
Land #4743 - Bump met bins, update Linux bins.
Includes a merge of Gemfile.lock
2015-02-11 08:21:23 +10:00
Luke Imhoff 184b4e8a13
Merge branch 'master' into feature/MSP-11141/extract-cache-from-metasploit-model
MSP-11141

Conflicts:
	Gemfile.lock
	metasploit-framework-db.gemspec
2015-02-10 14:09:18 -06:00
Luke Imhoff 5df13364b2
Update to latest metasploit dependencies
MSP-11141
2015-02-10 14:01:49 -06:00
Brent Cook 7ab7add721 bump meterpreter_bins to 0.0.14, update Linux binaries.
Hopefully the last manual build before packaging the Linux bins into
meterpreter_bins as well.

This includes all of the fixes and improvements over the past month.

 rapid7/meterpreter#116
 rapid7/meterpreter#117
 rapid7/meterpreter#121
 rapid7/meterpreter#124
2015-02-10 12:43:47 -06:00
Matt Buck 13e8659c45
Bump version of metasploit-credential
Bumped version of metasploit-credential to pull in bumped version of
MDM, which fixes some old Rails-3 style ActiveRecord calls.

MSP-12127
2015-02-09 15:46:13 -06:00
Samuel Huckins 37ef46264a
Pulling in latest MDM and credential versions
* Fully removing service uniqueness validation for now, more work to be
done on that to avoid regressions.
2015-02-05 14:05:24 -06:00
Samuel Huckins 8a04e37de8
Updating to latest MDM, metasploit-credential
Rails 4 compatibility related
2015-02-01 00:49:12 -06:00
Samuel Huckins 00f99b917c
Updating to latest MDM
MSP-12014

* Updates find_all_by to where
2015-01-31 21:38:24 -06:00
Samuel Huckins 8c55b660fc
Using latest MDM and credential gems
* Had to revert changes related to service uniqueness validation
(MSP-11643) due to newly discovered regressions
2015-01-28 16:14:48 -06:00
David Maloney ef821564e8
resolve lockfile conflict Merge branch 'master' into bug/MSP-11643/service-uniqueness-validation
Conflicts:
	Gemfile.lock
	metasploit-framework-db.gemspec
2015-01-16 12:11:05 -06:00
David Maloney 1bb1a51127
updated gemfile and lock file 2015-01-16 12:07:29 -06:00
Brent Cook ce87b126c1 Update to the latest meterpreter_bins
This removes checked-in sniffer extension in favor of the gem-packaged version.
It also pulls in the changes for verifying #4411
2015-01-09 16:57:10 -06:00
Matt Buck b4eef14ac6
Update metasploit gems 2015-01-08 15:33:23 -06: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
Trevor Rosen 14a35eb28a
Bump metasploit-credential to 0.13.11 2015-01-08 09:35:07 -06:00
David Maloney fcf0a3f096
pull latest credential 2015-01-07 15:09:01 -06:00
Luke Imhoff 95a9d5010c
Use metasploit-model with metasploit-cache extracted
MSP-11141

Test that metasploit-model with metasploit-cache extracted and the
compatible metasploit_data_models and metasploit-credential are
compatible with metasploit-framework without changes.
2014-12-31 15:20:58 -06:00
Samuel Huckins 067bda43e7
Updating lockfile post MDM version bump 2014-12-19 20:58:09 -06:00
Matt Buck db0aeb2a05
Make the version constraint a range 2014-12-19 13:54:13 -06:00
Matt Buck cfc3a31289
Upgrade rails to 3.2.21 2014-12-17 17:50:10 -06:00
Samuel Huckins 4c994d84e0
Updating version to 4.11 for Flood release 2014-12-15 14:42:09 -06:00
Samuel Huckins 3ee60101cf
Updating lockfile for credential 0.13.8
Logfile cleanup
2014-12-14 21:12:32 -06:00
Trevor Rosen 38bcca9d0b
Land #4368, metasploit-credential version bump 2014-12-12 09:42:24 -06:00
David Maloney 7228958738
update lockfile 2014-12-12 09:27:34 -06:00
Brent Cook ecd73e5901 Update meterpreter_bins to 0.0.12
This adjusts to the new grouped TLV format for the extapi adsi and
window list commands.
2014-12-11 22:03:23 -06:00
David Maloney 703f6128e6
update lock file 2014-12-09 15:37:40 -06:00
dmaloney-r7 947a64dc2d Merge pull request #4299 from techpeace/bump-metasploit-credential
Bump metasploit-credential version
2014-12-02 18:01:21 -06:00
Matt Buck a84ee27aef
Bump metasploit-credential version 2014-12-02 17:13:25 -06:00
Matt Buck 0249e0a800
Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	db/schema.rb
	metasploit-framework-db.gemspec
2014-12-02 09:47:47 -06:00
Matt Buck 5db7d1edd5
Bump mdm version number 2014-11-17 10:59:41 -06:00
Samuel Huckins 768d7477d7
metasploit-credential bump to 0.13.3
MSP-11609
2014-11-13 12:56:58 -06:00
David Maloney 49f10e6ed8
use latest version of metasploit-credential
MSP-11609
2014-11-13 11:26:05 -06:00
Tod Beardsley bfc7bfdd9a
Land #4179, Meterpreter_bins update
Actually fixes #3787 as well, since this is the last component needed to
fix that.

See rapid7/meterpreter#102

Also see
055eddeb18
as this brings the shipping binaries up to day with 055eddeb
2014-11-12 15:14:20 -06:00
Matt Buck 66fde33a0c
Get framework working on rails 4 branch with new gemspecs 2014-11-12 14:06:51 -06:00
David Maloney e0163a325d
update metasploit-credential to 0.13.2 2014-11-12 11:16:51 -06:00
OJ fb751e3b9f Update meterpreter_bins to 0.0.11
This adds support for the getsid command in the binaries.
2014-11-12 07:21:00 +10:00
Tod Beardsley 64aaa50132
Revert 14514d7 as well
Another one snuck in there, see #4175

Revert "update gemspec for metasploit-credential"

This reverts commit 14514d7b8b, reversing
changes made to 6653d5e913.
2014-11-11 14:53:04 -06:00
David Maloney bf1558d702
update gemspec for metasploit-credential
update gemspec to use newest metasploit-credential

MSP-11592
2014-11-10 14:54:09 -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 9137bd6527
Revert "Update Gemfile.lock"
MSP-11578

This reverts commit a3829b800d.
2014-11-05 11:10:51 -06:00
Luke Imhoff a3829b800d
Update Gemfile.lock
MSP-11578
2014-11-05 09:55:31 -06:00
Luke Imhoff 5619b6d554
Add metasploit-framework as dependency of metasploit-framework-pcap
MSP-11578

Any of the optional depenency gems should depend on the minimal
metasploit-framework as it supplies the versioning information.
2014-11-05 09:51:38 -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
darkbushido bc91dbb450
updating metasploit_data_models 2014-10-29 12:44:25 -05:00
darkbushido 979394946a
Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	lib/msf/core/db.rb
2014-10-28 15:34:37 -05:00