metasploit-credential 3.0.4 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e32058185ba39a78129a585e86c500790a52e2553a98bca55e2804428c4c5e6
-  data.tar.gz: 8b74251eda58f780025e4bbd6b3d780bc6da7d14d9c6029cf86397e9a579b299
+  metadata.gz: 0d4080e5da11b26f677a0d65ca483889673a59882e6be864a8a74a51134d2680
+  data.tar.gz: 3f6c968807a54a0d393c58f61be6e330763c39b21a1744b9bf82844761a48d7d
 SHA512:
-  metadata.gz: 2171821e86cdcddbd84a9206feb91b2b588c4dd1fa5f44c8444ab0a71b28dc3c5972145d680a997274738d78574916b0e82dd3c0d3b45490c269d70a6b3403ff
-  data.tar.gz: 263e9323aa40fa177d39e400caa4eb88d05b3d6ce24fe6877f0e01480f9599bee7b5ef58b3b48a5768520f640194084d2f6c18ec82b6a8c3e9b9375b15c38db4
+  metadata.gz: c44e6959b9863e7a165a5935a8ee97351966d26ef511b1aaa83c7f268d0887bef43a3319a272461383e6c6f816ca67bd9a472d55cb996b5d8cffe82f3d46ffff
+  data.tar.gz: 7b72b4e1e7924bc771eba24c31eb4c260882ea255ec371355f7359484697d01e86ca719033cfb3554ad30b6a135f53b6954ccd627ffb30befc6b27e87bbf7fac

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/concerns/mdm/task/metasploit_credential_core.rb

@@ -12,8 +12,8 @@ module Mdm::Task::MetasploitCredentialCore
     #
     #   @return [ActiveRecord::Relation<Metasploit::Credential::Core>]
     has_and_belongs_to_many :credential_cores, 
-                            -> { uniq },
+                            -> { distinct },
                             class_name: "Metasploit::Credential::Core", 
                             join_table: "credential_cores_tasks"
   end
-end
+end

data/app/concerns/mdm/task/metasploit_credential_login.rb

@@ -12,8 +12,8 @@ module Mdm::Task::MetasploitCredentialLogin
     #
     #   @return [ActiveRecord::Relation<Metasploit::Credential::Core>]
     has_and_belongs_to_many :credential_logins, 
-                            -> { uniq },
+                            -> { distinct },
                             class_name: "Metasploit::Credential::Login", 
                             join_table: "credential_logins_tasks"
   end
-end
+end

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

@@ -3,7 +3,7 @@
 # used.
 #
 # A core credential must always have an {#origin}, but only needs 1 of {#private}, {#public}, or {#realm} set.
-class Metasploit::Credential::Core < ActiveRecord::Base
+class Metasploit::Credential::Core < ApplicationRecord
   include Metasploit::Model::Search
   include Metasploit::Credential::CoreValidations
 
@@ -16,7 +16,7 @@ class Metasploit::Credential::Core < ActiveRecord::Base
   #
   #   @return [ActiveRecord::Relation<Mdm::Task>]
   has_and_belongs_to_many :tasks,
-                          -> { uniq },
+                          -> { distinct },
                           class_name: "Mdm::Task",
                           join_table: "credential_cores_tasks"
 
@@ -127,7 +127,7 @@ class Metasploit::Credential::Core < ActiveRecord::Base
   #
   # @method origins(origin_class)
   # @scope Metasploit::Credential::Core
-  # @param origin_class [ActiveRecord::Base] the Origin class to look up
+  # @param origin_class [ApplicationRecord] the Origin class to look up
   # @param table_alias [String] an alias for the JOINed table, defaults to the table name
   # @return [ActiveRecord::Relation] scoped to that origin
   scope :origins, lambda { |origin_class, table_alias=nil|
@@ -276,8 +276,8 @@ class Metasploit::Credential::Core < ActiveRecord::Base
   # @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/app/models/metasploit/credential/login.rb

@@ -1,5 +1,5 @@
 # The use of a {#core core credential} against a {#service service}.
-class Metasploit::Credential::Login < ActiveRecord::Base
+class Metasploit::Credential::Login < ApplicationRecord
   extend ActiveSupport::Autoload
 
   include Metasploit::Model::Search
@@ -13,7 +13,7 @@ class Metasploit::Credential::Login < ActiveRecord::Base
   #
   #   @return [ActiveRecord::Relation<Mdm::Task>]
   has_and_belongs_to_many :tasks,
-                          -> { uniq },
+                          -> { distinct },
                           class_name: "Mdm::Task", 
                           join_table: "credential_logins_tasks"
 

data/app/models/metasploit/credential/origin/cracked_password.rb

@@ -1,5 +1,5 @@
 # An origin for {#cores core credentials} that were cracked from a {#originating_core core credentials}
-class Metasploit::Credential::Origin::CrackedPassword < ActiveRecord::Base
+class Metasploit::Credential::Origin::CrackedPassword < ApplicationRecord
 
   #
   # Associations

data/app/models/metasploit/credential/origin/import.rb

@@ -1,5 +1,5 @@
 # An origin for {#cores core credentials} that were imported by a {#task} from a {#filename file}.
-class Metasploit::Credential::Origin::Import < ActiveRecord::Base
+class Metasploit::Credential::Origin::Import < ApplicationRecord
   #
   # Associations
   #

data/app/models/metasploit/credential/origin/manual.rb

@@ -1,5 +1,5 @@
 # Origin of {#cores core credentials} that are manually entered by a {#user}.
-class Metasploit::Credential::Origin::Manual < ActiveRecord::Base
+class Metasploit::Credential::Origin::Manual < ApplicationRecord
   #
   # Associations
   #

data/app/models/metasploit/credential/origin/service.rb

@@ -3,7 +3,7 @@
 # for `Metasploit::Credential::Core`s derived after a {Metasploit::Credential::Origin::Session#session session} is
 # gained and a {Metasploit::Credential::Origin::Session#post_reference_name post module} is run from the session to
 # gather credentials.
-class Metasploit::Credential::Origin::Service < ActiveRecord::Base
+class Metasploit::Credential::Origin::Service < ApplicationRecord
   #
   # CONSTANTS
   #

data/app/models/metasploit/credential/origin/session.rb

@@ -3,7 +3,7 @@
 # {Metasploit::Credential::Origin::Service#module_full_name auxiliary or exploit modules} that gather credentials
 # directly from a {Metasploit::Credential::Origin::Service#service service} without the need for a separate post module
 # or even a session.
-class Metasploit::Credential::Origin::Session < ActiveRecord::Base
+class Metasploit::Credential::Origin::Session < ApplicationRecord
   #
   # Associations
   #

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

@@ -2,7 +2,7 @@
 # disclosed, such as a {Metasploit::Credential::Password password}, password hash, or key file.
 #
 # Uses Single Table Inheritance to store subclass name in {#type} per Rails convention.
-class Metasploit::Credential::Private < ActiveRecord::Base
+class Metasploit::Credential::Private < ApplicationRecord
   include Metasploit::Model::Search
 
   #

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

@@ -1,5 +1,5 @@
 # A publicly disclosed credential, i.e. a {#username}.
-class Metasploit::Credential::Public < ActiveRecord::Base
+class Metasploit::Credential::Public < ApplicationRecord
   include Metasploit::Model::Search
 
   #

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

@@ -1,6 +1,6 @@
 # The realm in which a {Metasploit::Credential::Public} can be used to authenticate or from which a
 # {Metasploit::Credential::Private} was looted.
-class Metasploit::Credential::Realm < ActiveRecord::Base
+class Metasploit::Credential::Realm < ApplicationRecord
   extend ActiveSupport::Autoload
 
   include Metasploit::Model::Search

data/app/models/metasploit/credential/search/operator/type.rb

@@ -24,7 +24,7 @@ class Metasploit::Credential::Search::Operator::Type < Metasploit::Model::Search
   # Instance Methods
   #
 
-  # Defaults to `:type` as all STI tables in `ActiveRecord::Base` use `type` as teh type attribute by default.  Override
+  # Defaults to `:type` as all STI tables in `ApplicationRecord` use `type` as teh type attribute by default.  Override
   # to search foreign key types, which are prefixed with the association name.
   #
   # @return [Symbol]
@@ -70,4 +70,4 @@ class Metasploit::Credential::Search::Operator::Type < Metasploit::Model::Search
   def type
     :string
   end
-end
+end

data/db/migrate/20140331173835_create_metasploit_credential_publics.rb

@@ -1,4 +1,4 @@
-class CreateMetasploitCredentialPublics < ActiveRecord::Migration
+class CreateMetasploitCredentialPublics < ActiveRecord::Migration[4.2]
   def change
     create_table :metasploit_credential_publics do |t|
       #

data/db/migrate/20140407212345_create_metasploit_credential_privates.rb

@@ -1,4 +1,4 @@
-class CreateMetasploitCredentialPrivates < ActiveRecord::Migration
+class CreateMetasploitCredentialPrivates < ActiveRecord::Migration[4.2]
   def change
     create_table :metasploit_credential_privates do |t|
       #

data/db/migrate/20140410132401_create_metasploit_credential_realms.rb

@@ -1,4 +1,4 @@
-class CreateMetasploitCredentialRealms < ActiveRecord::Migration
+class CreateMetasploitCredentialRealms < ActiveRecord::Migration[4.2]
   def change
     create_table :metasploit_credential_realms do |t|
       t.string :key, null: false

data/db/migrate/20140410161611_unique_metasploit_credential_realms.rb

@@ -1,4 +1,4 @@
-class UniqueMetasploitCredentialRealms < ActiveRecord::Migration
+class UniqueMetasploitCredentialRealms < ActiveRecord::Migration[4.2]
   def change
     change_table :metasploit_credential_realms do |t|
       t.index [:key, :value], unique: true

data/db/migrate/20140410191213_create_metasploit_credential_origin_manuals.rb

@@ -1,4 +1,4 @@
-class CreateMetasploitCredentialOriginManuals < ActiveRecord::Migration
+class CreateMetasploitCredentialOriginManuals < ActiveRecord::Migration[4.2]
   def change
     create_table :metasploit_credential_origin_manuals do |t|
       #

data/db/migrate/20140410205410_create_metasploit_credential_origin_imports.rb

@@ -1,4 +1,4 @@
-class CreateMetasploitCredentialOriginImports < ActiveRecord::Migration
+class CreateMetasploitCredentialOriginImports < ActiveRecord::Migration[4.2]
   def change
     create_table :metasploit_credential_origin_imports do |t|
       #

data/db/migrate/20140411142102_create_metasploit_credential_origin_sessions.rb

@@ -1,4 +1,4 @@
-class CreateMetasploitCredentialOriginSessions < ActiveRecord::Migration
+class CreateMetasploitCredentialOriginSessions < ActiveRecord::Migration[4.2]
   def change
     create_table :metasploit_credential_origin_sessions do |t|
       #

data/db/migrate/20140411205325_create_metasploit_credential_origin_services.rb

@@ -1,4 +1,4 @@
-class CreateMetasploitCredentialOriginServices < ActiveRecord::Migration
+class CreateMetasploitCredentialOriginServices < ActiveRecord::Migration[4.2]
   def change
     create_table :metasploit_credential_origin_services do |t|
       #

data/db/migrate/20140414192550_create_metasploit_credential_cores.rb

@@ -1,4 +1,4 @@
-class CreateMetasploitCredentialCores < ActiveRecord::Migration
+class CreateMetasploitCredentialCores < ActiveRecord::Migration[4.2]
   def change
     create_table :metasploit_credential_cores do |t|
       #

data/db/migrate/20140417140933_create_metasploit_credential_logins.rb

@@ -1,4 +1,4 @@
-class CreateMetasploitCredentialLogins < ActiveRecord::Migration
+class CreateMetasploitCredentialLogins < ActiveRecord::Migration[4.2]
   def change
     create_table :metasploit_credential_logins do |t|
       #

data/db/migrate/20140520140817_add_logins_counter_cache_to_cores.rb

@@ -1,4 +1,4 @@
-class AddLoginsCounterCacheToCores < ActiveRecord::Migration
+class AddLoginsCounterCacheToCores < ActiveRecord::Migration[4.2]
   def self.up
     add_column :metasploit_credential_cores, :logins_count, :integer, :default => 0
 

data/db/migrate/20140603163708_add_jtr_format_to_metasploit_credential_privates.rb

@@ -1,4 +1,4 @@
-class AddJtrFormatToMetasploitCredentialPrivates < ActiveRecord::Migration
+class AddJtrFormatToMetasploitCredentialPrivates < ActiveRecord::Migration[4.2]
   def change
     add_column :metasploit_credential_privates, :jtr_format, :string
   end

data/db/migrate/20140605173747_create_metasploit_credential_origin_cracked_passwords.rb

@@ -1,4 +1,4 @@
-class CreateMetasploitCredentialOriginCrackedPasswords < ActiveRecord::Migration
+class CreateMetasploitCredentialOriginCrackedPasswords < ActiveRecord::Migration[4.2]
   def change
     create_table :metasploit_credential_origin_cracked_passwords do |t|
 

data/db/migrate/20140702184622_create_credential_cores_tasks_join_table.rb

@@ -1,8 +1,8 @@
-class CreateCredentialCoresTasksJoinTable < ActiveRecord::Migration
+class CreateCredentialCoresTasksJoinTable < ActiveRecord::Migration[4.2]
   def change
     create_table :credential_cores_tasks, :force => true, :id => false do |t|
       t.integer :core_id
       t.integer :task_id
     end
   end
-end
+end

data/db/migrate/20140703144541_create_credential_logins_tasks_join_table.rb

@@ -1,4 +1,4 @@
-class CreateCredentialLoginsTasksJoinTable < ActiveRecord::Migration
+class CreateCredentialLoginsTasksJoinTable < ActiveRecord::Migration[4.2]
   def change
     create_table :credential_logins_tasks, :force => true, :id => false do |t|
       t.integer :login_id

data/db/migrate/20140722174919_old_creds_to_new_creds.rb

@@ -1,6 +1,6 @@
 # Implements a one-time migration of `Mdm::Cred` objects to
 # appropriate objects from {Metasploit::Credential}
-class OldCredsToNewCreds < ActiveRecord::Migration
+class OldCredsToNewCreds < ActiveRecord::Migration[4.2]
   def up
     Metasploit::Credential::Migrator.new.migrate!
   end

data/db/migrate/20140728191933_unique_metasploit_credential_cores.rb

@@ -1,4 +1,4 @@
-class UniqueMetasploitCredentialCores < ActiveRecord::Migration
+class UniqueMetasploitCredentialCores < ActiveRecord::Migration[4.2]
   def down
     execute 'DROP INDEX unique_complete_metasploit_credential_cores'
     execute 'DROP INDEX unique_private_metasploit_credential_cores'

data/db/migrate/20140801150537_unique_metasploit_credential_cores_with_realm_id.rb

@@ -1,4 +1,4 @@
-class UniqueMetasploitCredentialCoresWithRealmId < ActiveRecord::Migration
+class UniqueMetasploitCredentialCoresWithRealmId < ActiveRecord::Migration[4.2]
   #
   # CONSTANTS
   #

data/db/migrate/20140922170030_add_typeto_public.rb

@@ -1,4 +1,4 @@
-class AddTypetoPublic < ActiveRecord::Migration
+class AddTypetoPublic < ActiveRecord::Migration[4.2]
   def change
     change_table :metasploit_credential_publics do |t|
       #

data/db/migrate/20150106201450_old_creds_to_new_creds2.rb

@@ -2,7 +2,7 @@
 # appropriate objects from {Metasploit::Credential}
 # This second run is due to the refactor of #report_auth_info
 # that means we should no longer be creating old creds anywhere.
-class OldCredsToNewCreds2 < ActiveRecord::Migration
+class OldCredsToNewCreds2 < ActiveRecord::Migration[4.2]
   def up
     Metasploit::Credential::Migrator.new.migrate!
   end

data/db/migrate/20161107153145_recreate_index_on_private_data_and_type.rb

@@ -1,4 +1,4 @@
-class RecreateIndexOnPrivateDataAndType < ActiveRecord::Migration
+class RecreateIndexOnPrivateDataAndType < ActiveRecord::Migration[4.2]
   def change
     remove_index :metasploit_credential_privates, [:type, :data]
     

data/db/migrate/20161107203710_create_index_on_private_data_and_type_for_ssh_key.rb

@@ -1,4 +1,4 @@
-class CreateIndexOnPrivateDataAndTypeForSshKey < ActiveRecord::Migration
+class CreateIndexOnPrivateDataAndTypeForSshKey < ActiveRecord::Migration[4.2]
   def up
     sql =<<ENDL
 CREATE UNIQUE INDEX "index_metasploit_credential_privates_on_type_and_data_sshkey" ON

data/lib/metasploit/credential.rb

@@ -52,7 +52,7 @@ module Metasploit
     autoload :Text
     autoload :Username
 
-    # The prefix for all `ActiveRecord::Base#table_name`s for `ActiveRecord::Base` subclasses under this namespace.
+    # The prefix for all `ApplicationRecord#table_name`s for `ApplicationRecord` subclasses under this namespace.
     #
     # @return [String] `'metasploit_credential_'`
     def self.table_name_prefix

data/lib/metasploit/credential/core_validations.rb

@@ -25,7 +25,7 @@ module Metasploit::Credential::CoreValidations
                       :public_id
                   ]
               },
-              if: '!realm.present? && !public.present? && private.present?'
+              if: -> { !realm.present? && !public.present? && private.present? }
     # replicates 'unique_public_metasploit_credential_cores' index
     validates :public_id,
               uniqueness: {
@@ -37,7 +37,7 @@ module Metasploit::Credential::CoreValidations
                       :private_id
                   ]
               },
-              if: '!realm.present? && public.present? && !private.present?'
+              if: -> { !realm.present? && public.present? && !private.present? }
     # replicates 'unique_realmless_metasploit_credential_cores' index
     validates :private_id,
               uniqueness: {
@@ -49,7 +49,7 @@ module Metasploit::Credential::CoreValidations
                       :public_id
                   ]
               },
-              if: '!realm.present? && public.present? && private.present?'
+              if: -> { !realm.present? && public.present? && private.present? }
     # replicates 'unique_publicless_metasploit_credential_cores' index
     validates :private_id,
               uniqueness: {
@@ -61,7 +61,7 @@ module Metasploit::Credential::CoreValidations
                       :public_id
                   ]
               },
-              if: 'realm.present? && !public.present? && private.present?'
+              if: -> { realm.present? && !public.present? && private.present? }
     # replicates 'unique_privateless_metasploit_credential_cores' index
     validates :public_id,
               uniqueness: {
@@ -73,7 +73,7 @@ module Metasploit::Credential::CoreValidations
                       :private_id
                   ]
               },
-              if: 'realm.present? && public.present? && !private.present?'
+              if: -> { realm.present? && public.present? && !private.present? }
     # replicates 'unique_complete_metasploit_credential_cores' index
     validates :private_id,
               uniqueness: {
@@ -84,7 +84,7 @@ module Metasploit::Credential::CoreValidations
                       :public_id
                   ]
               },
-              if: 'realm.present? && public.present? && private.present?'
+              if: -> { realm.present? && public.present? && private.present? }
     validates :workspace,
               presence: true
 

data/lib/metasploit/credential/creation.rb

@@ -8,7 +8,7 @@ module Metasploit::Credential::Creation
   # Returns true if ActiveRecord has an active database connection, false otherwise.
   # @return [Boolean]
   def active_db?
-    ActiveRecord::Base.connected?
+    ApplicationRecord.connected?
   end
 
   # This method takes a few simple parameters and creates a new username/password

data/lib/metasploit/credential/entity_relationship_diagram.rb

@@ -36,16 +36,16 @@ module Metasploit::Credential::EntityRelationshipDiagram
   # Class Methods
   #
 
-  # All {cluster clusters} of classes that are reachable through belongs_to from each ActiveRecord::Base descendant
+  # All {cluster clusters} of classes that are reachable through belongs_to from each ApplicationRecord descendant
   #
-  # @return [Hash{Class<ActiveRecord::Base> => Set<Class<ActiveRecord::Base>>}] Maps entry point to cluster to its
+  # @return [Hash{Class<ApplicationRecord> => Set<Class<ApplicationRecord>>}] Maps entry point to cluster to its
   #   cluster.
   def self.cluster_by_class
     cluster_by_class = {}
 
     Metasploit::Credential::Engine.instance.eager_load!
 
-    ActiveRecord::Base.descendants.each do |klass|
+    ApplicationRecord.descendants.each do |klass|
       klass_cluster = cluster(klass)
       cluster_by_class[klass] = klass_cluster
     end
@@ -55,9 +55,9 @@ module Metasploit::Credential::EntityRelationshipDiagram
 
   # Cluster of classes that are reachable through belongs_to from `classes`.
   #
-  # @param classes [Array<Class<ActiveRecord::Base>>] classes that must be in cluster.  All other classes in the
+  # @param classes [Array<Class<ApplicationRecord>>] classes that must be in cluster.  All other classes in the
   #   returned cluster will be classes to which `classes` belong directly or indirectly.
-  # @return [Set<Class<ActiveRecord::Base>>]
+  # @return [Set<Class<ApplicationRecord>>]
   def self.cluster(*classes)
     class_queue = classes.dup
     visited_class_set = Set.new
@@ -122,7 +122,7 @@ module Metasploit::Credential::EntityRelationshipDiagram
 
   # Set of largest clusters from {cluster_by_class}.
   #
-  # @return [Array<Set<Class<ActiveRecord::Base>>>]
+  # @return [Array<Set<Class<ApplicationRecord>>>]
   def self.maximal_clusters
     clusters = cluster_by_class.values
     unique_clusters = clusters.uniq
@@ -152,11 +152,11 @@ module Metasploit::Credential::EntityRelationshipDiagram
 
   # Calculates the target classes for a polymorphic `belongs_to`.
   #
-  # @return [Array<ActiveRecord::Base>]
+  # @return [Array<ApplicationRecord>]
   def self.polymorphic_classes(belongs_to_reflection)
     name = belongs_to_reflection.name
 
-    ActiveRecord::Base.descendants.each_with_object([]) { |descendant, target_classes|
+    ApplicationRecord.descendants.each_with_object([]) { |descendant, target_classes|
       has_many_reflections = descendant.reflect_on_all_associations(:has_many)
 
       has_many_reflections.each do |has_many_reflection|
@@ -168,4 +168,4 @@ module Metasploit::Credential::EntityRelationshipDiagram
       end
     }
   end
-end
+end

data/lib/metasploit/credential/origin.rb

@@ -8,7 +8,7 @@ module Metasploit::Credential::Origin
   autoload :Service
   autoload :Session
 
-  # The prefix for table name of `ActiveRecord::Base` subclasses in the namespace.
+  # The prefix for table name of `ApplicationRecord` subclasses in the namespace.
   #
   # @return [String] `'metasploit_credential_origin_'`
   def self.table_name_prefix

data/lib/metasploit/credential/version.rb

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

data/spec/dummy/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/spec/dummy/config/application.rb

@@ -55,11 +55,6 @@ module Dummy
     # like if you have constraints or database-specific column types
     config.active_record.schema_format = :sql
 
-    # Enable the asset pipeline
-    config.assets.enabled = false
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
   end
 end
 

data/spec/dummy/config/database.yml

@@ -1,6 +1,6 @@
 development: &pgsql
   adapter: postgresql
-  database: metasploit-credential_development1
+  database: metasploit-credential_development3
   username: msf
   password: pass123
   host: localhost
@@ -10,4 +10,4 @@ development: &pgsql
   min_messages: warning
 test:
   <<: *pgsql
-  database: metasploit-credential_test1
+  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/dummy/config/environments/development.rb

@@ -19,16 +19,6 @@ Rails.application.configure do
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  config.assets.debug = true
-
-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
-
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 end

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,
@@ -382,7 +374,7 @@ RSpec.describe Metasploit::Credential::Creation do
     it 'creates a Core' do
       expect {
         test_object.create_cracked_credential(
-            core_id: old_core,
+            core_id: old_core.id,
             username: public.username,
             password: password
         )

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/lib/metasploit/credential/importer/pwdump_spec.rb

@@ -113,4 +113,4 @@ RSpec.describe Metasploit::Credential::Importer::Pwdump do
 
   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: 3.0.4
+  version: 4.0.4
 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: 2019-12-12 00:00:00.000000000 Z
+date: 2021-04-28 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: []
@@ -320,6 +318,7 @@ files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/application_record.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
@@ -329,12 +328,11 @@ 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
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.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:
   - - ">="
@@ -448,6 +446,7 @@ test_files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/application_record.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
@@ -457,12 +456,11 @@ 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
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb

data/spec/dummy/config/initializers/assets.rb

@@ -1,8 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )