metasploit-credential 0.14.3 → 0.14.4

data/lib/metasploit/credential/engine.rb

@@ -1,35 +1,40 @@
 require 'rails'
 
-module Metasploit
-  module Credential
-    # Rails engine for Metasploit::Credential.  Will automatically be used if `Rails` is defined when
-    # 'metasploit/credential' is required, as should be the case in any normal Rails application Gemfile where
-    # gem 'rails' is the first gem in the Gemfile.
-    class Engine < Rails::Engine
-      # @see http://viget.com/extend/rails-engine-testing-with-rspec-capybara-and-factorygirl
-      config.generators do |g|
-        g.assets false
-        g.fixture_replacement :factory_girl, dir: 'spec/factories'
-        g.helper false
-        g.test_framework :rspec, fixture: false
-      end
+# Rails engine for Metasploit::Credential.
+class Metasploit::Credential::Engine < Rails::Engine
+  # @see http://viget.com/extend/rails-engine-testing-with-rspec-capybara-and-factorygirl
+  config.generators do |g|
+    g.assets false
+    g.fixture_replacement :factory_girl, dir: 'spec/factories'
+    g.helper false
+    g.test_framework :rspec, fixture: false
+  end
+
+  # Remove ActiveSupport::Dependencies loading paths to save time during constant resolution and to ensure that
+  # metasploit_data_models is properly declaring all autoloads and not falling back on ActiveSupport::Dependencies
+  config.paths.each_value do |path|
+    path.skip_autoload!
+    path.skip_autoload_once!
+    path.skip_eager_load!
+    path.skip_load_path!
+  end
 
-      config.paths.add 'app/concerns', autoload: true
-      config.paths.add 'lib', autoload: true
+  # metasploit-concern only works with ActiveSupport::Dependencies.autoloading because the extended class only
+  # knows about the concerns from the load hooks and so the extended class can't use Kernel.autoload to load the
+  # concerns.
+  config.paths.add 'app/concerns', autoload: true
 
-      initializer 'metasploit_credential.prepend_factory_path',
-                  # factory paths from the final Rails.application
-                  after: 'factory_girl.set_factory_paths',
-                  # before metasploit_data_models because it prepends
-                  before: 'metasploit_data_models.prepend_factory_path' do
-        if defined? FactoryGirl
-          relative_definition_file_path = config.generators.options[:factory_girl][:dir]
-          definition_file_path = root.join(relative_definition_file_path)
+  initializer 'metasploit_credential.prepend_factory_path',
+              # factory paths from the final Rails.application
+              after: 'factory_girl.set_factory_paths',
+              # before metasploit_data_models because it prepends
+              before: 'metasploit_data_models.prepend_factory_path' do
+    if defined? FactoryGirl
+      relative_definition_file_path = config.generators.options[:factory_girl][:dir]
+      definition_file_path = root.join(relative_definition_file_path)
 
-          # unshift so that projects that use metasploit-credential can modify metasploit_credential_* factories
-          FactoryGirl.definition_file_paths.unshift definition_file_path
-        end
-      end
+      # unshift so that projects that use metasploit-credential can modify metasploit_credential_* factories
+      FactoryGirl.definition_file_paths.unshift definition_file_path
     end
   end
 end

data/lib/metasploit/credential/exporter.rb

@@ -4,5 +4,6 @@ module Metasploit::Credential::Exporter
   extend ActiveSupport::Autoload
 
   autoload :Base
+  autoload :Core
   autoload :Pwdump
 end

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

@@ -1,42 +1,34 @@
-module Metasploit
-  module Credential
-    module Exporter
-      # Defines attributes common to allow exporters.
-      module Base
-        extend ActiveSupport::Concern
-
-        included do
-          include ActiveModel::Validations
-
-          # @!attribute data
-          #   A {Hash} that holds the credentials data to be exported.
-          #   @return [Hash]
-          attr_accessor :data
-
-          # @!attribute output
-          #   An {IO} that holds the exported data. {File} in normal usage.
-          #   @return [IO]
-          attr_accessor :output
-
-          # @!attribute workspace
-          #   The {Mdm::Workspace} that the credentials will be exported from
-          #   @return[Mdm::Workspace]
-          attr_accessor :workspace
-        end
-
-
-        #
-        # Instance Methods
-        #
+# Defines attributes common to allow exporters.
+module Metasploit::Credential::Exporter::Base
+  extend ActiveSupport::Concern
+
+  included do
+    include ActiveModel::Validations
+
+    # @!attribute data
+    #   A {Hash} that holds the credentials data to be exported.
+    #   @return [Hash]
+    attr_accessor :data
+
+    # @!attribute output
+    #   An {IO} that holds the exported data. {File} in normal usage.
+    #   @return [IO]
+    attr_accessor :output
+
+    # @!attribute workspace
+    #   The {Mdm::Workspace} that the credentials will be exported from
+    #   @return[Mdm::Workspace]
+    attr_accessor :workspace
+  end
 
-        # @param attributes [Hash{Symbol => String,nil}]
-        def initialize(attributes={})
-          attributes.each do |attribute, value|
-            public_send("#{attribute}=", value)
-          end
-        end
+  #
+  # Instance Methods
+  #
 
-      end
+  # @param attributes [Hash{Symbol => String,nil}]
+  def initialize(attributes={})
+    attributes.each do |attribute, value|
+      public_send("#{attribute}=", value)
     end
   end
 end

data/lib/metasploit/credential/importer.rb

@@ -6,6 +6,7 @@ module Metasploit::Credential::Importer
   autoload :Base
   autoload :Core
   autoload :MsfPwdump
-  autoload :Zip
   autoload :Multi
+  autoload :Pwdump
+  autoload :Zip
 end

data/lib/metasploit/credential/importer/base.rb

@@ -1,77 +1,70 @@
-module Metasploit
-  module Credential
-    module Importer
-      # Defines common attributes and helpers for all importers.
-      module Base
-        extend ActiveSupport::Concern
+# Defines common attributes and helpers for all importers.
+module Metasploit::Credential::Importer::Base
+  extend ActiveSupport::Concern
 
-        #
-        # Constants
-        #
+  #
+  # Constants
+  #
 
-        # Whitelist of the {Metasploit::Credential::Private} subclass names allowed
-        # in long-form CSV imports.
-        LONG_FORM_ALLOWED_PRIVATE_TYPE_NAMES = [
-                                      Metasploit::Credential::NonreplayableHash,
-                                      Metasploit::Credential::NTLMHash,
-                                      Metasploit::Credential::Password,
-                                      Metasploit::Credential::PostgresMD5,
-                                      Metasploit::Credential::SSHKey].map(&:name)
+  # Whitelist of the {Metasploit::Credential::Private} subclass names allowed
+  # in long-form CSV imports.
+  LONG_FORM_ALLOWED_PRIVATE_TYPE_NAMES = [
+      Metasploit::Credential::NonreplayableHash,
+      Metasploit::Credential::NTLMHash,
+      Metasploit::Credential::Password,
+      Metasploit::Credential::PostgresMD5,
+      Metasploit::Credential::SSHKey].map(&:name)
 
 
-        # Whitelist of the {Metasploit::Credential::Private} subclass names allowed
-        # in short-form CSV imports.
-        SHORT_FORM_ALLOWED_PRIVATE_TYPE_NAMES = [
-                                      Metasploit::Credential::NonreplayableHash,
-                                      Metasploit::Credential::NTLMHash,
-                                      Metasploit::Credential::Password,
-                                      Metasploit::Credential::PostgresMD5].map(&:name)
+  # Whitelist of the {Metasploit::Credential::Private} subclass names allowed
+  # in short-form CSV imports.
+  SHORT_FORM_ALLOWED_PRIVATE_TYPE_NAMES = [
+      Metasploit::Credential::NonreplayableHash,
+      Metasploit::Credential::NTLMHash,
+      Metasploit::Credential::Password,
+      Metasploit::Credential::PostgresMD5].map(&:name)
 
-        included do
-          include ActiveModel::Validations
+  included do
+    include ActiveModel::Validations
 
-          # @!attribute filename
-          #   The name of the file that is being imported
-          #   @return [String]
-          attr_accessor :filename
+    # @!attribute filename
+    #   The name of the file that is being imported
+    #   @return [String]
+    attr_accessor :filename
 
-          # @!attribute input
-          #   An {IO} that holds the import data. {File} in normal usage, {StringIO} in testing
-          #   @return [IO]
-          attr_accessor :input
+    # @!attribute input
+    #   An {IO} that holds the import data. {File} in normal usage, {StringIO} in testing
+    #   @return [IO]
+    attr_accessor :input
 
-          # @!attribute origin
-          #   An {Metasploit::Credential::Origin} that represents the discrete
-          #   importation of this set of credential objects
-          #   @return [Metasploit::Credential::Origin::Import]
-          attr_accessor :origin
+    # @!attribute origin
+    #   An {Metasploit::Credential::Origin} that represents the discrete
+    #   importation of this set of credential objects
+    #   @return [Metasploit::Credential::Origin::Import]
+    attr_accessor :origin
 
-          # @!attribute workspace
-          #   The {Mdm::Workspace} that the credentials will be imported into
-          #   @return[Mdm::Workspace]
-          attr_accessor :workspace
+    # @!attribute workspace
+    #   The {Mdm::Workspace} that the credentials will be imported into
+    #   @return[Mdm::Workspace]
+    attr_accessor :workspace
 
-          #
-          # Validations
-          #
-
-          validates :origin, presence: true
-          validates :input, presence: true
-        end
+    #
+    # Validations
+    #
 
+    validates :origin, presence: true
+    validates :input, presence: true
+  end
 
-        #
-        # Instance Methods
-        #
 
-        # @param attributes [Hash{Symbol => String,nil}]
-        def initialize(attributes={})
-          attributes.each do |attribute, value|
-            public_send("#{attribute}=", value)
-          end
-        end
+  #
+  # Instance Methods
+  #
 
-      end
+  # @param attributes [Hash{Symbol => String,nil}]
+  def initialize(attributes={})
+    attributes.each do |attribute, value|
+      public_send("#{attribute}=", value)
     end
   end
-end
+end

data/lib/metasploit/credential/origin.rb

@@ -1,5 +1,13 @@
 # Namespace for `Metasploit::Credential::Core#origin`s for `Metasploit::Credential::Core`s.
 module Metasploit::Credential::Origin
+  extend ActiveSupport::Autoload
+
+  autoload :CrackedPassword
+  autoload :Import
+  autoload :Manual
+  autoload :Service
+  autoload :Session
+
   # The prefix for table name of `ActiveRecord::Base` subclasses in the namespace.
   #
   # @return [String] `'metasploit_credential_origin_'`

data/lib/metasploit/credential/search.rb

@@ -0,0 +1,8 @@
+# Namespace for {Metasploit::Credential} custom {Metasploit::Credential::Search::Operation operations} and
+# {Metasploit::Credential::Search::Operator operators}.
+module Metasploit::Credential::Search
+  extend ActiveSupport::Autoload
+
+  autoload :Operation
+  autoload :Operator
+end

data/lib/metasploit/credential/search/operation.rb

@@ -0,0 +1,6 @@
+# Namespace for search operations specific to {Metasploit::Credential}.
+module Metasploit::Credential::Search::Operation
+  extend ActiveSupport::Autoload
+
+  autoload :Type
+end

data/lib/metasploit/credential/search/operator.rb

@@ -0,0 +1,6 @@
+# Namespace for search operators specific to {Metasploit::Credential}.
+module Metasploit::Credential::Search::Operator
+  extend ActiveSupport::Autoload
+
+  autoload :Type
+end

data/lib/metasploit/credential/version.rb

@@ -1,3 +1,5 @@
+# @note Must use nested module as `metasploit/credential/version` is used in `metasploit-credential.gemspec` before
+#   `metasploit/credential` itself is expected to be loaded.
 module Metasploit
   module Credential
     # Holds components of {VERSION} as defined by {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0}.
@@ -6,8 +8,8 @@ module Metasploit
       MAJOR = 0
       # The minor version number, scoped to the {MAJOR} version number.
       MINOR = 14
-      # The patch number, scoped to the {MINOR} version number.
-      PATCH = 3
+      # The patch number, scoped to the {MAJOR} and {MINOR} version number.
+      PATCH = 4
 
       # The full version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the {PRERELEASE} in the
       # {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0} format.

data/spec/dummy/config/database.yml

@@ -1,22 +1,20 @@
 # Please only use postgresql bound to a TCP port.
-defaults: &defaults
+development: &pgsql
   adapter: postgresql
+  database: metasploit_credential_development
   username: msf
-  password: pass123
+  password: p4ssw0rd4lyfe
   host: localhost
   port: 5432
-  pool: 50
+  pool: 5
   timeout: 5
 
-development:
-  database: metasploit_cr_dev
-  <<: *defaults
-
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+#
+# Note also, sqlite3 is totally unsupported by Metasploit now.
 test:
-  database: metasploit_cr_test
-  min_messages: WARNING
-  <<: *defaults
+  <<: *pgsql
+  database: metasploit_credential_test
 
-production:
-  database: metasploit_cr_prod
-  <<: *defaults

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-credential
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.14.4
 platform: ruby
 authors:
 - Luke Imhoff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-concern
@@ -192,6 +192,9 @@ files:
 - lib/metasploit/credential/importer/zip.rb
 - lib/metasploit/credential/migrator.rb
 - lib/metasploit/credential/origin.rb
+- lib/metasploit/credential/search.rb
+- lib/metasploit/credential/search/operation.rb
+- lib/metasploit/credential/search/operator.rb
 - lib/metasploit/credential/text.rb
 - lib/metasploit/credential/version.rb
 - lib/tasks/databases.rake
@@ -300,6 +303,8 @@ metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
+- app/models
+- app/validators
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements: