metasploit-credential 1.0.1 → 1.1.0

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

@@ -65,7 +65,7 @@ RSpec.describe Metasploit::Credential::Private, type: :model do
         # Callbacks
         #
 
-        before(:each) do
+        before(:example) do
           new_private.valid?
         end
 
@@ -87,7 +87,7 @@ RSpec.describe Metasploit::Credential::Private, type: :model do
               FactoryGirl.generate :metasploit_credential_private_type
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
         end
 
@@ -101,7 +101,7 @@ RSpec.describe Metasploit::Credential::Private, type: :model do
               existent_private.type
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
 
           context 'without same #type' do
@@ -109,7 +109,7 @@ RSpec.describe Metasploit::Credential::Private, type: :model do
               FactoryGirl.generate :metasploit_credential_private_type
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
         end
       end

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

@@ -142,7 +142,7 @@ RSpec.describe Metasploit::Credential::Realm, type: :model do
         # Callback
         #
 
-        before(:each) do
+        before(:example) do
           new_realm.valid?
         end
 
@@ -164,7 +164,7 @@ RSpec.describe Metasploit::Credential::Realm, type: :model do
               FactoryGirl.generate :metasploit_credential_realm_value
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
         end
 
@@ -178,7 +178,7 @@ RSpec.describe Metasploit::Credential::Realm, type: :model do
               existent_realm.value
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
 
           context 'without same #value' do
@@ -186,7 +186,7 @@ RSpec.describe Metasploit::Credential::Realm, type: :model do
               FactoryGirl.generate :metasploit_credential_realm_value
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
         end
       end

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

@@ -71,7 +71,7 @@ RSpec.describe Metasploit::Credential::SSHKey, type: :model do
         # Callbacks
         #
 
-        before(:each) do
+        before(:example) do
           expect(ssh_key).to receive(:private?).and_return(private)
 
           ssh_key.valid?
@@ -82,7 +82,7 @@ RSpec.describe Metasploit::Credential::SSHKey, type: :model do
             true
           end
 
-          it { should_not include(error) }
+          it { is_expected.not_to include(error) }
         end
 
         context 'without #private?' do
@@ -126,7 +126,7 @@ RSpec.describe Metasploit::Credential::SSHKey, type: :model do
             # Callbacks
             #
 
-            before(:each) do
+            before(:example) do
               expect(ssh_key).to receive(:openssl_pkey_pkey).and_raise(exception)
 
               ssh_key.valid?
@@ -150,7 +150,7 @@ RSpec.describe Metasploit::Credential::SSHKey, type: :model do
           end
 
           context 'without error' do
-            before(:each) do
+            before(:example) do
               ssh_key.valid?
             end
 
@@ -167,7 +167,7 @@ RSpec.describe Metasploit::Credential::SSHKey, type: :model do
           # Callbacks
           #
 
-          before(:each) do
+          before(:example) do
             ssh_key.data = nil
 
             ssh_key.valid?
@@ -190,7 +190,7 @@ RSpec.describe Metasploit::Credential::SSHKey, type: :model do
         # Callbacks
         #
 
-        before(:each) do
+        before(:example) do
           expect(ssh_key).to receive(:encrypted?).and_return(encrypted)
 
           ssh_key.valid?
@@ -209,7 +209,7 @@ RSpec.describe Metasploit::Credential::SSHKey, type: :model do
             false
           end
 
-          it { should_not include(error) }
+          it { is_expected.not_to include(error) }
         end
       end
     end
@@ -261,7 +261,7 @@ RSpec.describe Metasploit::Credential::SSHKey, type: :model do
               unencrypted_key.to_pem
             end
 
-            it { should_not be_encrypted }
+            it { is_expected.not_to be_encrypted }
           end
         end
       end
@@ -275,7 +275,7 @@ RSpec.describe Metasploit::Credential::SSHKey, type: :model do
         nil
       end
 
-      it { should_not be_encrypted }
+      it { is_expected.not_to be_encrypted }
     end
   end
 
@@ -409,7 +409,7 @@ RSpec.describe Metasploit::Credential::SSHKey, type: :model do
               private_key.public_key
             end
 
-            it { should_not be_private }
+            it { is_expected.not_to be_private }
           end
 
           context 'with private' do
@@ -431,7 +431,7 @@ RSpec.describe Metasploit::Credential::SSHKey, type: :model do
         nil
       end
 
-      it { should_not be_private }
+      it { is_expected.not_to be_private }
     end
   end
 

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

@@ -15,6 +15,7 @@ RSpec.describe Metasploit::Credential::Username, type: :model do
 
   context 'validations' do
     context 'username' do
+      subject { FactoryGirl.build(:metasploit_credential_username) }
       it { is_expected.to validate_presence_of :username }
       it { is_expected.to validate_uniqueness_of :username }
     end

data/spec/spec_helper.rb

@@ -26,12 +26,7 @@ require 'rspec/rails'
 # in spec/support/ and its subdirectories from this gem and metasploit-concern
 #
 
-
-# Use find_all_by_name instead of find_by_name as find_all_by_name will return pre-release versions
-gem_specification = Gem::Specification.find_all_by_name('metasploit-version').first
-
 roots = [
-    gem_specification.gem_dir,
     Metasploit::Concern.root,
     Metasploit::Credential::Engine.root,
     Metasploit::Model::Engine.root,
@@ -44,6 +39,14 @@ roots.each do |root|
   end
 end
 
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :rspec
+    with.library :rails
+  end
+end
+
+
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
@@ -136,4 +139,24 @@ RSpec.configure do |config|
   # examples within a transaction, remove the following line or assign false
   # instead of true.
   config.use_transactional_fixtures = true
+
+  # rspec-rails 3 will no longer automatically infer an example group's spec type
+  # from the file location. You can explicitly opt-in to the feature using this
+  # config option.
+  # To explicitly tag specs without using automatic inference, set the `:type`
+  # metadata manually:
+  #
+  #     describe ThingsController, :type => :controller do
+  #       # Equivalent to being in spec/controllers
+  #     end
+  config.infer_spec_type_from_file_location!
+
+  # Setting this config option `false` removes rspec-core's monkey patching of the
+  # top level methods like `describe`, `shared_examples_for` and `shared_context`
+  # on `main` and `Module`. The methods are always available through the `RSpec`
+  # module like `RSpec.describe` regardless of this setting.
+  # For backwards compatibility this defaults to `true`.
+  #
+  # https://relishapp.com/rspec/rspec-core/v/3-0/docs/configuration/global-namespace-dsl
+  config.expose_dsl_globally = false
 end

data/spec/support/shared/contexts/mdm/workspace.rb

@@ -1,5 +1,5 @@
-shared_context 'Mdm::Workspace' do
-  before(:each) do
+RSpec.shared_context 'Mdm::Workspace' do
+  before(:example) do
     # TODO remove Rex usage from Mdm as it is not a declared dependency
     allow_any_instance_of(Mdm::Workspace).to receive(:valid_ip_or_range?).and_return(true)
   end

data/spec/support/shared/contexts/metasploit/credential/exporter/export_objects.rb

@@ -1,5 +1,5 @@
 # Provides object graph for performing exports
-shared_context 'export objects' do
+RSpec.shared_context 'export objects' do
   #
   # Basics for testing export object itself
   #

data/spec/support/shared/contexts/metasploit/credential/importer/zip/file.rb

@@ -1,4 +1,4 @@
-shared_context 'metasploit_credential_importer_zip_file' do
+RSpec.shared_context 'metasploit_credential_importer_zip_file' do
   #
   # Methods
   #
@@ -15,12 +15,12 @@ shared_context 'metasploit_credential_importer_zip_file' do
   #
 
   # Clean up leftovers from aborted spec runs.
-  before(:each) do
+  before(:example) do
     remove_metasploit_credential_importer_zip_files
   end
 
   # Clean up after completed spec runs.
-  after(:each) do
+  after(:example) do
     remove_metasploit_credential_importer_zip_files
   end
 end

data/spec/support/shared/contexts/metasploit/credential/search/operation/type.rb

@@ -1,4 +1,4 @@
-shared_examples_for 'Metasploit::Credential::Search::Operation::Type' do |options={}|
+RSpec.shared_examples_for 'Metasploit::Credential::Search::Operation::Type' do |options={}|
   options.assert_valid_keys(:attribute, :matching_class)
 
   attribute = options.fetch(:attribute, :type)

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

@@ -1,4 +1,4 @@
-shared_examples_for 'Metasploit::Credential::CoreValidations' do
+RSpec.shared_examples_for 'Metasploit::Credential::CoreValidations' do
 
   #
   # Context Methods

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

@@ -1,4 +1,4 @@
-shared_examples_for 'single table inheritance database columns' do
+RSpec.shared_examples_for 'single table inheritance database columns' do
   it { is_expected.to have_db_column(:id).of_type(:integer).with_options(null: false) }
   it { is_expected.to have_db_column(:type).of_type(:string).with_options(null: false) }
 end

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

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

metadata

@@ -1,72 +1,135 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-credential
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Luke Imhoff
 - Trevor Rosen
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
+  A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+  b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
+  MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+  YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
+  aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
+  jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
+  xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
+  1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
+  snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
+  U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
+  9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
+  BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
+  AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
+  yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
+  38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
+  AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
+  DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
+  HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+  -----END CERTIFICATE-----
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEKDCCAxCgAwIBAgILBAAAAAABL07hNVwwDQYJKoZIhvcNAQEFBQAwVzELMAkG
+  A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+  b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw0xMTA0MTMxMDAw
+  MDBaFw0xOTA0MTMxMDAwMDBaMFExCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+  YWxTaWduIG52LXNhMScwJQYDVQQDEx5HbG9iYWxTaWduIENvZGVTaWduaW5nIENB
+  IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyTxTnEL7XJnKr
+  NpfvU79ChF5Y0Yoo/ENGb34oRFALdV0A1zwKRJ4gaqT3RUo3YKNuPxL6bfq2RsNq
+  o7gMJygCVyjRUPdhOVW4w+ElhlI8vwUd17Oa+JokMUnVoqni05GrPjxz7/Yp8cg1
+  0DB7f06SpQaPh+LO9cFjZqwYaSrBXrta6G6V/zuAYp2Zx8cvZtX9YhqCVVrG+kB3
+  jskwPBvw8jW4bFmc/enWyrRAHvcEytFnqXTjpQhU2YM1O46MIwx1tt6GSp4aPgpQ
+  STic0qiQv5j6yIwrJxF+KvvO3qmuOJMi+qbs+1xhdsNE1swMfi9tBoCidEC7tx/0
+  O9dzVB/zAgMBAAGjgfowgfcwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
+  Af8CAQAwHQYDVR0OBBYEFAhu2Lacir/tPtfDdF3MgB+oL1B6MEcGA1UdIARAMD4w
+  PAYEVR0gADA0MDIGCCsGAQUFBwIBFiZodHRwczovL3d3dy5nbG9iYWxzaWduLmNv
+  bS9yZXBvc2l0b3J5LzAzBgNVHR8ELDAqMCigJqAkhiJodHRwOi8vY3JsLmdsb2Jh
+  bHNpZ24ubmV0L3Jvb3QuY3JsMBMGA1UdJQQMMAoGCCsGAQUFBwMDMB8GA1UdIwQY
+  MBaAFGB7ZhpFDZfKiVAvfQTNNKj//P1LMA0GCSqGSIb3DQEBBQUAA4IBAQAiXMXd
+  PfQLcNjj9efFjgkBu7GWNlxaB63HqERJUSV6rg2kGTuSnM+5Qia7O2yX58fOEW1o
+  kdqNbfFTTVQ4jGHzyIJ2ab6BMgsxw2zJniAKWC/wSP5+SAeq10NYlHNUBDGpeA07
+  jLBwwT1+170vKsPi9Y8MkNxrpci+aF5dbfh40r5JlR4VeAiR+zTIvoStvODG3Rjb
+  88rwe8IUPBi4A7qVPiEeP2Bpen9qA56NSvnwKCwwhF7sJnJCsW3LZMMSjNaES2dB
+  fLEDF3gJ462otpYtpH6AA0+I98FrWkYVzSwZi9hwnOUtSYhgcqikGVJwQ17a1kYD
+  sGgOJO9K9gslJO8k
+  -----END CERTIFICATE-----
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEyjCCA7KgAwIBAgISESEyE8rNriS4+1dc8jOHEUL8MA0GCSqGSIb3DQEBBQUA
+  MFExCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMScwJQYD
+  VQQDEx5HbG9iYWxTaWduIENvZGVTaWduaW5nIENBIC0gRzIwHhcNMTMxMDExMTUx
+  NTM4WhcNMTYxMDExMTUxNTM4WjBgMQswCQYDVQQGEwJVUzEWMBQGA1UECBMNTWFz
+  c2FjaHVzZXR0czEPMA0GA1UEBxMGQm9zdG9uMRMwEQYDVQQKEwpSYXBpZDcgTExD
+  MRMwEQYDVQQDEwpSYXBpZDcgTExDMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+  CgKCAQEAhD//7+739c69hssg0mD6CXgf2JkuWTcU81dgD7aKcoEPqU8e1FseBvDW
+  /Q5fNK2H2NgHV/Msn18zXuK0PkaJXqj/vDsuKB3Hq0BiR2AwyDdEw8K5MK5bgQc2
+  tmcVtEAejRoy1Uv5UyfaAYAxG6zsma3buV1fjnEAC3VouRg4+EX/f65H/a6srntK
+  5Etp3D71k2f0oUl8dOqOmSsRJQQ5zSs4ktDvpjAmsvzoA+1svceLYU95mvQsIw2T
+  edpmibGMwGw/HmgV+YWBgF5UGvax6zbC2i6DF2YHnDfkNb8/1MEIaxOTAbJTazTK
+  8laCQOyay6L1BNPQKjZBgOge8LZq1wIDAQABo4IBizCCAYcwDgYDVR0PAQH/BAQD
+  AgeAMEwGA1UdIARFMEMwQQYJKwYBBAGgMgEyMDQwMgYIKwYBBQUHAgEWJmh0dHBz
+  Oi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMAkGA1UdEwQCMAAwEwYD
+  VR0lBAwwCgYIKwYBBQUHAwMwPgYDVR0fBDcwNTAzoDGgL4YtaHR0cDovL2NybC5n
+  bG9iYWxzaWduLmNvbS9ncy9nc2NvZGVzaWduZzIuY3JsMIGGBggrBgEFBQcBAQR6
+  MHgwQAYIKwYBBQUHMAKGNGh0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5jb20vY2Fj
+  ZXJ0L2dzY29kZXNpZ25nMi5jcnQwNAYIKwYBBQUHMAGGKGh0dHA6Ly9vY3NwMi5n
+  bG9iYWxzaWduLmNvbS9nc2NvZGVzaWduZzIwHQYDVR0OBBYEFE536JwFx9SpaEi3
+  w8pcq2GRFA5BMB8GA1UdIwQYMBaAFAhu2Lacir/tPtfDdF3MgB+oL1B6MA0GCSqG
+  SIb3DQEBBQUAA4IBAQAGpGXHtFLjTTivV+xQPwtZhfPuJ7f+VGTMSAAYWmfzyHXM
+  YMFYUWJzSFcuVR2YfxtbS45P7U5Qopd7jBQ0Ygk5h2a+B5nE4+UlhHj665d0zpYM
+  1eWndMaO6WBOYnqtNyi8Dqqc1foKZDNHEDggYhGso7OIBunup+N4sPL9PwQ3eYe6
+  mUu8z0E4GXYViaMPOFkqaYnoYgf2L+7L5zKYT4h/NE/P7kj7EbduHgy/v/aAIrNl
+  2SpuQH+SWteq3NXkAmFEEqvLJQ4sbptZt8OP8ghL3pVAvZNFmww/YVszSkShSzcg
+  QdihYCSEL2drS2cFd50jBeq71sxUtxbv82DUa2b+
+  -----END CERTIFICATE-----
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: metasploit-version
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: metasploit-concern
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: metasploit_data_models
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: metasploit-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -273,7 +336,6 @@ files:
 - spec/lib/metasploit/credential/importer/pwdump_spec.rb
 - spec/lib/metasploit/credential/importer/zip_spec.rb
 - spec/lib/metasploit/credential/migrator_spec.rb
-- spec/lib/metasploit/credential/version_spec.rb
 - spec/lib/metasploit/credential_spec.rb
 - spec/models/mdm/service_spec.rb
 - spec/models/mdm/session_spec.rb
@@ -332,7 +394,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Credential models for metasploit-framework and Metasploit Pro
@@ -397,7 +459,6 @@ test_files:
 - spec/lib/metasploit/credential/importer/pwdump_spec.rb
 - spec/lib/metasploit/credential/importer/zip_spec.rb
 - spec/lib/metasploit/credential/migrator_spec.rb
-- spec/lib/metasploit/credential/version_spec.rb
 - spec/lib/metasploit/credential_spec.rb
 - spec/models/mdm/service_spec.rb
 - spec/models/mdm/session_spec.rb