metasploit-credential 4.0.0 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56d3f12b32ff69edc1d61dcfe44578abf1d039679320ad45e1109b7180038d11
-  data.tar.gz: 014e0d05a2983eb3c94f211930c55434ae789af5232ab58c18741057c865bc49
+  metadata.gz: 8f44e3ef41e9c80b840bd093c0dbb357c605adb7954226b7ce0a705f86387c08
+  data.tar.gz: a2bb39f5ac6b1d299b64c8f0a58b207ba19b30a8cdbf6f098b7429f6201b1aea
 SHA512:
-  metadata.gz: d1264f5666b467b40ae7e24da2cecae6ee57cef12a4b087bb9db8e8b7914518a389da59e2e102ae8f9d6efb6229e84a1dee371d7d17ff302650558c78dc8f75f
-  data.tar.gz: a7ab4645c7c03e282afcfc691bf746d08ea8e2b2dc2d7c1014b6fd3b61b772049ab105b0b4019f4b70622099c946fa8d7dc9f907e3edabc788dc6fd782d9490c
+  metadata.gz: da4a4005c2ab04e21e3c63237515f44e5f2f5ef2b6b9e0913f1b229d52c69d377a4d931700672ec292a8e15f9530359512c800dd0d0bcc8bb1efd3d27178f09f
+  data.tar.gz: cb8e628f924ff529fc8a964c247cbf9f94a13fcc488a67986f64b9a48af9c1b7e3a07422abd1f989a9057a3209d375051dce7065f28c216ce8a22118447e3ba8

data/README.md

@@ -1,4 +1,4 @@
-# Metasploit::Credential [![Build Status](https://travis-ci.org/rapid7/metasploit-credential.svg?branch=master)](https://travis-ci.org/rapid7/metasploit-credential)[![Code Climate](https://codeclimate.com/github/rapid7/metasploit-credential.png)](https://codeclimate.com/github/rapid7/metasploit-credential)[![Dependency Status](https://gemnasium.com/rapid7/metasploit-credential.svg)](https://gemnasium.com/rapid7/metasploit-credential)[![Gem Version](https://badge.fury.io/rb/metasploit-credential.svg)](http://badge.fury.io/rb/metasploit-credential)[![Inline docs](http://inch-ci.org/github/rapid7/metasploit-credential.svg)](http://inch-ci.org/github/rapid7/metasploit-credential)[![PullReview stats](https://www.pullreview.com/github/rapid7/metasploit-credential/badges/master.svg)](https://www.pullreview.com/github/rapid7/metasploit-credential/reviews/master)
+# Metasploit::Credential [![Build Status](https://github.com/rapid7/metasploit-credential/actions/workflows/verify.yml/badge.svg)](https://github.com/rapid7/metasploit-credential/actions/workflows/verify.yml)[![Code Climate](https://codeclimate.com/github/rapid7/metasploit-credential.png)](https://codeclimate.com/github/rapid7/metasploit-credential)[![Dependency Status](https://gemnasium.com/rapid7/metasploit-credential.svg)](https://gemnasium.com/rapid7/metasploit-credential)[![Gem Version](https://badge.fury.io/rb/metasploit-credential.svg)](http://badge.fury.io/rb/metasploit-credential)[![Inline docs](http://inch-ci.org/github/rapid7/metasploit-credential.svg)](http://inch-ci.org/github/rapid7/metasploit-credential)[![PullReview stats](https://www.pullreview.com/github/rapid7/metasploit-credential/badges/master.svg)](https://www.pullreview.com/github/rapid7/metasploit-credential/reviews/master)
 
 ## Versioning
 
@@ -98,7 +98,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md)
 ### Dependencies
 
 Remove your `Gemfile.lock` so you test with the latest compatible dependencies as will be done on
-[travis-ci](https://travis-ci.org/rapid7/metasploit-credential)
+[github actions](https://github.com/rapid7/metasploit-credential/actions/workflows/verify.yml)
 
     rm Gemfile.lock
     bundle install

data/app/models/metasploit/credential/core.rb

@@ -276,8 +276,8 @@ class Metasploit::Credential::Core < ApplicationRecord
   # @param host_id [Integer]
   # @return [String]
   def self.cores_from_host(host_id)
-    left = origin_service_host_id(host_id).ast
-    right = origin_session_host_id(host_id).ast
+    left = origin_service_host_id(host_id).arel.ast
+    right = origin_session_host_id(host_id).arel.ast
 
     Arel::Nodes::UnionAll.new(
       left,

data/lib/metasploit/credential/entity_relationship_diagram.rb

@@ -125,7 +125,7 @@ module Metasploit::Credential::EntityRelationshipDiagram
   # @return [Array<Set<Class<ApplicationRecord>>>]
   def self.maximal_clusters
     clusters = cluster_by_class.values
-    unique_clusters = clusters.distinct
+    unique_clusters = clusters.uniq
 
     maximal_clusters = unique_clusters.dup
     cluster_queue = unique_clusters.dup

data/lib/metasploit/credential/exporter/pwdump.rb

@@ -154,7 +154,7 @@ class Metasploit::Credential::Exporter::Pwdump
   # @param hash_array [Array<Metasploit::Credential::Login>]
   # @return [Fixnum]
   def service_count_for_hashes(hash_array)
-    hash_array.collect(&:service).collect(&:id).distinct.size
+    hash_array.collect(&:service).collect(&:id).uniq.size
   end
 
   private

data/lib/metasploit/credential/version.rb

@@ -3,7 +3,7 @@
 module Metasploit
   module Credential
     # VERSION is managed by GemRelease
-    VERSION = '4.0.0'
+    VERSION = '4.0.5'
 
     # @return [String]
     #

data/spec/dummy/config/database.yml

@@ -1,6 +1,6 @@
 development: &pgsql
   adapter: postgresql
-  database: metasploit-credential_development0
+  database: metasploit-credential_development3
   username: msf
   password: pass123
   host: localhost
@@ -10,4 +10,4 @@ development: &pgsql
   min_messages: warning
 test:
   <<: *pgsql
-  database: metasploit-credential_test0
+  database: metasploit-credential_test3

data/spec/dummy/config/{database.yml.travis → database.yml.github_actions}

@@ -1,17 +1,16 @@
-# @note This file is only for use in travis-ci.  If you need to make a `spec/dummy/config/database.yml` for running
+# @note This file is only for use in github actions.  If you need to make a `spec/dummy/config/database.yml` for running
 # rake, rake spec, or rspec locally, please customize `spec/dummy/config/database.yml.example`.
 #
 # @example Customizing config/database.yml.example
 #   cp spec/dummy/config/database.yml.example spec/dummy/config/database.yml
 #   # update password fields for each environment's user
 
-# Using the postgres user locally without a host and port is the supported configuration from Travis-CI
-#
-# @see http://about.travis-ci.org/docs/user/database-setup/#PostgreSQL
 development: &pgsql
   adapter: postgresql
   database: metasploit_credential_development
+  host: localhost
   username: postgres
+  password: postgres
   pool: 5
   timeout: 5
 
@@ -19,4 +18,4 @@ development: &pgsql
 # `rake`.  Do not set this db to the same as development or production.
 test:
   <<: *pgsql
-  database: metasploit_credential_test
+  database: metasploit_credential_test

data/spec/lib/metasploit/credential/creation_spec.rb

@@ -55,8 +55,7 @@ RSpec.describe Metasploit::Credential::Creation do
           origin_type: origin_type,
           username: 'admin',
           private_data: 'password',
-          private_type: :password,
-          workspace_id: workspace.id
+          private_type: :password
         }.merge(origin_data[origin_type])}
         it 'creates a credential core' do
           expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Core.count }.by(1)
@@ -89,8 +88,7 @@ RSpec.describe Metasploit::Credential::Creation do
           origin_type: :manual,
           username: 'admin',
           private_data: 'password',
-          private_type: :password,
-          workspace_id: workspace.id
+          private_type: :password
         }}
         it 'creates a credential core' do
           expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Core.count }.by(1)
@@ -117,8 +115,7 @@ RSpec.describe Metasploit::Credential::Creation do
           origin_type: :manual,
           username: public_value,
           private_data: 'password',
-          private_type: :password,
-          workspace_id: workspace.id
+          private_type: :password
         }}
         it 'creates a credential core' do
           expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Core.count }.by(1)
@@ -158,8 +155,7 @@ RSpec.describe Metasploit::Credential::Creation do
           origin_type: :manual,
           username: 'admin',
           private_data: private_data[private_type],
-          private_type: private_type,
-          workspace_id: workspace.id
+          private_type: private_type
         }}
         it 'creates a credential core' do
           expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Core.count }.by(1)
@@ -213,7 +209,6 @@ RSpec.describe Metasploit::Credential::Creation do
           username: 'admin',
           private_data: 'password',
           private_type: :password,
-          workspace_id: workspace.id,
           address: service.host.address,
           port: service.port,
           service_name: service.name,
@@ -256,7 +251,6 @@ RSpec.describe Metasploit::Credential::Creation do
           username: 'admin',
           private_data: 'password',
           private_type: :password,
-          workspace_id: workspace.id,
           address: service.host.address,
           port: service.port,
           service_name: service.name,
@@ -294,7 +288,6 @@ RSpec.describe Metasploit::Credential::Creation do
           username: public_value,
           private_data: 'password',
           private_type: :password,
-          workspace_id: workspace.id,
           address: service.host.address,
           port: service.port,
           service_name: service.name,
@@ -344,7 +337,6 @@ RSpec.describe Metasploit::Credential::Creation do
           username: 'admin',
           private_data: private_data[private_type],
           private_type: private_type,
-          workspace_id: workspace.id,
           address: service.host.address,
           port: service.port,
           service_name: service.name,

data/spec/lib/metasploit/credential/exporter/core_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe Metasploit::Credential::Exporter::Core do
   describe "#export!" do
     it 'should create the zipfile' do
       core_exporter.export!
-      expect(File.exists?(core_exporter.output_zipfile_path)).to eq(true)
+      expect(File.exist?(core_exporter.output_zipfile_path)).to eq(true)
     end
 
     it 'should output to a directory whose name contains the standardized identifier' do
@@ -452,4 +452,4 @@ RSpec.describe Metasploit::Credential::Exporter::Core do
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -9,14 +9,8 @@ Bundler.setup(:default, :test)
 # Require simplecov before loading ..dummy/config/environment.rb because it will cause metasploit-credential/lib to
 # be loaded, which would result in Coverage not recording hits for any of the files.
 require 'simplecov'
-require 'coveralls'
 
-if ENV['TRAVIS'] == 'true'
-  # don't generate local report as it is inaccessible on travis-ci, which is why coveralls is being used.
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-else
-  SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
-end
+SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
 
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-credential
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.5
 platform: ruby
 authors:
-- Luke Imhoff
-- Trevor Rosen
+- Metasploit Hackers
 autorequire: 
 bindir: bin
 cert_chain:
@@ -65,20 +64,20 @@ cert_chain:
   -----END CERTIFICATE-----
 - |
   -----BEGIN CERTIFICATE-----
-  MIIFIzCCBAugAwIBAgIQDX9ZkVJ2eNVTlibR5ALyJTANBgkqhkiG9w0BAQsFADBy
+  MIIFIzCCBAugAwIBAgIQCMePMbkSxvnPeJhYXIfaxzANBgkqhkiG9w0BAQsFADBy
   MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
   d3cuZGlnaWNlcnQuY29tMTEwLwYDVQQDEyhEaWdpQ2VydCBTSEEyIEFzc3VyZWQg
-  SUQgQ29kZSBTaWduaW5nIENBMB4XDTE5MTAxNjAwMDAwMFoXDTIwMTAxOTEyMDAw
+  SUQgQ29kZSBTaWduaW5nIENBMB4XDTIwMTAwNzAwMDAwMFoXDTIzMTEwNjEyMDAw
   MFowYDELMAkGA1UEBhMCVVMxFjAUBgNVBAgTDU1hc3NhY2h1c2V0dHMxDzANBgNV
   BAcTBkJvc3RvbjETMBEGA1UEChMKUmFwaWQ3IExMQzETMBEGA1UEAxMKUmFwaWQ3
-  IExMQzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANHnKegPAghKuZk4
-  Gy1jKaZEXbWc4fxioTemv/F1yIYzAjCWP65qjKtyeeFDe4/kJzG9nseF9oa93YBf
-  1nyEqxNSZMw/sCAZ87lOl713dRi73uxOoszy2PT5xEB+Q5R6cbzExkWG2zrLdXDr
-  so0Bd6VHw+IsAoBBkAq5FrZOJQYGn5VY20xw/2DqtCeoW4QDWyqTnbJmwO9tZrfr
-  3Le2crfk2eOgafaPNhLon5uuIKCZsk2YkUSNURSS3M7gosMwU9Gg4JTBi7X5+oww
-  rY43dJT28YklxmNVu8o5kJxW4dqLKJLOIgSXZ63nceT/EaCSg7DcofHNcUzejFwb
-  M7Zbb2kCAwEAAaOCAcUwggHBMB8GA1UdIwQYMBaAFFrEuXsqCqOl6nEDwGD5LfZl
-  dQ5YMB0GA1UdDgQWBBR18CAeMsIEU+0pXal/XXw9LCtMADAOBgNVHQ8BAf8EBAMC
+  IExMQzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALNTz4zvAy7h/vQp
+  4dr1txXHlABAagkwYYwTMCtHs5PXsJITx/5SAjx5swuaLfze5kPBNF2YImvFlOXY
+  WaB+0PsOnXnaARsDZU683xFlj8izU6IN6VrAHzDLKFBzruJENrOJD/ikbEtbjO/q
+  gFbmS9J9v5ohG/pcRSS0t4ZPAwymf8eCp6QsvOKK/Aymp1RhlRaP8N6N5CIpkhz1
+  9p968iCE+DjOXVYxcWE+jE/7uB1dbgrXykNBujMSS3GULOvVEY28n6NCmrPlo23g
+  yRjYVJ2Vy14nBqnxDZ/yRIfWRVjWoT9TsAEbe9gY29oDpSCSs4wSmLQd5zGCpZ9h
+  r0HDFB8CAwEAAaOCAcUwggHBMB8GA1UdIwQYMBaAFFrEuXsqCqOl6nEDwGD5LfZl
+  dQ5YMB0GA1UdDgQWBBTLBL7DTwumVEKtdCdpHVYMXOFeDzAOBgNVHQ8BAf8EBAMC
   B4AwEwYDVR0lBAwwCgYIKwYBBQUHAwMwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDov
   L2NybDMuZGlnaWNlcnQuY29tL3NoYTItYXNzdXJlZC1jcy1nMS5jcmwwNaAzoDGG
   L2h0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9zaGEyLWFzc3VyZWQtY3MtZzEuY3Js
@@ -87,14 +86,14 @@ cert_chain:
   JAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBOBggrBgEFBQcw
   AoZCaHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMkFzc3Vy
   ZWRJRENvZGVTaWduaW5nQ0EuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEL
-  BQADggEBAFpzR9s7lcYKDzSJucOHztEPj+iSIeCzxEw34NTE9M2AfkYIu82c4r2a
-  bzIGmzZWiCGufjOp0gF5xW6sSSJ9n0TqH0nhHhvjtZQkmkGtOBbN1zeYDFS2ozAp
-  sljF/g68Y1eYs3NaFf7kQUa6vb6RdjW3J8M9AQ8gthBt7gr/guVxd/gJUYbdDdBX
-  cWfJJi/X7GVBOBmmvA43qoKideuhOBrVGBHvIF/yO9p23dIiUrGmW9kxXCSxgute
-  JI/W23RbIRksG2pioMhd4dCXq3FLLlkOV1YfCwWixNB+iIhQPPZVaPNfgPhCn4Dt
-  DeGjje/qA4fkLtRmOtb9PUBq3ToRDE4=
+  BQADggEBAN+GL5/myPWg7oH4mVrG7/OhXF1MoYQF0ddaNiqaweEHMuKJBQCVZRbL
+  37HojoKXXv2yyRJBCeTB+ojrxX+5PdLVZa0ss7toWzJ2A1poPXZ1eZvm5xeFD32z
+  YQaTmmNWNI3PCDTyJ2PXUc+bDiNNwcZ7yc5o78UNRvp9Jxghya17Q76c9Ov9wvnv
+  dxxQKWGOQy0m4fBrkyjAyH9Djjn81RbQrqYgPuhd5nD0HjN3VUQLhQbIJrk9TVs0
+  EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
+  9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2021-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-concern
@@ -224,8 +223,7 @@ dependencies:
         version: '0'
 description: The Metasploit::Credential namespace and its ActiveRecord::Base subclasses
 email:
-- luke_imhoff@rapid7.com
-- trevor_rosen@rapid7.com
+- msfdev@metasploit.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -330,7 +328,7 @@ files:
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/database.yml.example
-- spec/dummy/config/database.yml.travis
+- spec/dummy/config/database.yml.github_actions
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
@@ -429,7 +427,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -458,7 +456,7 @@ test_files:
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/database.yml.example
-- spec/dummy/config/database.yml.travis
+- spec/dummy/config/database.yml.github_actions
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb