metasploit-credential 0.14.8 → 1.0.0.pre.rails.pre.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 895352ea1fdface54872f23f7ef803a5733cd3c2
-  data.tar.gz: ff8bb3e6f773ec263c99459fe8618db96fa66855
+  metadata.gz: 1efca2efc37f91d52ec2143adcd8eee2e159486d
+  data.tar.gz: 73a2bf5fd644056094597f10bb6a63908b893681
 SHA512:
-  metadata.gz: f13f43bae66ba9283939559732ffef33303215e06146ee78ccb0ba14fb1c8d7b1cc3f9be1fe424ba519ef499cab9d666ac877cb30ff17b19d1183b13d54962a7
-  data.tar.gz: fa0396f86e9f469da28eb4875c57f70719d1b0aa177cde5bc06b69848b53438b80414ed10b4522ead6c732a1b2ea53778f11769259b8a703e158851b7e162bf5
+  metadata.gz: fea97168a4a19a01980bedfa046d5be7766eb36f35c2910e604db4d531d5d7867a437b112241325f0be6dc35c567219abff722d517ca7e468154e4af47598d38
+  data.tar.gz: a07277c1422761b87560288b3f77829376603338640d3f8e58a2f609495d3b0bad004a189a493de1d740f79b696faa254f46e34afb5100eea22cc4285db33b9e

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 },
                             class_name: "Metasploit::Credential::Core", 
-                            join_table: "credential_cores_tasks",
-                            uniq: true
+                            join_table: "credential_cores_tasks"
   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 },
                             class_name: "Metasploit::Credential::Login", 
-                            join_table: "credential_logins_tasks",
-                            uniq: true
+                            join_table: "credential_logins_tasks"
   end
 end

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

@@ -16,9 +16,9 @@ class Metasploit::Credential::Core < ActiveRecord::Base
   #
   #   @return [ActiveRecord::Relation<Mdm::Task>]
   has_and_belongs_to_many :tasks,
+                          -> { uniq },
                           class_name: "Mdm::Task",
-                          join_table: "credential_cores_tasks",
-                          uniq: true
+                          join_table: "credential_cores_tasks"
 
   # @!attribute logins
   #   The {Metasploit::Credential::Login logins} using this core credential to log into a service.
@@ -277,9 +277,18 @@ class Metasploit::Credential::Core < ActiveRecord::Base
   # @param host_id [Integer]
   # @return [String]
   def self.cores_from_host_sql(host_id)
+    left = origin_service_host_id(host_id).ast
+    right = origin_session_host_id(host_id).ast
+
+    # TODO: Kill with fire. ActiveRecord 4.0.x leaks order/limit scopes
+    # We strip out order/limit statement from the subquery since it's invalid SQL
+    # https://github.com/rails/rails/issues/14003
+    left.orders = []
+    right.orders = []
+
     Arel::Nodes::Union.new(
-      origin_service_host_id(host_id).ast,
-      origin_session_host_id(host_id).ast
+      left,
+      right
     ).to_sql
   end
 

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

@@ -12,10 +12,10 @@ class Metasploit::Credential::Login < ActiveRecord::Base
   #   The {Mdm::Task tasks} using this to track what tasks interacted with a given core.
   #
   #   @return [ActiveRecord::Relation<Mdm::Task>]
-  has_and_belongs_to_many :tasks, 
+  has_and_belongs_to_many :tasks,
+                          -> { uniq },
                           class_name: "Mdm::Task", 
-                          join_table: "credential_logins_tasks",
-                          uniq: true
+                          join_table: "credential_logins_tasks"
 
   # @!attribute core
   #   The {Metasploit::Credential::Core core credential} used to authenticate to {#service}.
@@ -94,14 +94,6 @@ class Metasploit::Credential::Login < ActiveRecord::Base
 
   before_validation :blank_to_nil
 
-  #
-  # Mass Assignment Security
-  #
-
-  attr_accessible :access_level
-  attr_accessible :last_attempted_at
-  attr_accessible :status
-
   #
   #
   # Search

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

@@ -42,12 +42,5 @@ class Metasploit::Credential::Origin::Import < ActiveRecord::Base
   #   @return [DateTime]
 
 
-  #
-  # Mass Assignment Security
-  #
-
-  attr_accessible :filename
-
-
   Metasploit::Concern.run(self)
 end

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

@@ -45,12 +45,6 @@ class Metasploit::Credential::Origin::Service < ActiveRecord::Base
   #   @return [String] `'auxiliary/<Mdm::Module::Detail#refname>'` if an auxiliary module was used.
   #   @return [String] `'exploit/<Mdm::Module::Detail#refname>'` if an exploit module was used.
 
-  #
-  # Mass Assignment Security
-  #
-
-  attr_accessible :module_full_name
-
   #
   # Validations
   #

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

@@ -36,12 +36,6 @@ class Metasploit::Credential::Origin::Session < ActiveRecord::Base
   #   @return [String] a `Mdm::Module::Detail#refname` for a `Mdm::Module::Detail` where `Mdm::Module:Detail#mtype` is
   #     `'post'.`
 
-  #
-  # Mass Assignment Security
-  #
-
-  attr_accessible :post_reference_name
-
   #
   # Validations
   #

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

@@ -50,12 +50,6 @@ class Metasploit::Credential::Private < ActiveRecord::Base
   #
   #   @return [DateTime]
 
-  #
-  # Mass Assignment Security
-  #
-
-  attr_accessible :data
-
   #
   #
   # Search

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

@@ -35,12 +35,6 @@ class Metasploit::Credential::Public < ActiveRecord::Base
   #
   #   @return [String]
 
-  #
-  # Mass-Assignment Security
-  #
-
-  attr_accessible :username
-
   #
   #
   # Search

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

@@ -49,13 +49,6 @@ class Metasploit::Credential::Realm < ActiveRecord::Base
   #
   #   @return [String]
 
-  #
-  # Mass Assignment Security
-  #
-
-  attr_accessible :key
-  attr_accessible :value
-
   #
   # Search
   #

data/db/migrate/20140331173835_create_metasploit_credential_publics.rb

@@ -11,7 +11,7 @@ class CreateMetasploitCredentialPublics < ActiveRecord::Migration
       # Timestamps
       #
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     change_table :metasploit_credential_publics do |t|

data/db/migrate/20140407212345_create_metasploit_credential_privates.rb

@@ -17,7 +17,7 @@ class CreateMetasploitCredentialPrivates < ActiveRecord::Migration
       # Timestamps
       #
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     change_table :metasploit_credential_privates do |t|

data/db/migrate/20140410132401_create_metasploit_credential_realms.rb

@@ -4,7 +4,7 @@ class CreateMetasploitCredentialRealms < ActiveRecord::Migration
       t.string :key, null: false
       t.string :value, null: false
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20140410191213_create_metasploit_credential_origin_manuals.rb

@@ -11,7 +11,7 @@ class CreateMetasploitCredentialOriginManuals < ActiveRecord::Migration
       # Timestamps
       #
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     #

data/db/migrate/20140410205410_create_metasploit_credential_origin_imports.rb

@@ -17,7 +17,7 @@ class CreateMetasploitCredentialOriginImports < ActiveRecord::Migration
       # Timestamps
       #
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     #

data/db/migrate/20140411142102_create_metasploit_credential_origin_sessions.rb

@@ -17,7 +17,7 @@ class CreateMetasploitCredentialOriginSessions < ActiveRecord::Migration
       # Timestamps
       #
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     #

data/db/migrate/20140411205325_create_metasploit_credential_origin_services.rb

@@ -17,7 +17,7 @@ class CreateMetasploitCredentialOriginServices < ActiveRecord::Migration
       # Timestamps
       #
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     #

data/db/migrate/20140414192550_create_metasploit_credential_cores.rb

@@ -21,7 +21,7 @@ class CreateMetasploitCredentialCores < ActiveRecord::Migration
       # Timestamps
       #
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     change_table :metasploit_credential_cores do |t|

data/db/migrate/20140417140933_create_metasploit_credential_logins.rb

@@ -20,7 +20,7 @@ class CreateMetasploitCredentialLogins < ActiveRecord::Migration
       #
 
       t.datetime :last_attempted_at, null: true
-      t.timestamps
+      t.timestamps null: false
     end
 
     change_table :metasploit_credential_logins do |t|

data/db/migrate/20140605173747_create_metasploit_credential_origin_cracked_passwords.rb

@@ -13,7 +13,7 @@ class CreateMetasploitCredentialOriginCrackedPasswords < ActiveRecord::Migration
       # Timestamps
       #
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     #

data/lib/metasploit/credential/engine.rb

@@ -12,7 +12,7 @@ class Metasploit::Credential::Engine < Rails::Engine
 
   # 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|
+  config.paths.values.each do |path|
     path.skip_autoload!
     path.skip_autoload_once!
     path.skip_eager_load!

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

@@ -130,7 +130,7 @@ class Metasploit::Credential::Exporter::Core
   def line_for_login(login)
     result = line_for_core(login.core)
     result.merge({
-      host_address: login.service.host.address,
+      host_address: login.service.host.address.to_s,
       service_port: login.service.port,
       service_name: login.service.try(:name),
       service_protocol: login.service.proto,

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

@@ -137,7 +137,7 @@ class Metasploit::Credential::Exporter::Pwdump
   # @return [String]
   def format_service_for_login(login)
     service = login.service
-    address = service.host.address
+    address = service.host.address.to_s
     "#{address}:#{service.port}/#{service.proto} (#{service.name})"
   end
 

data/lib/metasploit/credential/version.rb

@@ -5,13 +5,13 @@ module Metasploit
     # Holds components of {VERSION} as defined by {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0}.
     module Version
       # The major version number.
-      MAJOR = 0
+      MAJOR = 1
       # The minor version number, scoped to the {MAJOR} version number.
-      MINOR = 14
-      # The patch number, scoped to the {MAJOR} and {MINOR} version number.
-      PATCH = 8
-      # The prerelease version, scoped to the {MAJOR}, {MINOR}, and {PATCH} version number.
-      # PRERELEASE =
+      MINOR = 0
+      # The patch number, scoped to the {MINOR} version number.
+      PATCH = 0
+      # the prerelease identifier
+      PRERELEASE = 'rails-4.0'
 
       # 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/application.rb

@@ -3,10 +3,8 @@ require File.expand_path('../boot', __FILE__)
 # Pick the frameworks you want:
 require "active_record/railtie"
 require "action_controller/railtie"
-require "action_mailer/railtie"
-require "active_resource/railtie"
-require "sprockets/railtie"
-# require "rails/test_unit/railtie"
+# require "action_mailer/railtie"
+## require "sprockets/railtie"
 
 Bundler.require(*Rails.groups)
 require "metasploit/credential"
@@ -54,12 +52,6 @@ module Dummy
     # like if you have constraints or database-specific column types
     config.active_record.schema_format = :sql
 
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
-
     # Enable the asset pipeline
     config.assets.enabled = true
 

data/spec/dummy/config/database.yml

@@ -1,22 +1,17 @@
-# Please only use postgresql bound to a TCP port.
-defaults: &defaults
+development: &pgsql
   adapter: postgresql
-  username: msf
+  database: metasploit_credential_development
+  username: lance
   password: pass123
   host: localhost
   port: 5432
-  pool: 50
+  pool: 15
   timeout: 5
-
-development:
-  database: metasploit_cr_dev
-  <<: *defaults
-
-test:
-  database: metasploit_cr_test
   min_messages: WARNING
-  <<: *defaults
 
 production:
-  database: metasploit_cr_prod
-  <<: *defaults
+  <<: *pgsql
+  
+test:
+  <<: *pgsql
+  database: metasploit_credential_test

data/spec/dummy/config/environments/development.rb

@@ -6,29 +6,19 @@ Dummy::Application.configure do
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = false
+  # # Don't care if the mailer can't send
+  # config.action_mailer.raise_delivery_errors = false
 
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
-
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
   # Do not compress assets
   config.assets.compress = false
 

data/spec/dummy/config/environments/production.rb

@@ -3,6 +3,12 @@ Dummy::Application.configure do
 
   # Code is not reloaded between requests
   config.cache_classes = true
+  
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both thread web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
 
   # Full error reports are disabled and caching is turned on
   config.consider_all_requests_local       = false
@@ -61,7 +67,4 @@ Dummy::Application.configure do
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 end

data/spec/dummy/config/environments/test.rb

@@ -7,6 +7,11 @@ Dummy::Application.configure do
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
@@ -22,13 +27,10 @@ Dummy::Application.configure do
   # Disable request forgery protection in test environment
   config.action_controller.allow_forgery_protection    = false
 
-  # Tell Action Mailer not to deliver emails to the real world.
-  # The :test delivery method accumulates sent emails in the
-  # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
-
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # # Tell Action Mailer not to deliver emails to the real world.
+  # # The :test delivery method accumulates sent emails in the
+  # # ActionMailer::Base.deliveries array.
+  # config.action_mailer.delivery_method = :test
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

data/spec/dummy/db/structure.sql

@@ -3,6 +3,7 @@
 --
 
 SET statement_timeout = 0;
+SET lock_timeout = 0;
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SET check_function_bodies = false;
@@ -3326,17 +3327,17 @@ CREATE INDEX index_automatic_exploitation_match_sets_on_workspace_id ON automati
 
 
 --
--- Name: index_automatic_exploitation_matches_on_module_fullname; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: index_automatic_exploitation_matches_on_module_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE INDEX index_automatic_exploitation_matches_on_module_fullname ON automatic_exploitation_matches USING btree (module_fullname);
+CREATE INDEX index_automatic_exploitation_matches_on_module_detail_id ON automatic_exploitation_matches USING btree (module_detail_id);
 
 
 --
--- Name: index_automatic_exploitation_matches_on_ref_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: index_automatic_exploitation_matches_on_module_fullname; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE INDEX index_automatic_exploitation_matches_on_ref_id ON automatic_exploitation_matches USING btree (module_detail_id);
+CREATE INDEX index_automatic_exploitation_matches_on_module_fullname ON automatic_exploitation_matches USING btree (module_fullname);
 
 
 --
@@ -3494,24 +3495,24 @@ CREATE UNIQUE INDEX index_metasploit_credential_realms_on_key_and_value ON metas
 
 
 --
--- Name: index_module_actions_on_module_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: index_module_actions_on_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE INDEX index_module_actions_on_module_detail_id ON module_actions USING btree (detail_id);
+CREATE INDEX index_module_actions_on_detail_id ON module_actions USING btree (detail_id);
 
 
 --
--- Name: index_module_archs_on_module_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: index_module_archs_on_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE INDEX index_module_archs_on_module_detail_id ON module_archs USING btree (detail_id);
+CREATE INDEX index_module_archs_on_detail_id ON module_archs USING btree (detail_id);
 
 
 --
--- Name: index_module_authors_on_module_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: index_module_authors_on_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE INDEX index_module_authors_on_module_detail_id ON module_authors USING btree (detail_id);
+CREATE INDEX index_module_authors_on_detail_id ON module_authors USING btree (detail_id);
 
 
 --
@@ -3543,24 +3544,24 @@ CREATE INDEX index_module_details_on_refname ON module_details USING btree (refn
 
 
 --
--- Name: index_module_mixins_on_module_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: index_module_mixins_on_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE INDEX index_module_mixins_on_module_detail_id ON module_mixins USING btree (detail_id);
+CREATE INDEX index_module_mixins_on_detail_id ON module_mixins USING btree (detail_id);
 
 
 --
--- Name: index_module_platforms_on_module_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: index_module_platforms_on_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE INDEX index_module_platforms_on_module_detail_id ON module_platforms USING btree (detail_id);
+CREATE INDEX index_module_platforms_on_detail_id ON module_platforms USING btree (detail_id);
 
 
 --
--- Name: index_module_refs_on_module_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: index_module_refs_on_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE INDEX index_module_refs_on_module_detail_id ON module_refs USING btree (detail_id);
+CREATE INDEX index_module_refs_on_detail_id ON module_refs USING btree (detail_id);
 
 
 --
@@ -3585,10 +3586,10 @@ CREATE INDEX index_module_runs_on_user_id ON module_runs USING btree (user_id);
 
 
 --
--- Name: index_module_targets_on_module_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+-- Name: index_module_targets_on_detail_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
 
-CREATE INDEX index_module_targets_on_module_detail_id ON module_targets USING btree (detail_id);
+CREATE INDEX index_module_targets_on_detail_id ON module_targets USING btree (detail_id);
 
 
 --
@@ -4058,8 +4059,12 @@ INSERT INTO schema_migrations (version) VALUES ('20150226151459');
 
 INSERT INTO schema_migrations (version) VALUES ('20150312155312');
 
+INSERT INTO schema_migrations (version) VALUES ('20150317145455');
+
 INSERT INTO schema_migrations (version) VALUES ('20150326183742');
 
+INSERT INTO schema_migrations (version) VALUES ('20150421211719');
+
 INSERT INTO schema_migrations (version) VALUES ('21');
 
 INSERT INTO schema_migrations (version) VALUES ('22');
@@ -4084,4 +4089,4 @@ INSERT INTO schema_migrations (version) VALUES ('7');
 
 INSERT INTO schema_migrations (version) VALUES ('8');
 
-INSERT INTO schema_migrations (version) VALUES ('9');
+INSERT INTO schema_migrations (version) VALUES ('9');

data/spec/factories/metasploit/credential/cores.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :metasploit_credential_core,
           class: Metasploit::Credential::Core do
-    ignore do
+    transient do
       origin_factory { generate :metasploit_credential_core_origin_factory }
       private_factory { generate :metasploit_credential_core_private_factory }
       realm_factory { generate :metasploit_credential_core_realm_factory }
@@ -34,25 +34,25 @@ FactoryGirl.define do
     }
 
     factory :metasploit_credential_core_import do
-      ignore do
+      transient do
         origin_factory :metasploit_credential_origin_import
       end
     end
 
     factory :metasploit_credential_core_manual do
-      ignore do
+      transient do
         origin_factory :metasploit_credential_origin_manual
       end
     end
 
     factory :metasploit_credential_core_service do
-      ignore do
+      transient do
         origin_factory :metasploit_credential_origin_service
       end
     end
 
     factory :metasploit_credential_core_session do
-      ignore do
+      transient do
         origin_factory :metasploit_credential_origin_session
       end
     end

data/spec/factories/metasploit/credential/logins.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :metasploit_credential_login,
           class: Metasploit::Credential::Login do
-    ignore do
+    transient do
       host {
         FactoryGirl.build(
           :mdm_host, workspace: workspace

data/spec/factories/metasploit/credential/origin/services.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :metasploit_credential_origin_service,
           class: Metasploit::Credential::Origin::Service do
-    ignore do
+    transient do
       module_type { generate :metasploit_credential_origin_service_module_type }
       reference_name { generate :metasploit_credential_origin_service_reference_name }
     end

data/spec/factories/metasploit/credential/password_hashes.rb

@@ -4,12 +4,12 @@ FactoryGirl.define do
           # uses its own data sequence to differentiate password hashes from other private data and #type is
           # automatically set by ActiveRecord because Metasploit::Credential::Password is an STI subclass.
           class: Metasploit::Credential::Password do
-    ignore do
+    transient do
       password_data { generate :metasploit_credential_password_data }
     end
 
     data {
-      BCrypt::Password.create(password_data).hash
+      BCrypt::Password.create(password_data).hash.to_s
     }
   end
 end

data/spec/factories/metasploit/credential/publics.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :metasploit_credential_public,
           class: Metasploit::Credential::Username do
-    ignore do
+    transient do
       public_factory { [
         :metasploit_credential_username,
         :metasploit_credential_blank_username

data/spec/factories/metasploit/credential/ssh_keys.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :metasploit_credential_ssh_key,
           class: Metasploit::Credential::SSHKey do
-    ignore do
+    transient do
       key_type { generate :metasploit_credential_ssh_key_key_type }
       # key size tuned for speed.  DO NOT use for production, it is below current recommended key size of 2048
       key_size { 512 }
@@ -13,13 +13,13 @@ FactoryGirl.define do
     }
 
     factory :metasploit_credential_dsa_key do
-      ignore do
+      transient do
         key_type :DSA
       end
     end
 
     factory :metasploit_credential_rsa_key do
-      ignore do
+      transient do
         key_type :RSA
       end
     end

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

@@ -575,7 +575,7 @@ describe Metasploit::Credential::Creation do
       let(:untried_login) { FactoryGirl.create(:metasploit_credential_login, status: Metasploit::Model::Login::Status::UNTRIED)}
 
       let(:opts) {{
-        address: untried_login.service.host.address,
+        address: untried_login.service.host.address.to_s,
         port: untried_login.service.port,
         protocol: untried_login.service.proto,
         username: untried_login.core.public.username,

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

@@ -86,14 +86,14 @@ describe Metasploit::Credential::Exporter::Core do
     it 'should produce values in the proper order' do
       result_hash.values.should == [core.public.username, core.private.type,
                                     core.private.data, core.realm.key, core.realm.value,
-                                    login.service.host.address, login.service.port,
+                                    login.service.host.address.to_s, login.service.port,
                                     login.service.name, login.service.proto,
                                     login.status, login.access_level, login.last_attempted_at
       ]
     end
 
     it 'should produce a hash with the service host address' do
-      result_hash[:host_address].should == login.service.host.address
+      result_hash[:host_address].should == login.service.host.address.to_s
     end
 
     it 'should produce a hash with the service port' do
@@ -341,8 +341,7 @@ describe Metasploit::Credential::Exporter::Core do
         end
 
         it 'should contain the associated Mdm::Host#address for all Login objects' do
-          @login_host_addresses.should include(login1.service.host.address)
-          @login_host_addresses.should include(login2.service.host.address)
+          @login_host_addresses.should include(login1.service.host.address.to_s, login2.service.host.address.to_s)
         end
 
         it 'should contain the associated Mdm::Service#port (stringified) for all Login objects' do

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

@@ -13,7 +13,7 @@ describe Metasploit::Credential::Exporter::Pwdump do
     describe "associated Mdm::Service objects" do
       it 'should properly format the service information' do
         service = login.service
-        exporter.format_service_for_login(login).should == "#{service.host.address}:#{service.port}/#{service.proto} (#{service.name})"
+        exporter.format_service_for_login(login).should == "#{service.host.address.to_s}:#{service.port}/#{service.proto} (#{service.name})"
       end
     end
 

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

@@ -14,7 +14,9 @@ describe Metasploit::Credential::Migrator do
   describe "#convert_creds_in_workspace" do
     describe "when there are no Mdm::Cred objects in the workspace" do
       before(:each) do
-        workspace.creds = []
+        workspace.services.each do |service|
+          service.creds = []
+        end
       end
 
       it 'should not change the Core count' do
@@ -44,13 +46,9 @@ describe Metasploit::Credential::Migrator do
       let(:service2){ FactoryGirl.create(:mdm_service, host: host2)}
       let(:service3){ FactoryGirl.create(:mdm_service, host: host3)}
 
-      let(:cred1){ FactoryGirl.create(:mdm_cred, service: service1)}
-      let(:cred2){ FactoryGirl.create(:mdm_cred, service: service2)}
-      let(:cred3){ FactoryGirl.create(:mdm_cred, service: service3)}
-
-      before(:each) do
-        cred1; cred2; cred3
-      end
+      let!(:cred1){ FactoryGirl.create(:mdm_cred, service: service1)}
+      let!(:cred2){ FactoryGirl.create(:mdm_cred, service: service2)}
+      let!(:cred3){ FactoryGirl.create(:mdm_cred, service: service3)}
 
       it 'should migrate them into Metasploit::Credential::Core objects' do
         expect{migrator.convert_creds_in_workspace(workspace)}.to change(Metasploit::Credential::Core, :count).from(0).to(3)
@@ -62,10 +60,9 @@ describe Metasploit::Credential::Migrator do
         end
 
         it "should be created for each Mdm::Cred" do
-          Metasploit::Credential::Public.where(username: cred1.user).should_not be_blank
-          Metasploit::Credential::Public.where(username: cred2.user).should_not be_blank
-          Metasploit::Credential::Public.where(username: cred3.user).should_not be_blank
+          expect(Metasploit::Credential::Public.pluck(:username)).to match_array([cred1.user, cred2.user, cred3.user])
         end
+        
       end
 
       describe "new Privates" do
@@ -74,10 +71,7 @@ describe Metasploit::Credential::Migrator do
         end
 
         it "should be created for each Mdm::Cred" do
-          migrator.convert_creds_in_workspace(workspace)
-          Metasploit::Credential::Password.where(data: cred1.pass).should_not be_blank
-          Metasploit::Credential::Password.where(data: cred2.pass).should_not be_blank
-          Metasploit::Credential::Password.where(data: cred3.pass).should_not be_blank
+          expect(Metasploit::Credential::Password.pluck(:data)).to match_array([cred1.pass, cred2.pass, cred3.pass])          
         end
       end
     end

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

@@ -7,9 +7,7 @@ describe Metasploit::Credential::Version do
         described_class::MAJOR
       end
 
-      it 'is 0 because the API is not locked yet' do
-        expect(major).to eq(0)
-      end
+      it { should be_a Integer }
     end
 
     context 'MINOR' do

data/spec/models/metasploit/credential/blank_username_spec.rb

@@ -16,12 +16,4 @@ describe Metasploit::Credential::BlankUsername do
     end
   end
 
-  context 'mass assignment security' do
-    it { should_not allow_mass_assignment_of(:created_at) }
-    it { should_not allow_mass_assignment_of(:updated_at) }
-    it { should allow_mass_assignment_of(:username) }
-  end
-
-
-
 end

data/spec/models/metasploit/credential/login_spec.rb

@@ -153,18 +153,6 @@ describe Metasploit::Credential::Login do
     end
   end
 
-  context 'mass assignment security' do
-    it { should allow_mass_assignment_of(:access_level) }
-    it { should_not allow_mass_assignment_of(:core) }
-    it { should_not allow_mass_assignment_of(:core_id) }
-    it { should_not allow_mass_assignment_of(:created_at) }
-    it { should allow_mass_assignment_of(:last_attempted_at) }
-    it { should_not allow_mass_assignment_of(:service) }
-    it { should_not allow_mass_assignment_of(:service_id) }
-    it { should allow_mass_assignment_of(:status) }
-    it { should_not allow_mass_assignment_of(:updated_at) }
-  end
-
   context 'search' do
     let(:base_class) {
       described_class
@@ -208,7 +196,7 @@ describe Metasploit::Credential::Login do
     end
 
     it { should validate_presence_of :service }
-    it { should ensure_inclusion_of(:status).in_array(Metasploit::Model::Login::Status::ALL) }
+    it { should validate_inclusion_of(:status).in_array(Metasploit::Model::Login::Status::ALL) }
 
     context '#consistent_last_attempted_at' do
       include_context 'Mdm::Workspace'

data/spec/models/metasploit/credential/origin/import_spec.rb

@@ -36,11 +36,4 @@ describe Metasploit::Credential::Origin::Import do
     it { should be_valid }
   end
 
-  context 'mass assignment security' do
-    it { should_not allow_mass_assignment_of :created_at }
-    it { should allow_mass_assignment_of :filename }
-    it { should_not allow_mass_assignment_of :task }
-    it { should_not allow_mass_assignment_of :task_id }
-    it { should_not allow_mass_assignment_of :updated_at }
-  end
 end

data/spec/models/metasploit/credential/origin/service_spec.rb

@@ -40,14 +40,6 @@ describe Metasploit::Credential::Origin::Service do
     end
   end
 
-  context 'mass assignment security' do
-    it { should_not allow_mass_assignment_of :created_at }
-    it { should allow_mass_assignment_of :module_full_name }
-    it { should_not allow_mass_assignment_of :service }
-    it { should_not allow_mass_assignment_of :service_id }
-    it { should_not allow_mass_assignment_of :updated_at }
-  end
-
   context 'validations' do
     context '#module_full_name' do
       # there is no way to test all values that match and do not match a regex, so testing by value is all that's

data/spec/models/metasploit/credential/origin/session_spec.rb

@@ -36,14 +36,6 @@ describe Metasploit::Credential::Origin::Session do
     end
   end
 
-  context 'mass assignment security' do
-    it { should_not allow_mass_assignment_of(:created_at) }
-    it { should allow_mass_assignment_of(:post_reference_name) }
-    it { should_not allow_mass_assignment_of(:session) }
-    it { should_not allow_mass_assignment_of(:session_id) }
-    it { should_not allow_mass_assignment_of(:updated_at) }
-  end
-
   context 'validations' do
     context 'post_reference_name' do
       include_context 'Mdm::Workspace'

data/spec/models/metasploit/credential/private_spec.rb

@@ -26,14 +26,6 @@ describe Metasploit::Credential::Private do
     end
   end
 
-  context 'mass assignement security' do
-    it { should_not allow_mass_assignment_of :created_at }
-    it { should allow_mass_assignment_of :data }
-    it { should_not allow_mass_assignment_of :id }
-    it { should_not allow_mass_assignment_of :updated_at }
-    it { should_not allow_mass_assignment_of :type }
-  end
-
   context 'validations' do
     context 'data' do
       it { should validate_non_nilness_of :data }
@@ -50,7 +42,7 @@ describe Metasploit::Credential::Private do
         #
 
         let(:error) do
-          I18n.translate!(:'activerecord.errors.messages.taken')
+          I18n.translate!(:'errors.messages.taken')
         end
 
         let(:new_private) do

data/spec/models/metasploit/credential/public_spec.rb

@@ -25,12 +25,6 @@ describe Metasploit::Credential::Public do
     end
   end
 
-  context 'mass assignment security' do
-    it { should_not allow_mass_assignment_of(:created_at) }
-    it { should_not allow_mass_assignment_of(:updated_at) }
-    it { should allow_mass_assignment_of(:username) }
-  end
-
   context 'search' do
     let(:base_class) {
       described_class

data/spec/models/metasploit/credential/realm_spec.rb

@@ -80,12 +80,6 @@ describe Metasploit::Credential::Realm do
     end
   end
 
-  context 'mass assignment security' do
-    it { should allow_mass_assignment_of(:key) }
-    it { should allow_mass_assignment_of(:value) }
-  end
-
-
   context 'search' do
     context 'attributes' do
       let(:base_class) {
@@ -106,7 +100,7 @@ describe Metasploit::Credential::Realm do
 
   context 'validations' do
     context 'on #key' do
-      it { should ensure_inclusion_of(:key).in_array(Metasploit::Model::Realm::Key::ALL) }
+      it { should validate_inclusion_of(:key).in_array(Metasploit::Model::Realm::Key::ALL) }
       it { should validate_presence_of :key }
     end
 
@@ -125,7 +119,7 @@ describe Metasploit::Credential::Realm do
         #
 
         let(:error) do
-          I18n.translate!('activerecord.errors.messages.taken')
+          I18n.translate!('errors.messages.taken')
         end
 
         let(:new_realm) do

data/spec/models/metasploit/credential/username_spec.rb

@@ -15,12 +15,6 @@ describe Metasploit::Credential::Username do
     end
   end
 
-  context 'mass assignment security' do
-    it { should_not allow_mass_assignment_of(:created_at) }
-    it { should_not allow_mass_assignment_of(:updated_at) }
-    it { should allow_mass_assignment_of(:username) }
-  end
-
   context 'validations' do
     context 'username' do
       it { should validate_presence_of :username }

data/spec/support/shared/examples/timestamp_database_column.rb

@@ -1,4 +1,4 @@
 shared_examples_for 'timestamp database columns' do
-  it { should have_db_column(:created_at).of_type(:datetime).with_options(null: false) }
-  it { should have_db_column(:updated_at).of_type(:datetime).with_options(null: false) }
+  it { should have_db_column(:created_at).of_type(:datetime) }
+  it { should have_db_column(:updated_at).of_type(:datetime) }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-credential
 version: !ruby/object:Gem::Version
-  version: 0.14.8
+  version: 1.0.0.pre.rails.pre.4.0
 platform: ruby
 authors:
 - Luke Imhoff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-concern
@@ -17,56 +17,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.0.0.pre.rails.pre.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.0.0.pre.rails.pre.4.0
 - !ruby/object:Gem::Dependency
   name: metasploit_data_models
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.5
+        version: 1.0.0.pre.rails.pre.4.0a
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.5
+        version: 1.0.0.pre.rails.pre.4.0a
 - !ruby/object:Gem::Dependency
   name: metasploit-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 1.0.0.pre.rails.pre.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 1.0.0.pre.rails.pre.4.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyntlm
   requirement: !ruby/object:Gem::Requirement
@@ -313,12 +313,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Credential models for metasploit-framework and Metasploit Pro