Commit Graph

923 Commits (85c40a122a5b41440481d55340ec7d88c40bc910)

Author SHA1 Message Date
Brent Cook cbe02f042a
Land #6005, update recog to 2.0.14 2015-10-01 16:37:09 -05:00
Fernando Arias 393a71cf46 Merge branch 'master' of github.com:rapid7/metasploit-framework into bug/MSP-13119/rework-match-result-creation
Conflicts:
	Gemfile.lock
2015-09-29 15:00:22 -05:00
Fernando Arias 2ead218a01
Bump Mdm to 1.2.7
MSP-13119
2015-09-29 14:57:57 -05:00
Brent Cook 866636b59c
Land rapid7/metasploit-payloads#33, fix running android meterpreter without a context 2015-09-26 11:31:27 -04:00
Brent Cook 46ed129966 update to metasploit-payloads 1.0.14 2015-09-26 10:50:20 -04:00
Jon Hart 49bd43701f
Update to recog 2.0.14 2015-09-25 08:21:02 -07:00
Brent Cook 36c1339ad3
update payloads to 1.0.13, fixes older php meterpreters 2015-09-16 17:04:39 -05:00
jvazquez-r7 c8b27e0563
Land #5889, @jlee-r7's favors metasm as a gem 2015-09-16 17:01:01 -05:00
jvazquez-r7 e22f6e79d8
Update Gemfile.lock 2015-09-16 16:52:26 -05:00
Louis Sato 438ff9b667
MSP-13025
Upgrading metasploit-credential version to 1.0.1
2015-09-08 12:01:20 -05:00
Brent Cook d7887b59aa
Land #5892, update pcaprub to the latest version 2015-09-04 17:26:29 -05:00
Brent Cook 3334e94f80 update to metasploit-payloads 1.0.12 2015-09-03 09:59:56 -05:00
Brent Cook 6ea25a465b update to metasploit-payloads 1.0.11 2015-09-01 17:35:23 -05:00
Brent Cook 593f501571 finish move of php / python meterpreters to metasploit-payloads 2015-08-27 11:34:22 -05:00
HD Moore cdd1c6381c
Land #5894, bumps mime-types to 2.6.1 2015-08-26 17:17:01 -05:00
Tod Beardsley 328191aa51
Bump mime-types to 2.6.1
Currently, we're stuck on mime-types 2.4.3. Doesn't seem to be any
reason for this, and incidentally, 2.4.3 is signed with a mystery cert.
We should bump to 2.6.1 to get out of gem signing purgatory.

Diffs:

https://github.com/todb-r7/ruby-mime-types/compare/v2.4.3...v2.6.1
2015-08-26 09:57:47 -05:00
Brent Cook ca8353e1aa update to metasploit-payloads 1.0.9 2015-08-25 17:44:01 -05:00
Tod Beardsley 45eb55f975
Bump PacketFu to latest 2015-08-25 11:45:30 -05:00
James Lee d372a6a16d
Gemify metasm 2015-08-24 15:53:24 -05:00
Brent Cook 5dd015150c
Land #5748, refactor google geolocate, add wlan_geolocate and send_sms to android meterpreter 2015-08-16 10:58:17 -05:00
Brent Cook 82e1181ccb update to metasploit-payloads 1.0.8 2015-08-14 17:38:54 -05:00
Brent Cook 0b6a52e162
bump metasploit-framework gemspec version to match pro 2015-08-04 14:25:44 -05:00
Samuel Huckins 60444c208b
Land #5658, MSF version includes git hash now 2015-07-14 09:21:25 -05:00
Brent Cook b782e3fc0f update to metasploit-payloads 1.0.7
This includes a couple of transport fixes for posix meterpreter and some
robustness fixes when flushing reverse_tcp sockets.
2015-07-13 00:13:02 -05:00
Brent Cook 8349a274ea use and include git hash of Framework as part of the version
Because we do not always update the version number, multiple releases have
shown version string, which is not useful for helping debug issues, or for
knowing what features are enabled.

This adds the git hash or reads from a file a copy of the git hash (useful for
doing packaged builds without git) so that it is clear the origin of a
particular metasploit-framework version.
2015-07-10 18:03:37 -05:00
OJ 85769808cc Update metasploit payloads to 1.0.6 2015-07-10 16:28:20 +10:00
Brent Cook 653c4808b2 update framework version spec 2015-07-06 10:42:48 -05:00
darkbushido 7bdfcf2bce locking the r7 managed gems to specific versions
this will force pro to use the same version of the gems
2015-07-02 14:16:02 -05:00
Brent Cook 52086308b3 bump to metasploit-payloads 1.0.4 2015-07-01 00:22:54 -05:00
Trevor Rosen 4e3a2b2b35
Upstream merge 2015-06-23 14:11:28 -05:00
Trevor Rosen a9ab5b7bb8
Handle content-type weirdness from Anemone
Fixes #5515
 MSP-12834
2015-06-23 14:08:23 -05:00
Brent Cook 9fea3d7a9c update to metasploit-payloads 1.0.3 2015-06-22 16:56:54 -05:00
Trevor Rosen ee9830e2e9
Point MDM to branch for community verification
MSP-12834
2015-06-19 17:10:02 -05:00
Samuel Huckins 9dde32f523
Updating to MDM 1.2.3
MSP-12700

* Fixes issue with web_* data being loaded into memory unnecessarily
2015-06-12 16:48:54 -05:00
Trevor Rosen 7baebeea89
Update MDM dependency
MSP-12813
2015-06-12 14:00:54 -05:00
Samuel Huckins 9713fe7f99
Updating to MDM 1.2.1
* Fixes bug with Pro Vuln Validation validation pushes
2015-06-02 13:26:10 -05:00
Samuel Huckins 22a1b0ab44
Land #5399, latest recog and MDM 2015-06-02 13:23:25 -05:00
Brent Cook 64e86165ef remove android meterpreter bins, update to payloads 1.0.2
This switches us to using the Android payload files from the
metasploit-payloads gem
2015-06-01 09:14:31 -05:00
Brent Cook d39d4ff6de bump to metasploit-payloads 1.0.1 2015-05-29 15:15:49 -05:00
Brent Cook 16bc08861a update to metasploit-payloads 1.0.0 2015-05-29 13:01:26 -05:00
HD Moore 2934dcbf35 Bump Gemfile.lock w/Recog/MDM 2015-05-26 10:40:27 -05:00
Sonny Gonzalez 7d46f428e8
Add polymorphic relationship to Mdm::Vuln
and :origin

MSP-12395

* Update Gemfile.lock to use metasploit_data_models 1.1.0,
  which support the polymorphic relationship
2015-05-21 13:18:38 -05:00
Brent Cook d804f5fe49 update to metasploit-payloads 0.0.7 2015-05-17 10:06:38 -05:00
Brent Cook f3c22e4168 update metasploit-payloads to 0.0.6
This includes:
  - support for the 'sleep' command (metasploit-framework #5339)
  - support for Unicode file names with Java (metasploit-javapayloads #29)
  - proxy support with winhttp (meterpreter #159)
  - support for showing domain and logged in users (meterpreter #161)
2015-05-15 18:04:04 -05:00
Brent Cook 181c770a4e revert unintentional gem upgrades 2015-05-14 00:05:10 -05:00
OJ 83fbd41970 Merge branch 'upstream/master' into multi-transport-support
Conflicts:
	Gemfile.lock
	modules/payloads/singles/cmd/windows/powershell_bind_tcp.rb
2015-05-14 14:50:25 +10:00
OJ e9e3d9c1e4 Update payloads gem, and updated payload sizes 2015-05-13 15:37:09 +10:00
darkbushido d5cfeb7711
updating the metasploit gems to ~> 1.0 2015-05-12 14:49:33 -05:00
Matt Buck e95c908ca8
Update metasploit-credential 2015-05-06 11:08:48 -05:00
darkbushido 26e7fe15f9
Merge branch 'upstream' into staging/rails-4.0
Conflicts:
	Gemfile.lock
2015-05-05 11:00:38 -05:00
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
Samuel Huckins 50a2f4c2a7
Adding missing lock changes from #4030 2014-10-15 20:39:13 -05:00
Tod Beardsley 4f32cc8c01
Bump to meterpreter_bins 0.0.10 2014-10-15 19:36:48 -05:00
Tod Beardsley 8afe4ab5e0
Update Gemspec for meterpreter 0.0.8 2014-10-15 19:00:19 -05:00
Matt Buck 14835dfc0d
Update Gemfile.lock 2014-10-14 15:21:59 -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 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
Matt Buck 90bffe3cbc
Update Gemfile.lock 2014-10-01 13:29:12 -05:00
darkbushido a215f0d64a
updating metasploit-credentail and mdm 2014-09-29 15:49:17 -05:00
darkbushido 701291e029
Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
2014-09-29 15:48:12 -05:00
darkbushido a316875269
updating metasploit-credential 2014-09-29 14:27:18 -05:00
darkbushido 4c492423af
updating metasploit-credential 2014-09-26 15:58:46 -05:00
darkbushido 9b61451c46
updating mdm to use postgres_ext 2014-09-26 13:12:12 -05:00
darkbushido e39bed5e79
updating mdm and changing db.rb 2014-09-26 10:30:22 -05:00
Joe Vennix b96a7ed1d0
Install a global object in firefox payloads, bump jsobfu. 2014-09-24 16:05:00 -05:00
darkbushido d6dcd887d7
Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb
	metasploit-framework.gemspec
2014-09-23 13:40:34 -05:00
sinn3r d52236fe05
Land #3835 - JSObfu to a gem 2014-09-20 01:38:45 -05:00
Joe Vennix 8e1b00ce95
Adds JSObfu.disabled for spec stubbing, fixes BES specs. 2014-09-19 20:42:05 -05:00
Joe Vennix 0f4be63903
Move JSObfu a gem then pull it into the Rex namespace. 2014-09-19 19:10:39 -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 0f854ce5ed
Update to released metasploit-model
MSP-11359
2014-09-18 11:33:41 -05:00
Luke Imhoff 03cc69d902
Update gems
MSP-11359
2014-09-18 11:33:22 -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 3824ba3827
updating mdm in Gemfile.lock 2014-09-10 11:15:56 -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
HD Moore 73e4ec709f Fix smb_port and require 'recog' when no DB/MDM 2014-08-25 15:42:18 -05:00
darkbushido 2877cdc362 Merge branch 'master' into aruba-testing 2014-08-25 14:09:37 -05:00
William Vu 5d708b65b4
Land #3676, updated Meterpreter bins!
For KB2871997.
2014-08-22 14:33:27 -05:00
joev 05afe416a9
Update lockfile to pull in new msf-cred versions. 2014-08-21 15:44:16 -05:00
OJ a6b7262611 Updated to meterpreter_bins version 0.0.7
This has been a long time coming! Kiwi has been broken for a while and
this updated fixes that problem.

Details of the binaries build date/commits are in the gemspec in the
main meterpreter_bins repo.
2014-08-20 12:30:34 +10:00
darkbushido a09037ffa3
Merge branch 'master' into aruba-testing
Conflicts:
	.rubocop.yml
	Gemfile
	Gemfile.lock
	Rakefile
	lib/metasploit/framework/command/console.rb
	lib/metasploit/framework/common_engine.rb
	lib/metasploit/framework/parsed_options/console.rb
	lib/metasploit/framework/require.rb
	lib/metasploit/framework/version.rb
	lib/msf/core/modules/namespace.rb
	modules/auxiliary/analyze/jtr_postgres_fast.rb
	spec/lib/msf/core/framework_spec.rb
2014-08-19 09:06:53 -05:00
HD Moore 6d92d701d7 Merge feature/recog into post-electro master for this PR 2014-08-16 01:19:08 -05:00
Samuel Huckins 149c3ecc63
Various merge resolutions from master <- staging
* --ask option ported to new location
* --version option now works
* MSF version updated
* All specs passing
2014-08-15 11:33:31 -05:00
darkbushido c82ba34f7c
working on a first pass at cucumber for framework 2014-08-13 14:28:28 -05:00
Tod Beardsley bbcd63cd10
Update Gemfile.lock as well for PR #3639 2014-08-12 12:28:39 -05:00
Luke Imhoff 225c6da616
Remove rubocop because it causes backtrace
MSP-11046

See https://gist.github.com/limhoff-r7/7c398b5f4c44ed40cf1f
2014-08-12 10:47:26 -05:00
Brandon Turner 91bb0b6e10 Metasploit Framework 4.9.3-2014072301
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJT0CeVAAoJEJMMBVMNnmqO/7AP/0CBRHjtgiR9VnFKSQ+iWTQV
 iPNMBevn0mpSRq/gpoKCeFBZ6b+YQYrOLXDKVk62VV9LCslkr/P8LW8ul+m+JtB0
 mM6V5esUXM1XhgGEyTnTLRx6BR/WQU1RHlb56ae3nZjQlwCuH/5zEmcy5toZxpsY
 6HO46zE0GGBoLr/VgyYlfT08bfoQ+ICyJN0H5ixoovCc3iW0K1MNqLMfdani8zBJ
 gYJaMysV7XtepumWWQMSC+b/EuertdXXzWDy2bwe0Q3cQXNXzrkPAvtMqucWG+gy
 783OLKCPtVoEZiX87xAptkwmVCRdNGPclaWH7YRZDAh1tqBfRQUg72V/TIrOHCP1
 /lYO7yp5pBQg+1UNnpH+xI2YePFfYdHpYDNT5FSQGOnQjJg30ll4SqCm7cVmo2h5
 BRSYXkPCsQeXGaFarxGERNb8e+qN/WzSrHzY45tQw8mDuhg94tlf3VtDag3FXxhj
 zCxd6bu+tdboVm7FERS85T46kxzmeIycZ4p+Sf7d8gXitl2RKbBdKFNDi1gzeK1T
 yN7bDl4sL7qtDgZLXjFrnyC8vXyAqIrAgmFr2JywMBRm6TiCGQvgnrs+sScU3RFU
 W2tblGbKQq+CwDeC59uQPqxRkm72SMUrKX9448VEQ+9XbKE3TMQ5Q4qCxmnw31Op
 aJ0QgKJz8thZgafZc89I
 =e1z9
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCgAGBQJT4pb8AAoJEA+Ckxyj7hsHn+8P/3FlEYCmoqQ/JzsVtmP3Yi4Q
 gBRva+crY831mCCQXFrPJBvWfmy5HOzVh+Zh7zWF0GQ1WuuMppHfR5ARFVwmiDs3
 qwndhXwziDzBnznf0JKSgT5eJsH23s/ots1lyWymKJvPuT6hn6MRAHUawgnNmYR9
 ttnawmHvCM9Iha2oz3nmkLcNd+83bdBfEWi5l8AQ7jJxwMC2/8VPpMscVVwXqPzd
 CoQugAYZW5VeaEiGio5+19Ix9EPkIDvs6wnfGBtfPfeaOIDZV4XOFoIFUtEeZd5o
 olvEpYvdqscy4Qujzn4C++3wX3bUxkIbHTJHgrKmlD83dI7Cu1JH716G+yfLoJo0
 pQBWTGeWYKEh6leK/9J5Bo1/tOJ/ylbcbvH0Y0tmdu4icHar6uYe1QBrCB9xIdh1
 F+xo4guYnVo616DXJQSwjIye83b5dBxACrfA3bqCnFVFgTM5jXGV1cqiBgs9Dl++
 tIDPgUJkCe/bIdQ7PntlGRzxKihHahlxhCa++YaGKqSq7gXie8Rl4qgloIrbfNZ/
 z3XsoOLNdbMGO7ip88Zjwq4Khj5WZu7ijfCtXO7GU1UJZL1tJ2yK2ic7ZDLc251Y
 8EGMSTG53+6yvZYFtWMZeQzjwD2cpuF04dOmHOKi6KGJJ7KRPhn6gpsbc6U1mbH9
 AjGcfOzhhcsY+WAQ7OG+
 =Pjob
 -----END PGP SIGNATURE-----

Merge tag '2014072301' into staging/electro-release

Conflicts:
	Gemfile.lock
	modules/post/windows/gather/credentials/gpp.rb

This removes the active flag in the gpp.rb module.  According to Lance,
the active flag is no longer used.
2014-08-06 15:58:12 -05:00
Luke Imhoff d56dd318b9
require 'action_view/railtie' for pro compatibility
MSP-10848

Other railties, like jquery-rails, need 'action_view/railtie', but don't
require it themselves, so require it explictly in
`config/application.rb` to prevent msfconsole boot errors.
2014-08-04 20:12:28 -05:00
Samuel Huckins 49a91ac5bb
Updating metasploit-credential dep to v0.8.6 2014-08-02 17:43:08 -05:00
Luke Imhoff 3bd4279038
Update metasploit-credential
MSP-10963
2014-08-02 01:01:53 -05:00
Luke Imhoff c69c06af89
Update metasploit-credential
MSP-10963
2014-08-01 22:05:45 -05:00
Brandon Turner 915e09ac50
Update framework version spec and Gemfile 2014-08-01 09:26:38 -05:00
James Lee 77d99b7374
Land #3586, fix msfconsole when running without db
Conflicts:
	Gemfile.lock
	metasploit-framework.gemspec
2014-07-30 17:24:21 -05:00
Trevor Rosen 3e915e5059
Merge branch 'staging/electro-release' into bug/MSP-10715/import-security-issues
Update deps

Conflicts:
	Gemfile
	Gemfile.lock
2014-07-30 12:49:15 -05:00
Trevor Rosen 8fda4ee239
Fix fd leak and blind IO#gets in pwdump import
MSP-10715
2014-07-29 15:15:47 -05:00
Luke Imhoff 539817fddb
Add metasploit-model as a direct dependency
MSP-10905

Metasploit::Model constants need to be accessible without the db group
installed.
2014-07-29 13:55:56 -05:00
James Lee 1ee32b3b98
Bump metasploit-model so we can use Realm::Key map 2014-07-29 12:19:03 -05:00
James Lee ef7f5fe967 Make metasploit-model a direct dep
Needed for all the scanners that use Metasploit::Model::Realm::Key
constants.
2014-07-29 10:30:46 -05:00
James Lee 1931024c86 Bump credential version for #to_s fixes 2014-07-27 14:08:39 -05:00
Luke Imhoff f3eb708dd1
Update metasploit_data_models and metasploit-credential for tag search
MSP-10029

Use metasploit_data_models that supports searching Mdm::Tag and a
compatible metasploit-credential.  Needed so
Metasploit::Credential::Core#tags can be searched in Pro.
2014-07-22 09:07:18 -05:00
Luke Imhoff f8af435df6
Fix version restrictions on metasploit-credential
MSP-10029

The '<' version should have been '0.8' and not '0.7.10' because '0.8' is
the next incompatible version number.
2014-07-21 19:44:20 -05:00
Luke Imhoff 1a10b21e7f
Use metasploit-credential with association search
MSP-10029
2014-07-21 13:39:17 -05:00
Luke Imhoff a4e5c36de5
Update to metasploit-credential to use gem.
MSP-10808
2014-07-21 12:57:20 -05:00
Tod Beardsley 19477dbfef
Land #3537 from @PagedeGeek, msfcrawler fix 2014-07-17 13:38:15 -05:00
Joshua Smith 9fb18f13cc
Land #3541, adds hpricot to gemfile 2014-07-17 11:14:13 -05:00
Tod Beardsley feee142f32
Updating Gemfile lock so Travis doesn't fail. 2014-07-17 10:18:22 -05:00
Lance Sanchez 7e338aa828
updating Gemfile.lock
MSP-10728
2014-07-16 16:19:59 -05:00
Tod Beardsley 5fa639c640
Land #3528, add Rubocop from @jhart-r7
This adds the gem to the :development group in the Gemfile, as well as
wires up msftidy to use it.
2014-07-16 13:45:44 -05:00
Lance Sanchez 1e2df81397
Attempting to fix a gemfile mergeconflict
MSP-10721
2014-07-16 10:22:27 -05:00
David Maloney 098054e902
gemfile.lock 2014-07-16 09:45:59 -05:00
David Maloney 52a29856b3
Merge branch 'master' into staging/electro-release
Conflicts:
	Gemfile
	Gemfile.lock
2014-07-16 09:38:44 -05:00
Trevor Rosen 2f460f32c3
Fix Gemfile deps 2014-07-15 21:52:57 -05:00
Jon Hart 73736c70b6 Add Rubocop to the Metasploit project
This is a work in progress because the code base is old and the style
varies wildly, however .rubocop.yml can (and should) be tweaked over
time to change standards as we see fit.  As it stands right now there
are few (if any) modules that pass Rubocop.
2014-07-15 10:43:08 -07:00
David Maloney 846679bef9
change Result status
result bojects now use Login::status constants
for their status
2014-07-15 11:39:38 -05:00
Tod Beardsley 038d1e210a
Merge upstream/master to deconflict.
Conflicts:
	Gemfile.lock
2014-07-09 17:43:42 -05:00
David Maloney 59c90bba22
version lock rspec
rspec 3 will cause problems for us right now
2014-07-09 12:21:41 -05:00
David Maloney e5abfea36a
require new metasploit-credential and -model
get the new Realm Key constants after the
move to -model
2014-07-09 10:43:57 -05:00
Luke Imhoff dd75c645c3
Update metasploit-credential
MSP-10663
2014-07-08 19:44:38 -05:00
Lance Sanchez d7450dcbdf
updating dependencies
metasploit-credential to pre.electro.pre.release
metasploit-data-models to 0.18.0

MSP-10654
2014-07-07 17:02:22 -05:00
Luke Imhoff 271fae07cf
Update to compatible dependencies
MSP-10654
2014-07-07 14:41:03 -05:00
HD Moore 8f39590f0f
Framework is currently pegged to 0.17.0. Closes #3495 2014-07-07 09:43:05 -05:00
HD Moore 16af8b8c5c Use MDM 0.17.0 stock as master branch is broken.
This resolves all issues I know of with the recog branch on
Metasploit Framework, but obviously most of the benefits of
this branch come from having a recog-aware MDM, something
that can't happen until MDM 0.17.6+ is supported by the
framework.

In short, this should be good to merge, but will not solve
the intended problems until MDM 0.17.6+ is fixed for MSF
2014-07-06 09:36:08 -05:00
HD Moore 43d65cc93a Merge branch 'master' into feature/recog
Resolves conflicts:
	Gemfile
	data/js/detect/os.js
	modules/exploits/android/browser/webview_addjavascriptinterface.rb
2014-07-06 09:17:44 -05:00
Tod Beardsley 8b63d3d467 Revert the revert of #3446
This reverts commit 9b35b0e13a.

This should not land on master until the Metasploit Pro folks (@trosen-r7
and friends) get their Meterpreter path specifications working the
same way as Framework's does.
2014-06-29 17:22:21 -05:00
Chris Doughty 9b35b0e13a Revert "Land #3446 -- Meterpreter bins gem switch" due to build failures
This reverts commit bba8bd3498, reversing
changes made to 002234993f.
2014-06-25 13:24:07 -05:00
David Maloney 06da2d81e4
use fixed version of credential 2014-06-20 12:34:42 -05:00
David Maloney a929a55404
fix show command parsing
this ius better than a regex and handles special charachters
in usernames and passwords far better than the previous way
2014-06-20 10:48:42 -05:00
Tod Beardsley 1b9d24ad0c
Include the Meterpreter bins 2014-06-19 16:04:40 -05:00
James Lee b606448976
Merge branch 'feature/MSP-9689/jtr_cracker' into staging/electro-release 2014-06-19 10:14:57 -05:00
Joe Vennix b8cedf14a8
Update gemfile dependencies. I have no idea if i need to tag this or wtf. 2014-06-17 12:14:17 -05:00
Luke Imhoff 99330ea40a
Update to use corrected v0.4.2-electro-release tag 2014-06-17 11:14:59 -05:00
Samuel Huckins 57c7d30bc4
Updated MC tag to 0.4.2
MSP-10006
2014-06-16 15:34:42 -05:00
David Maloney a5fb898904
actually set max run time
make maxrutnime affect the crack command
2014-06-14 20:03:56 -05:00
Joe Vennix eeef98d0e4
Update gemfile. 2014-06-12 15:43:44 -05:00
Trevor Rosen 8d06cb7679 Creds version bump 2014-06-11 14:09:31 -05:00
Samuel Huckins 84aa0d42ed Merge pull request #57 from rapid7/bug/MSP-10004/rubyzip
Trevor added a 0.4.1 tag right before this PR landed, making this unmergable. Pulled in staging/electro-release, specs passing.
2014-06-11 13:48:03 -05:00
Samuel Huckins 1903542683
Merge branch 'staging/electro-release' into bug/MSP-10004/rubyzip
Conflicts:
	Gemfile
	Gemfile.lock
2014-06-11 13:42:26 -05:00
Trevor Rosen e8752f9c56 Point to correct creds version 2014-06-11 13:38:35 -05:00
Trevor Rosen a92660376c Update credentials tag 2014-06-11 13:29:09 -05:00
Samuel Huckins b26a8fa76d
Updating with latest MC tag
MSP-10004
2014-06-11 11:36:49 -05:00
Luke Imhoff b92e95ee7f
Add rubyzip 1.1.X
MSP-10004
2014-06-10 13:23:40 -05:00
David Maloney e9d9806408
invalidate_login
added invalidate_login call
also made to_s on credential drop the @
if there is no realm present
2014-06-10 11:07:15 -05:00
David Maloney dc590008a7
add invalidate_login call
add the new invalidate login call to make sure
we update the status on failed logins appropriately
2014-06-10 10:58:27 -05:00
Luke Imhoff c7a43ecced
Update Gemfile.lock
MSP-9994
2014-06-09 14:24:44 -05:00
Lance Sanchez eead9f097a
updating creds to v0.3.0
MSP-9653
2014-06-05 16:31:17 -05:00
Lance Sanchez d10867ea9e
updating the gemfile
metasploit-concern v0.1.0 has been released
metasploit-credential is now on the v0.2.0-electro-release tag

MSP-9653
2014-06-05 14:26:40 -05:00
Luke Imhoff 9e78509aac
Merge branch 'staging/electro-release' into feature/MSP-9653/use-metasploit-concern-in-pro
MSP-9653

Conflicts:
	Gemfile
	Gemfile.lock
2014-06-02 13:40:11 -05:00
Luke Imhoff 80a75e1e9c
Update Gemfile.lock
MSP-9653

Forgot to `bundle install` after changing the metasploit-credential
version.
2014-06-02 13:27:56 -05:00
Luke Imhoff 898b108863
Gemspec
MSP-9653

Add gemspec for metasploit-framework so that pro can declare it as a
proper dependency.  DO NOT release metasploit-framework to rubygems: it
is 47 MB and would be not be nice to their servers.
2014-06-02 13:03:07 -05:00
David Maloney ba525c7b78
use metasploit-credential creation methods 2014-05-30 13:07:11 -05:00
David Maloney 967b0d49b1
Merge branch 'master' into staging/electro-release
Conflicts:
	Gemfile
	Gemfile.lock
2014-05-28 09:39:56 -05:00
James Lee cc1e81ecb7
Add sqlite3 to Gemfile
Fixes all the post modules that require it to parse pilfered sqlite DB
files.
2014-05-27 10:29:55 -05:00
HD Moore 1d205081cb Merge Gemfile changes properly 2014-05-18 11:10:31 -05:00
Luke Imhoff 14cf51db91
Remove unused DatabaseCleaner
MSP-9606

DatabaseCleaner is no longer used in the specs since the use of railties
allowed the use of transactional fixtures.
2014-05-13 09:13:47 -05:00
Luke Imhoff b1598e83c3
Re-enable `bundle install --without db` support
MSP-9606

Catch LoadError in config/application.rb when trying to require
'active_record/railtie` so that end-users can run without any of the
database gems installed.  NOTE: you can't run in the development or
test environment without the database because factory_girl needs
ActiveRecord.
2014-05-12 15:39:34 -05:00
Luke Imhoff 3370465d84
Use railties to load Metasploit::Credential correctly
MSP-9606

In order to support Metasploit::Credential correctly,
metasploit-framework needs to support Metasploit::Concern, which does
all its magic using a Rails::Engine initializer, so the easiest path is
to make metasploit-framework be able to use Rails::Engines.  To make
Rails::Engine use Rails::Engine, make a dummy Rails::Application
subclass so that all the initializers will be run when anything requires
msfenv.
2014-05-12 15:03:51 -05:00
David Maloney cea12c9d0c
remove metasploit-credential dep
remove from the Gemfile for now. we don't need it
just yet, and there are dependency resolution issues
2014-04-28 11:09:31 -05:00
David Maloney 8430851a98
Add metasploit-credential to gemfile
add a temp reference to the metasploit-credential
gem to the gemfile. Need this for access to ssh key
factories for tests
2014-04-25 14:22:52 -05:00
Brandon Turner 97ef53a1d1
Add upper bound for active-* gems
We do not yet support ActiveRecord and ActiveSupport 4.x, so ensure our
Gemfile declares this.
2014-04-18 16:45:07 -05:00
Tod Beardsley af19efbd71
Use the new bcrypt gem, not bcrypt-ruby
See the change upstream at:

273946f2ba

Reported by @ZeroChaos
2014-04-18 15:02:42 -05:00
Joe Vennix 57aa1eec11
Kick rkelly out to a gem, add rkelly-remixed.
rkelly-remixed is a faster fork of rkelly that is more frequently updated
nowadays. With the new gem, jsobfu obfuscates os.js about twice as fast on
my dev environment.
2014-04-09 17:21:22 -05:00
HD Moore 2bc6668312 Point gemfile to the dependent git repos in github vs local 2014-04-01 08:55:10 -07:00
Samuel Huckins a78bc822d0 Gemfile update for new MDM version
* Updated MDM is live
2014-03-19 15:04:20 -05:00
Tod Beardsley 1599d9a134
Update Gemfile.lock 2013-12-23 14:47:32 -06:00
Tod Beardsley c156d2a694
Increment MDM version to 0.16.9
[SeeRM #8725]
2013-12-23 10:29:36 -06:00
Ramon de C Valle 0f56579765 Add the Gemfile.lock file 2013-12-18 18:14:51 -02:00
Tod Beardsley 30d961aad2
Use Fivemat formatting for rspec
Makes the whole thing more pleasant to look at:

````
$ FIVEMAT_PROFILE=1 rake spec
Connecting to database specified by
/home/todb/git/rapid7/metasploit-framework/config/database.yml
NOTICE:  CREATE TABLE will create implicit sequence "api_keys_id_seq"
for serial column "api_keys.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"api_keys_pkey" for table "api_keys"
NOTICE:  CREATE TABLE will create implicit sequence "clients_id_seq" for
serial column "clients.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"clients_pkey" for table "clients"
NOTICE:  CREATE TABLE will create implicit sequence "creds_id_seq" for
serial column "creds.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"creds_pkey" for table "creds"
NOTICE:  CREATE TABLE will create implicit sequence "events_id_seq" for
serial column "events.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"events_pkey" for table "events"
NOTICE:  CREATE TABLE will create implicit sequence
"exploit_attempts_id_seq" for serial column "exploit_attempts.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"exploit_attempts_pkey" for table "exploit_attempts"
NOTICE:  CREATE TABLE will create implicit sequence
"exploited_hosts_id_seq" for serial column "exploited_hosts.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"exploited_hosts_pkey" for table "exploited_hosts"
NOTICE:  CREATE TABLE will create implicit sequence
"host_details_id_seq" for serial column "host_details.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"host_details_pkey" for table "host_details"
NOTICE:  CREATE TABLE will create implicit sequence "hosts_id_seq" for
serial column "hosts.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"hosts_pkey" for table "hosts"
NOTICE:  CREATE TABLE will create implicit sequence "hosts_tags_id_seq"
for serial column "hosts_tags.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"hosts_tags_pkey" for table "hosts_tags"
NOTICE:  CREATE TABLE will create implicit sequence "listeners_id_seq"
for serial column "listeners.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"listeners_pkey" for table "listeners"
NOTICE:  CREATE TABLE will create implicit sequence "loots_id_seq" for
serial column "loots.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"loots_pkey" for table "loots"
NOTICE:  CREATE TABLE will create implicit sequence "macros_id_seq" for
serial column "macros.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"macros_pkey" for table "macros"
NOTICE:  CREATE TABLE will create implicit sequence "mod_refs_id_seq"
for serial column "mod_refs.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"mod_refs_pkey" for table "mod_refs"
NOTICE:  CREATE TABLE will create implicit sequence
"module_actions_id_seq" for serial column "module_actions.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"module_actions_pkey" for table "module_actions"
NOTICE:  CREATE TABLE will create implicit sequence
"module_archs_id_seq" for serial column "module_archs.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"module_archs_pkey" for table "module_archs"
NOTICE:  CREATE TABLE will create implicit sequence
"module_authors_id_seq" for serial column "module_authors.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"module_authors_pkey" for table "module_authors"
NOTICE:  CREATE TABLE will create implicit sequence
"module_details_id_seq" for serial column "module_details.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"module_details_pkey" for table "module_details"
NOTICE:  CREATE TABLE will create implicit sequence
"module_mixins_id_seq" for serial column "module_mixins.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"module_mixins_pkey" for table "module_mixins"
NOTICE:  CREATE TABLE will create implicit sequence
"module_platforms_id_seq" for serial column "module_platforms.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"module_platforms_pkey" for table "module_platforms"
NOTICE:  CREATE TABLE will create implicit sequence "module_refs_id_seq"
for serial column "module_refs.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"module_refs_pkey" for table "module_refs"
NOTICE:  CREATE TABLE will create implicit sequence
"module_targets_id_seq" for serial column "module_targets.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"module_targets_pkey" for table "module_targets"
NOTICE:  CREATE TABLE will create implicit sequence
"nexpose_consoles_id_seq" for serial column "nexpose_consoles.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"nexpose_consoles_pkey" for table "nexpose_consoles"
NOTICE:  CREATE TABLE will create implicit sequence "notes_id_seq" for
serial column "notes.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"notes_pkey" for table "notes"
NOTICE:  CREATE TABLE will create implicit sequence "profiles_id_seq"
for serial column "profiles.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"profiles_pkey" for table "profiles"
NOTICE:  CREATE TABLE will create implicit sequence "refs_id_seq" for
serial column "refs.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"refs_pkey" for table "refs"
NOTICE:  CREATE TABLE will create implicit sequence
"report_templates_id_seq" for serial column "report_templates.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"report_templates_pkey" for table "report_templates"
NOTICE:  CREATE TABLE will create implicit sequence "reports_id_seq" for
serial column "reports.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"reports_pkey" for table "reports"
NOTICE:  CREATE TABLE will create implicit sequence "routes_id_seq" for
serial column "routes.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"routes_pkey" for table "routes"
NOTICE:  CREATE TABLE will create implicit sequence "services_id_seq"
for serial column "services.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"services_pkey" for table "services"
NOTICE:  CREATE TABLE will create implicit sequence
"session_events_id_seq" for serial column "session_events.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"session_events_pkey" for table "session_events"
NOTICE:  CREATE TABLE will create implicit sequence "sessions_id_seq"
for serial column "sessions.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"sessions_pkey" for table "sessions"
NOTICE:  CREATE TABLE will create implicit sequence "tags_id_seq" for
serial column "tags.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"tags_pkey" for table "tags"
NOTICE:  CREATE TABLE will create implicit sequence "task_creds_id_seq"
for serial column "task_creds.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"task_creds_pkey" for table "task_creds"
NOTICE:  CREATE TABLE will create implicit sequence "task_hosts_id_seq"
for serial column "task_hosts.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"task_hosts_pkey" for table "task_hosts"
NOTICE:  CREATE TABLE will create implicit sequence
"task_services_id_seq" for serial column "task_services.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"task_services_pkey" for table "task_services"
NOTICE:  CREATE TABLE will create implicit sequence
"task_sessions_id_seq" for serial column "task_sessions.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"task_sessions_pkey" for table "task_sessions"
NOTICE:  CREATE TABLE will create implicit sequence "tasks_id_seq" for
serial column "tasks.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"tasks_pkey" for table "tasks"
NOTICE:  CREATE TABLE will create implicit sequence "users_id_seq" for
serial column "users.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"users_pkey" for table "users"
NOTICE:  CREATE TABLE will create implicit sequence
"vuln_attempts_id_seq" for serial column "vuln_attempts.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"vuln_attempts_pkey" for table "vuln_attempts"
NOTICE:  CREATE TABLE will create implicit sequence
"vuln_details_id_seq" for serial column "vuln_details.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"vuln_details_pkey" for table "vuln_details"
NOTICE:  CREATE TABLE will create implicit sequence "vulns_id_seq" for
serial column "vulns.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"vulns_pkey" for table "vulns"
NOTICE:  CREATE TABLE will create implicit sequence "vulns_refs_id_seq"
for serial column "vulns_refs.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"vulns_refs_pkey" for table "vulns_refs"
NOTICE:  CREATE TABLE will create implicit sequence "web_forms_id_seq"
for serial column "web_forms.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"web_forms_pkey" for table "web_forms"
NOTICE:  CREATE TABLE will create implicit sequence "web_pages_id_seq"
for serial column "web_pages.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"web_pages_pkey" for table "web_pages"
NOTICE:  CREATE TABLE will create implicit sequence "web_sites_id_seq"
for serial column "web_sites.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"web_sites_pkey" for table "web_sites"
NOTICE:  CREATE TABLE will create implicit sequence "web_vulns_id_seq"
for serial column "web_vulns.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"web_vulns_pkey" for table "web_vulns"
NOTICE:  CREATE TABLE will create implicit sequence
"wmap_requests_id_seq" for serial column "wmap_requests.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"wmap_requests_pkey" for table "wmap_requests"
NOTICE:  CREATE TABLE will create implicit sequence
"wmap_targets_id_seq" for serial column "wmap_targets.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"wmap_targets_pkey" for table "wmap_targets"
NOTICE:  CREATE TABLE will create implicit sequence "workspaces_id_seq"
for serial column "workspaces.id"
NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"workspaces_pkey" for table "workspaces"
/home/todb/.rvm/rubies/ruby-1.9.3-p448/bin/ruby -S rspec
./spec/lib/active_record/connection_adapters/abstract_adapter/connection_pool_spec.rb
./spec/lib/fastlib_spec.rb ./spec/lib/msf/base/simple/framework_spec.rb
./spec/lib/msf/core/data_store_spec.rb
./spec/lib/msf/core/exe/segment_injector_spec.rb
./spec/lib/msf/core/exploit/capture_spec.rb
./spec/lib/msf/core/exploit/http/client_spec.rb
./spec/lib/msf/core/exploit/http/server_spec.rb
./spec/lib/msf/core/module_manager_spec.rb
./spec/lib/msf/core/module_spec.rb
./spec/lib/msf/core/modules/error_spec.rb
./spec/lib/msf/core/modules/loader/archive_spec.rb
./spec/lib/msf/core/modules/loader/base_spec.rb
./spec/lib/msf/core/modules/loader/directory_spec.rb
./spec/lib/msf/core/modules/metasploit_class_compatibility_error_spec.rb
./spec/lib/msf/core/modules/namespace_spec.rb
./spec/lib/msf/core/modules/version_compatibility_error_spec.rb
./spec/lib/msf/core/option_container_spec.rb
./spec/lib/msf/core/options/opt_address_range_spec.rb
./spec/lib/msf/core/options/opt_address_spec.rb
./spec/lib/msf/core/options/opt_bool_spec.rb
./spec/lib/msf/core/options/opt_enum_spec.rb
./spec/lib/msf/core/options/opt_int_spec.rb
./spec/lib/msf/core/options/opt_path_spec.rb
./spec/lib/msf/core/options/opt_port_spec.rb
./spec/lib/msf/core/options/opt_raw_spec.rb
./spec/lib/msf/core/options/opt_regexp_spec.rb
./spec/lib/msf/core/task_manager_spec.rb
./spec/lib/msf/db_manager/export_spec.rb
./spec/lib/msf/db_manager_spec.rb
./spec/lib/msf/ui/command_dispatcher/auxiliary_spec.rb
./spec/lib/msf/ui/command_dispatcher/core_spec.rb
./spec/lib/msf/ui/command_dispatcher/db_spec.rb
./spec/lib/msf/ui/command_dispatcher/exploit_spec.rb
./spec/lib/msf/util/exe_spec.rb ./spec/lib/rex/encoding/xor/byte_spec.rb
./spec/lib/rex/encoding/xor/dword_spec.rb
./spec/lib/rex/encoding/xor/qword_spec.rb
./spec/lib/rex/encoding/xor/word_spec.rb
./spec/lib/rex/exploitation/ropdb_spec.rb
./spec/lib/rex/file_utils_spec.rb ./spec/lib/rex/parser/nmap_xml_spec.rb
./spec/lib/rex/parser/unattend_spec.rb
./spec/lib/rex/post/meterpreter/packet_parser_spec.rb
./spec/lib/rex/post/meterpreter/packet_spec.rb
./spec/lib/rex/proto/http/client_request_spec.rb
./spec/lib/rex/proto/http/client_spec.rb
./spec/lib/rex/proto/http/response_spec.rb
./spec/lib/rex/random_identifier_generator_spec.rb
./spec/lib/rex/socket/range_walker_spec.rb
./spec/lib/rex/sslscan/result_spec.rb
./spec/lib/rex/sslscan/scanner_spec.rb ./spec/lib/rex/text_spec.rb
./spec/msfcli_spec.rb ./spec/msfvenom_spec.rb
ActiveRecord::ConnectionAdapters::ConnectionPool ............ (0.38s)
FastLib .....*.....**.. (0.07s)
Msf::Simple::Framework ..... (0.14s)
Msf::DataStore ............ (0.0s)
Msf::Exe::SegmentInjector ................. (1.75s)
Msf::Exploit::Capture ..****... (0.0s)
Msf::Exploit::Remote::HttpClient ........................ (0.0s)
Msf::Exploit::Remote::HttpServer ...... (0.01s)
Msf::ModuleManager .....................................................
(4.39s)
Msf::Module
.............................................................................................................................................................................................................................................
(0.19s)
Msf::Modules::Error ......... (0.0s)
Msf::Modules::Loader::Archive ............... (0.07s)
Msf::Modules::Loader::Base
..................................................................................................../home/todb/git/rapid7/metasploit-framework/lib/msf/core/modules/loader/base.rb:599:
warning: already initialized constant Mod0
........ (0.15s)
Msf::Modules::Loader::Directory ......... (0.02s)
Msf::Modules::MetasploitClassCompatibilityError ... (0.0s)
Msf::Modules::Namespace ........................................ (0.01s)
Msf::Modules::VersionCompatibilityError ......... (0.0s)
Msf::OptionContainer . (0.0s)
Msf::OptAddressRange ............................ (0.01s)
Msf::OptAddress .............. (0.09s)
Msf::OptBool ............ (0.0s)
Msf::OptEnum ..... (0.0s)
Msf::OptInt ............... (0.0s)
Msf::OptPath ......... (0.0s)
Msf::OptPort .......... (0.0s)
Msf::OptRaw ..... (0.0s)
Msf::OptRegexp ...... (0.0s)
Msf::TaskManager ....... (1.17s)
Msf::DBManager::Export ........................ (9.84s)
Msf::DBManager
.....................................................................................................................................................................................................................................................
(92.63s)
Msf::Ui::Console::CommandDispatcher::Core ...... (4.19s)
Msf::Ui::Console::CommandDispatcher::Db ....*......** (3.76s)
Msf::Util::EXE
...........................................................................................................
(10.14s)
Rex::Encoding::Xor::Byte .. (0.06s)
Rex::Encoding::Xor::Dword ... (0.01s)
Rex::Encoding::Xor::Qword ... (0.02s)
Rex::Encoding::Xor::Word ... (0.0s)
Rex::Exploitation::RopDb .............. (0.11s)
Rex::FileUtils .......... (0.0s)
Rex::Parser::NmapXMLStreamParser .... (0.0s)
Rex::Parser::Unattend .... (0.03s)
Rex::Post::Meterpreter::PacketParser .. (0.0s)
Rex::Post::Meterpreter::Tlv ..................... (0.0s)
Rex::Post::Meterpreter::GroupTlv
....................***................... (0.0s)
Rex::Post::Meterpreter::Packet .................... (0.0s)
Rex::Proto::Http::ClientRequest ............................ (0.01s)
Rex::Proto::Http::Client ......*****.***......... (0.0s)
Rex::Proto::Http::Response ..... (0.0s)
Rex::RandomIdentifierGenerator .................. (0.14s)
Rex::Socket::RangeWalker ............. (0.23s)
Rex::SSLScan::Result
.....................................................................................
(0.44s)
Rex::SSLScan::Scanner .................... (26.91s)
Rex::Text ........ (0.01s)
Msfcli ...................................... (57.47s)
MsfVenom
..............................................................................................
(26.44s)

Pending:
  FastLib class methods dump without compression and without encryption
cache Fix https://www.pivotaltracker.com/story/show/38730815
    # No reason given
    # ./spec/lib/fastlib_spec.rb:94
  FastLib class methods list with cached dump should have dump cached
    # Fix https://www.pivotaltracker.com/story/show/38730815
    # ./spec/lib/fastlib_spec.rb:202
  FastLib class methods list with cached dump should list archived paths
    # Fix https://www.pivotaltracker.com/story/show/38730815
    # ./spec/lib/fastlib_spec.rb:206
  Msf::Exploit::Capture should confirm that pcaprub is available
    # Need to test this without stubbing check_pcaprub_loaded
    # ./spec/lib/msf/core/exploit/capture_spec.rb:40
  Msf::Exploit::Capture should open a pcap file
    # Provde a sample pcap file to read
    # ./spec/lib/msf/core/exploit/capture_spec.rb:43
  Msf::Exploit::Capture should capture from an iface
    # Mock this? Tends to need root
    # ./spec/lib/msf/core/exploit/capture_spec.rb:46
  Msf::Exploit::Capture should inject packets to an ifrace
    # Mock this? Tends to need root
    # ./spec/lib/msf/core/exploit/capture_spec.rb:49
  Msf::Ui::Console::CommandDispatcher::Db#cmd_services -np should list
services that are not on a given port
    # refs redmine ticket #4821
    # ./spec/lib/msf/ui/command_dispatcher/db_spec.rb:100
  Msf::Ui::Console::CommandDispatcher::Db#db_nmap should have some specs
describing its output
    # Not yet implemented
    # ./spec/lib/msf/ui/command_dispatcher/db_spec.rb:261
  Msf::Ui::Console::CommandDispatcher::Db#db_rebuild_cache should have
some specs describing its output
    # Not yet implemented
    # ./spec/lib/msf/ui/command_dispatcher/db_spec.rb:265
  Rex::Post::Meterpreter::GroupTlv#add_tlvs should raise an error when
given something other than nil or an array
    # RM #7598
    # ./spec/lib/rex/post/meterpreter/packet_spec.rb:232
  Rex::Post::Meterpreter::GroupTlv#add_tlvs should raise an error when
given an array of objects other than hashes
    # RM #7598
    # ./spec/lib/rex/post/meterpreter/packet_spec.rb:237
  Rex::Post::Meterpreter::GroupTlv#add_tlvs should raise an error when
any of the hashes are missing a key
    # RM #7598
    # ./spec/lib/rex/post/meterpreter/packet_spec.rb:242
  Rex::Proto::Http::Client should send a request and receive a response
    # need to actually set up an HTTP server to test
    # ./spec/lib/rex/proto/http/client_spec.rb:149
  Rex::Proto::Http::Client should send a request and receive a response
without auth handling
    # need to actually set up an HTTP server to test
    # ./spec/lib/rex/proto/http/client_spec.rb:153
  Rex::Proto::Http::Client should send a request
    # need to actually set up an HTTP server to test
    # ./spec/lib/rex/proto/http/client_spec.rb:157
  Rex::Proto::Http::Client should test for credentials
    # Should actually respond to :has_creds
    # ./spec/lib/rex/proto/http/client_spec.rb:161
  Rex::Proto::Http::Client should send authentication
    # Not yet implemented
    # ./spec/lib/rex/proto/http/client_spec.rb:169
  Rex::Proto::Http::Client should perform digest authentication
    # need to set up an HTTP authentication challenger
    # ./spec/lib/rex/proto/http/client_spec.rb:178
  Rex::Proto::Http::Client should perform negotiate authentication
    # need to set up an HTTP authentication challenger
    # ./spec/lib/rex/proto/http/client_spec.rb:182
  Rex::Proto::Http::Client should get a response
    # need to actually set up an HTTP server to test
    # ./spec/lib/rex/proto/http/client_spec.rb:186
````
2013-10-08 12:50:28 -05:00
Alexia Cole 262b44ff2f Use HTTPS in our Gemfile. 2013-09-20 08:06:48 +07:00
Tod Beardsley 3d9d7b6992 Gemfile.lock, too 2013-09-12 17:26:30 -05:00
Brandon Turner 83a827095b Older versions of rake break specs 2013-09-06 09:34:05 -05:00
Brandon Turner c1e3884e5a Update active* and other gems 2013-09-06 09:34:05 -05:00
Brandon Turner 35ec21cc97 Update test gems
This should not affect core Metasploit Framework as it only updates gems
in the test group (and dependencies of those gems).
2013-09-06 09:34:05 -05:00
Samuel Huckins 5d64bc06ac Uses new MDM version. A few versions were apparently skipped, so the
schema.rb changes include those as well.
2013-07-17 11:46:08 -05:00
Tod Beardsley 56ffa4ae2f Fixes for network_interface PR #2085
Implementing the suggestions from @limhoff-r7.

See #2085

FixRM #8023
FixRM #7943
2013-07-10 13:25:06 -05:00
lsanchez-r7 50cf8adc15 pushing the gem to rubygems 2013-07-08 17:22:55 -05:00
lsanchez-r7 5938e79f81 Adding the NetworkInterface gem
I just moved the c extentions from the metasploit-pcaprub to its own gem
2013-07-08 16:11:47 -05:00
Tod Beardsley d4e9431633 Add Gemfile entry for PacketFu 2013-06-10 14:18:05 -05:00
David Maloney c4475538e7 Report on TaskSession associations
add TaskSession objects so when we report
on a session, we know what Task created it, if there
was a task
2013-06-04 13:42:36 -05:00
David Maloney 37f7e36fda bump mdm version to 0.15.2
This changes does not really affect framework
it is a change for pro functionality
just keeping us inline
2013-06-03 08:51:36 -05:00
David Maloney 5b4c26146c mdm version bump 2013-05-28 14:59:38 -05:00
David Maloney 69dd7f5c58 Update Mdm and Add Task stuff to report
make report_* methods aware of Tasks

[Story #49167601]
2013-05-22 14:59:43 -05:00
Luke Imhoff c8657fb46b Fix Mdm::Module::Detail#stance bug
[#49858419]
[SEERM #7958]

metasploit_data_models 0.14.3 relaxes the validation on
Mdm::Module::Detail#stance so it only needs to be in
Mdm::Module::Detail::STANCES if Mdm::Module::Detail#mtype is 'auxiliary'
or 'exploit' as framework only supplies a stance for those types when
using Mdm::Module::Detail.
2013-05-17 11:58:10 -05:00
Luke Imhoff d57b1df722 Update to metasploit_data_models 0.14.1
[#49617323]

0.14.1 is the jruby compatible version of 0.14.0.
2013-05-16 12:45:08 -05:00
Luke Imhoff 5527f0300f Update to metasploit_data_models 0.14.0
[#49617323]

0.14.0 adds validation for Mdm::WebVuln#params to prevent incorrect
values that can't be exported.
2013-05-15 13:46:41 -05:00
Luke Imhoff 724f934f46 Update to metasploit_data_models 0.13.0
[#49617323]

0.13.0 adds validator for format of Mdm::WebVuln#params.
2013-05-15 09:36:42 -05:00
Luke Imhoff 3828458ccc Update to metasploit_data_models 0.12.0
[#49878349]

0.12.0 removes validation on Mdm::Host#os_name.
2013-05-14 15:44:48 -05:00
Luke Imhoff 4461aefaa2 Update to metasploit_data_models 0.11.2
[#47979793]
2013-05-12 13:36:13 -05:00
Luke Imhoff 6015b25561 Update to metasploit_data_models 0.11.1
[#47979793]
2013-05-09 16:12:01 -05:00
Luke Imhoff bc92b43408 Update to metasploit_data_models 0.11.0
[#47979793]
2013-05-09 13:25:26 -05:00
Luke Imhoff 249a09cd52 Update to metasploit_data_models 0.7.1
[#47979793]
2013-04-26 13:14:38 -05:00
Luke Imhoff 3325b176fc Get rid of pg application truncation warning
[#47979793]

The 0.15.0 version of the pg gem set the application name as the full
path to the application, `$0`, which was the full path to `rspec` when
running a subset of tests.  This caused warning NOTICEs to be printed
that the string would be truncated.  The truncation warning disappears
with version 0.15.1 of the pg gem because the full path is not used.
2013-04-23 08:43:20 -05:00
Luke Imhoff e5befb7094 Msf::DBManager#report_session specs
[#47979793]
2013-04-19 10:11:33 -05:00
Luke Imhoff 2c681005c0 Msf::ModuleManager::Cache spec coverage
[#47979793]
2013-04-15 13:08:12 -05:00
Brandon Turner 97f4882348 Use metasploit_data_models from rubygems 2013-04-11 15:35:19 -05:00
Brandon Turner 88b2d9ac0d Upgrade MDM, removing pry as a runtime dependency 2013-04-05 17:01:23 -05:00
Brandon Turner d8863c789a Update Gemfile with required gems 2013-04-04 16:41:40 -05:00
Luke Imhoff 0bb79ba890 Msf::DBManager#import_msf_xml refactor
[#46491831]

Move Msf::DBManager#import_msf_xml into
Msf::DBManager::ImportMsfXml#import_msf_xml and include
Msf::DBManager::ImportMsfXml to cut down size of the infamous db.rb.
Break up #import_msf_xml to have separate methods for parsing web_forms,
web_pages, and web_vulns.  The method for
web_vulns, #import_msf_web_vuln_element is needed so that it can be overridden in
Pro to handle the Pro-only changes to Mdm::WebVuln.
2013-04-01 16:06: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
David Maloney 2319290522 updated mdm 2013-03-09 15:47:34 -06:00
Luke Imhoff 8d13fc5578 Update Gemfile to metasploit_data_models 0.6.2
[#45816713]

0.6.2 fixes Mdm::WebVuln#confidence erroroneously not accepting a value
of 0.
2013-03-07 20:26:51 -06:00
Brandon Turner addb73ec28 Update the 0.6.1 tag to the merged commit
[Story #45771305]
2013-03-07 16:15:54 -06:00
Luke Imhoff 7ca33c12bd Update Gemfile to metasploit_data_models 0.6.1
[#45771305]

MetasploitDataModels 0.6.1 adds a re-usable yard.rake so that all
Metasploit project don't have to define their own.  It also adds guards
so that the YARD tasks aren't defined (and don't cause errors) if YARD
is not available.

This also adds support for making the Rakefile work with `bundle install
--without development test` so it still functions in the bundle building
environment for Pro.
2013-03-07 14:22:35 -06:00
Luke Imhoff 36e20807b0 Update Gemfile to metaploit_data_models 0.6.0
[#44034071]
2013-03-06 09:53:26 -06:00
Luke Imhoff bd8f94c43d Update to master tag of 0.5.1 of metasploit_data_models
[#44034071]
2013-03-01 13:44:52 -06:00
Luke Imhoff 239e1934b8 Use migrations from metasploit_data_models
[#44034071]

metasploit_data_models version 0.5.0 copied the migrations from
metasploit-framework/data/sql/migrate to
metasploit_data_models/db/migrate so that specs could be written the Mdm
models in metasploit_data_models.  As part of the specs, :null => false
columns that should be :null => true were discovered, so a new migration
was added, but to metasploit_data_models/db/migrate, so it could be
tested.  Instead of replicating migrations back and forth, I'm removing
the migrations completely from metasploit-framework and changing the
default migration path in Msf::DbManager#migration_paths to
MetasploitDataModels.root.join('db', 'migrate').
2013-03-01 09:03:45 -06:00
Tod Beardsley 71abcdbd1a Update Gemfile.lock 2013-02-11 21:56:56 -06:00
Luke Imhoff f8e1ccc27e Remove cred_files migration
[#41837027]

Mdm::CredFile is only used in Pro, so for metasploit_data_models 0.4.0,
Mdm::CredFiles has been moved to Pro, so the migration has been moved to
Pro too.
2013-01-10 17:50:00 -06:00
Luke Imhoff 0fb36f2024 Get pg as a dependency of metasploit_data_models
[#38274165]

metasploit_data_models already declares pg as a runtime dependency in
its gemspec, so there is no need to add pg as a direct dependency of
metasploit-framework, since metasploit-framework only needs pg for
metasploit_data_models.
2012-12-28 13:28:19 -06:00
James Lee 73f5986139 Upgrade rspec to 2.12
Adds .and_call_original, which is super handy.
2012-12-12 15:36:06 -06:00
Luke Imhoff 236db52d3d Add simplecov for code coverage
Conflicts:
	Gemfile.lock
2012-11-06 16:30:41 -06:00
Luke Imhoff 76c3decffb Update Gemfile(.lock) to use tag 0.3.0 for metasploit_data_models
Ensures that Gemfile uses same version as in gemcache.
2012-11-01 08:57:57 -05:00
Luke Imhoff 93469604a7 Fix missed rename when adding fastlib under directory
I missed a spot where I referenced the nested_paths as nested_pathnams
after I renamed the variable.  Now, Msf::ModuleManager#add_module_paths
has rspec tests.

Rspec can be invoked with `rake` as the default task or `rake spec`
explicitly.

I changed RuntimeError to ArgumentError since that error  was more
specific to having a bad argument error.  I adding missing dependencies
to the Gemfile and a require to msf/core/db_manager.rb where it errored
out trying to access Msf::Config when I just did require 'msf/core' in
the spec.
2012-10-08 16:14:37 -05:00
Luke Imhoff fb266d5eb9 Refactor demand_load_module
[#36737359]

Refactor the behavior of loading symbolic modules from cache by renaming
methods so it's clearer what they do and ensure that cached modules from
Fastlibs and directories can both be loaded, which was not previously
possible since the demand_load_module only called load_module_from_file.
2012-10-04 11:14:08 -05:00
Luke Imhoff 7443fed86d Explicitly require 'active_support/concern'
[#36737359]

When starting msfconsole, 'bundler/setup' is not required, the
'msf/env/gemcache' is required instead. Unlike 'bundler/setup' the
msf/env gemcache does not do the automatic requires for gems in the
cache, so explicit requires on 'active_support/concern' is needed to get
ActiveSupport::Concern defined.  (I could have done require
'active_support' to match the behavior of 'bundler/setup', but a smaller
require seemed more appropriate.
2012-10-03 15:42:14 -05:00
Luke Imhoff 555a9f2559 Refactor Msf::ModuleManager
[Fixes #36737359]

Refactor Msf::ModuleManager into concerns so its easier to understand and
duplicate code can be made DRY.  The refactoring also ensures that when
loading from directories, Fastlibs, or reloading, the wrapper module will
always be named so that activesupport/dependencies will function.
2012-10-01 13:09:30 -05:00