metasploit-credential 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebc112c987170f24341030c7376260c0404fbba9
-  data.tar.gz: b60d6f5382ce35a86eaf3a5b5be0c4cff748102b
+  metadata.gz: a90760c4188d3ce6e1bd95b802e0376b71ed9ad8
+  data.tar.gz: c97d418f43a8f720e24842789ba4b6d0ca7940f9
 SHA512:
-  metadata.gz: 7b0f38e6cbeab4bca929efe31bd84dcebfa70009638a8fbc6ffb553eb39065f6ec81c6761315c4e4c35252023163305d58e537929baf74d9b6f178608405e439
-  data.tar.gz: 159a68c09d71add5c60a69fa7d1f8f79cbafb9e4507a8830f9fe232253ad4e388a8ace3d880a3a96377f5de3add255a99670ac65e0f30a167edad85b9041df2b
+  metadata.gz: a6ee036a556e2f76bc544f0744a2e1bf20e8b90ac51b62c3828d16dc818012d7377e7a00b956e452fe5eb15f475305fdb00c57f0857bef54928e69a109b72b29
+  data.tar.gz: 1296775fd735c71e1997bf5a115a2b97edd498214db11ba5d8a0225e8f0c4ea2f00d8765dd2b511b47fea478bd5fe8f2bfae496b35776b1c81e5d26fbd14d424

data/lib/metasploit/credential/version.rb

@@ -2,59 +2,16 @@
 #   `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}.
-    module Version
-      #
-      # CONSTANTS
-      #
-
-      # The major version number.
-      MAJOR = 1
-      # The minor version number, scoped to the {MAJOR} version number.
-      MINOR = 0
-      # The patch version number, scoped to the {MAJOR} and {MINOR} version numbers.
-      PATCH = 1
-
-      #
-      # Module Methods
-      #
-
-      # The full version string, including the {Metasploit::Credential::Version::MAJOR},
-      # {Metasploit::Credential::Version::MINOR}, {Metasploit::Credential::Version::PATCH}, and optionally, the
-      # `Metasploit::Credential::Version::PRERELEASE` in the
-      # {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0} format.
-      #
-      # @return [String] '{Metasploit::Credential::Version::MAJOR}.{Metasploit::Credential::Version::MINOR}.{Metasploit::Credential::Version::PATCH}'
-      #   on master.
-      #   '{Metasploit::Credential::Version::MAJOR}.{Metasploit::Credential::Version::MINOR}.{Metasploit::Credential::Version::PATCH}-PRERELEASE'
-      #   on any branch other than master.
-      def self.full
-        version = "#{MAJOR}.#{MINOR}.#{PATCH}"
-
-        if defined? PRERELEASE
-          version = "#{version}-#{PRERELEASE}"
-        end
-
-        version
-      end
-
-      # The full gem version string, including the {Metasploit::Credential::Version::MAJOR},
-      # {Metasploit::Credential::Version::MINOR}, {Metasploit::Credential::Version::PATCH}, and optionally, the
-      # `Metasploit::Credential::Version::PRERELEASE` in the
-      # {http://guides.rubygems.org/specification-reference/#version RubyGems versioning} format.
-      #
-      # @return [String] '{Metasploit::Credential::Version::MAJOR}.{Metasploit::Credential::Version::MINOR}.{Metasploit::Credential::Version::PATCH}'
-      #   on master.  '{Metasploit::Credential::Version::MAJOR}.{Metasploit::Credential::Version::MINOR}.{Metasploit::Credential::Version::PATCH}.PRERELEASE'
-      #   on any branch other than master.
-      def self.gem
-        full.gsub('-', '.pre.')
-      end
+    # VERSION is managed by GemRelease
+    VERSION = '1.1.0'
+  
+    # @return [String]
+    #
+    # returns the VERSION
+    #
+  
+    def self.version
+      VERSION
     end
-
-    # (see Version.gem)
-    GEM_VERSION = Version.gem
-
-    # (see Version.full)
-    VERSION = Version.full
   end
 end

data/spec/dummy/config/application.rb

@@ -43,7 +43,10 @@ module Dummy
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
-
+    
+    # Raise deprecations as errors
+    config.active_support.deprecation = :raise
+    
     # Enable escaping HTML in JSON.
     config.active_support.escape_html_entities_in_json = true
 

data/spec/dummy/config/database.yml

@@ -1,22 +1,13 @@
-# Please only use postgresql bound to a TCP port.
 development: &pgsql
   adapter: postgresql
-  database: metasploit_credential_development
+  database: metasploit-credential_development0
   username: msf
   password: pass123
   host: localhost
   port: 5432
   pool: 5
   timeout: 5
-
-# 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.
+  min_messages: warning
 test:
   <<: *pgsql
-  database: metasploit_credential_test
-  password: pass123
-  username: msf
-
+  database: metasploit-credential_test0

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

@@ -16,9 +16,6 @@ Dummy::Application.configure do
   # # 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
-
   # Do not compress assets
   config.assets.compress = false
 

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

@@ -63,8 +63,4 @@ Dummy::Application.configure do
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation can not be found)
   config.i18n.fallbacks = true
-
-  # Send deprecation notices to registered listeners
-  config.active_support.deprecation = :notify
-
 end

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

@@ -31,7 +31,4 @@ Dummy::Application.configure do
   # # 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
 end

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

@@ -5,14 +5,14 @@ RSpec.describe Metasploit::Credential::Exporter::Core do
 
   subject(:core_exporter){ Metasploit::Credential::Exporter::Core.new(workspace: workspace) }
 
-  before(:each) do
+  before(:example) do
     origin.task = nil
   end
 
   #
   # Clean up generated files/paths
   #
-  after(:each) do
+  after(:example) do
     Dir.glob("#{Dir.tmpdir}/metasploit*").each {|d| FileUtils.rm_rf d}
   end
 
@@ -171,7 +171,7 @@ RSpec.describe Metasploit::Credential::Exporter::Core do
     describe "uniqueness for export" do
       let(:path_fragment){ "export-#{Time.now.to_s}" }
 
-      before(:each) do
+      before(:example) do
         allow(core_exporter).to receive(:output_final_subdirectory_name).and_return(path_fragment)
       end
 
@@ -183,12 +183,12 @@ RSpec.describe Metasploit::Credential::Exporter::Core do
 
   describe "#data" do
     describe "in LOGIN_MODE" do
-      before(:each) do
+      before(:example) do
         allow(core_exporter).to receive(:mode).and_return Metasploit::Credential::Exporter::Core::LOGIN_MODE
       end
 
       describe "when whitelist_ids is present" do
-        before(:each) do
+        before(:example) do
           allow(core_exporter).to receive(:whitelist_ids).and_return([login1.id])
         end
 
@@ -205,12 +205,12 @@ RSpec.describe Metasploit::Credential::Exporter::Core do
     end
 
     describe "in CORE_MODE" do
-      before(:each) do
+      before(:example) do
         allow(core_exporter).to receive(:mode).and_return Metasploit::Credential::Exporter::Core::CORE_MODE
       end
 
       describe "when whitelist_ids is present" do
-        before(:each) do
+        before(:example) do
           allow(core_exporter).to receive(:whitelist_ids).and_return([core1.id])
         end
 
@@ -229,7 +229,7 @@ RSpec.describe Metasploit::Credential::Exporter::Core do
 
   describe "#export_data" do
     describe "in CORE_MODE" do
-      before(:each) do
+      before(:example) do
         allow(core_exporter).to receive(:mode).and_return Metasploit::Credential::Exporter::Core::CORE_MODE
       end
 
@@ -240,7 +240,7 @@ RSpec.describe Metasploit::Credential::Exporter::Core do
     end
 
     describe "in LOGIN_MODE" do
-      before(:each) do
+      before(:example) do
         allow(core_exporter).to receive(:mode).and_return Metasploit::Credential::Exporter::Core::LOGIN_MODE
       end
 
@@ -254,7 +254,7 @@ RSpec.describe Metasploit::Credential::Exporter::Core do
   describe "generation" do
     describe "#render_manifest_and_output_keys" do
       describe "in CORE_MODE" do
-        before(:each) do
+        before(:example) do
           allow(core_exporter).to receive(:mode).and_return Metasploit::Credential::Exporter::Core::CORE_MODE
           core_exporter.render_manifest_output_and_keys
           path = core_exporter.output_final_directory_path + '/' + Metasploit::Credential::Importer::Zip::MANIFEST_FILE_NAME
@@ -301,7 +301,7 @@ RSpec.describe Metasploit::Credential::Exporter::Core do
       end
 
       describe "in LOGIN_MODE" do
-        before(:each) do
+        before(:example) do
           allow(core_exporter).to receive(:mode).and_return Metasploit::Credential::Exporter::Core::LOGIN_MODE
           core_exporter.render_manifest_output_and_keys
           path = core_exporter.output_final_directory_path + '/' + Metasploit::Credential::Importer::Zip::MANIFEST_FILE_NAME
@@ -378,7 +378,7 @@ RSpec.describe Metasploit::Credential::Exporter::Core do
 
     describe "#render_zip" do
       describe "when there are no SSH keys in the dataset" do
-        before(:each) do
+        before(:example) do
           allow(core_exporter).to receive(:mode).and_return Metasploit::Credential::Exporter::Core::CORE_MODE
           core_exporter.render_manifest_output_and_keys
           core_exporter.render_zip
@@ -409,7 +409,7 @@ RSpec.describe Metasploit::Credential::Exporter::Core do
                                                  private: private_with_key,
                                                  workspace: workspace)}
 
-        before(:each) do
+        before(:example) do
           allow(core_exporter).to receive(:mode).and_return Metasploit::Credential::Exporter::Core::CORE_MODE
           core_exporter.render_manifest_output_and_keys
           core_exporter.render_zip
@@ -432,7 +432,7 @@ RSpec.describe Metasploit::Credential::Exporter::Core do
         end
 
         describe "the keys directory" do
-          before(:each) do
+          before(:example) do
             @key_entries = nil
             Zip::File.open(core_exporter.output_zipfile_path) do |zip_file|
               @key_entries = zip_file.glob("#{Metasploit::Credential::Importer::Zip::KEYS_SUBDIRECTORY_NAME}/*")

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

@@ -18,7 +18,7 @@ RSpec.describe Metasploit::Credential::Exporter::Pwdump do
     describe "plaintext passwords" do
       let(:private){ FactoryGirl.build :metasploit_credential_password }
 
-      before(:each) do
+      before(:example) do
         core.private = private
       end
 
@@ -40,7 +40,7 @@ RSpec.describe Metasploit::Credential::Exporter::Pwdump do
     describe "non-replayable" do
       let(:private){ FactoryGirl.build :metasploit_credential_nonreplayable_hash }
 
-      before(:each) do
+      before(:example) do
         core.private = private
       end
 
@@ -62,7 +62,7 @@ RSpec.describe Metasploit::Credential::Exporter::Pwdump do
     describe "NTLM" do
       let(:private){ FactoryGirl.build :metasploit_credential_ntlm_hash }
 
-      before(:each) do
+      before(:example) do
         core.private = private
       end
 
@@ -84,7 +84,7 @@ RSpec.describe Metasploit::Credential::Exporter::Pwdump do
     describe "PostgresMD5" do
       let(:private){ FactoryGirl.build :metasploit_credential_postgres_md5 }
 
-      before(:each) do
+      before(:example) do
         core.private = private
       end
 
@@ -109,7 +109,7 @@ RSpec.describe Metasploit::Credential::Exporter::Pwdump do
         describe "netlm" do
           let(:private){ FactoryGirl.build :metasploit_credential_nonreplayable_hash, jtr_type: 'netlm' }
 
-          before(:each) do
+          before(:example) do
             core.private = private
           end
 
@@ -121,7 +121,7 @@ RSpec.describe Metasploit::Credential::Exporter::Pwdump do
         describe "netntlm" do
           let(:private){ FactoryGirl.build :metasploit_credential_nonreplayable_hash, jtr_type: 'netntlm' }
 
-          before(:each) do
+          before(:example) do
             core.private = private
           end
 
@@ -135,7 +135,7 @@ RSpec.describe Metasploit::Credential::Exporter::Pwdump do
         describe "netlmv2" do
           let(:private){ FactoryGirl.build :metasploit_credential_non_replayable_hash, jtr_type: 'netlmv2' }
 
-          before(:each) do
+          before(:example) do
             core.private = private
           end
 
@@ -147,7 +147,7 @@ RSpec.describe Metasploit::Credential::Exporter::Pwdump do
         describe "netntlmv2" do
           let(:private){ FactoryGirl.build :metasploit_credential_non_replayable_hash, jtr_type: 'netntlmv2' }
 
-          before(:each) do
+          before(:example) do
             core.private = private
           end
 

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

@@ -5,14 +5,14 @@ RSpec.describe Metasploit::Credential::Importer::Core do
   subject(:core_csv_importer){FactoryGirl.build(:metasploit_credential_core_importer, workspace:workspace)}
 
   # CSV objects are IOs
-  after(:each) do
+  after(:example) do
     core_csv_importer.csv_object.rewind
   end
 
   describe "validations" do
     describe "short-form imports" do
       describe "with well-formed CSV data" do
-        before(:each) do
+        before(:example) do
           core_csv_importer.input = FactoryGirl.generate :short_well_formed_csv
           core_csv_importer.private_credential_type = "Metasploit::Credential::Password"
         end
@@ -25,12 +25,12 @@ RSpec.describe Metasploit::Credential::Importer::Core do
           I18n.translate!('activemodel.errors.models.metasploit/credential/importer/core.attributes.private_credential_type.invalid_type')
         end
 
-        before(:each) do
+        before(:example) do
           core_csv_importer.input = FactoryGirl.generate :short_well_formed_csv
           core_csv_importer.private_credential_type = "Metasploit::Credential::SSHKey"
         end
 
-        it{ should_not be_valid }
+        it{ is_expected.not_to be_valid }
 
         it 'should report the error being invalid private type' do
           core_csv_importer.valid?
@@ -43,12 +43,12 @@ RSpec.describe Metasploit::Credential::Importer::Core do
           I18n.translate!('activemodel.errors.models.metasploit/credential/importer/core.attributes.input.incorrect_csv_headers')
         end
 
-        before(:each) do
+        before(:example) do
           core_csv_importer.input = FactoryGirl.generate :short_well_formed_csv_non_compliant_header
           core_csv_importer.private_credential_type = "Metasploit::Credential::Password"
         end
 
-        it{ should_not be_valid }
+        it{ is_expected.not_to be_valid }
 
         it 'should report the error being invalid headers' do
           core_csv_importer.valid?
@@ -64,7 +64,7 @@ RSpec.describe Metasploit::Credential::Importer::Core do
         end
 
         describe "with data that includes a missing Public (username)" do
-          before(:each) do
+          before(:example) do
             core_csv_importer.input = FactoryGirl.generate :well_formed_csv_compliant_header_missing_public
           end
 
@@ -74,7 +74,7 @@ RSpec.describe Metasploit::Credential::Importer::Core do
         end
 
         describe "with data that includes a missing Private" do
-          before(:each) do
+          before(:example) do
             core_csv_importer.input = FactoryGirl.generate :well_formed_csv_compliant_header_missing_private
           end
 
@@ -96,7 +96,7 @@ RSpec.describe Metasploit::Credential::Importer::Core do
             }
           end
 
-          before(:each) do
+          before(:example) do
             core         = Metasploit::Credential::Core.new
             core.public  = FactoryGirl.create(:metasploit_credential_username, username: preexisting_cred_data[:username])
             core.private = FactoryGirl.create(:metasploit_credential_password, data: preexisting_cred_data[:private_data])
@@ -117,11 +117,11 @@ RSpec.describe Metasploit::Credential::Importer::Core do
             I18n.translate!('activemodel.errors.models.metasploit/credential/importer/core.attributes.input.incorrect_csv_headers')
           end
 
-          before(:each) do
+          before(:example) do
             core_csv_importer.input = FactoryGirl.generate(:well_formed_csv_non_compliant_header)
           end
 
-          it { should_not be_valid }
+          it { is_expected.not_to be_valid }
 
           it 'should report the error being incorrect headers' do
             core_csv_importer.valid?
@@ -134,7 +134,7 @@ RSpec.describe Metasploit::Credential::Importer::Core do
             I18n.translate!('activemodel.errors.models.metasploit/credential/importer/core.attributes.input.malformed_csv')
           end
 
-          before(:each) do
+          before(:example) do
             core_csv_importer.input = FactoryGirl.generate(:malformed_csv)
           end
 
@@ -151,7 +151,7 @@ RSpec.describe Metasploit::Credential::Importer::Core do
             I18n.translate!('activemodel.errors.models.metasploit/credential/importer/core.attributes.input.empty_csv')
           end
 
-          before(:each) do
+          before(:example) do
             core_csv_importer.input = FactoryGirl.generate(:empty_core_csv)
           end
 
@@ -164,7 +164,7 @@ RSpec.describe Metasploit::Credential::Importer::Core do
         end
 
         describe "when accesssing without rewind" do
-          before(:each) do
+          before(:example) do
             core_csv_importer.csv_object.gets
           end
 
@@ -176,7 +176,7 @@ RSpec.describe Metasploit::Credential::Importer::Core do
     end
 
     describe "short-form imports" do
-      before(:each) do
+      before(:example) do
         core_csv_importer.private_credential_type = "Metasploit::Credential::Password"
         core_csv_importer.input = FactoryGirl.generate :short_well_formed_csv
       end
@@ -202,7 +202,7 @@ RSpec.describe Metasploit::Credential::Importer::Core do
           }
         end
 
-        before(:each) do
+        before(:example) do
           core         = Metasploit::Credential::Core.new
           core.public  = FactoryGirl.create(:metasploit_credential_username, username: preexisting_cred_data[:username])
           core.private = FactoryGirl.create(:metasploit_credential_password, data: preexisting_cred_data[:private_data])
@@ -224,7 +224,7 @@ RSpec.describe Metasploit::Credential::Importer::Core do
         # Contains 3 unique Publics
         let(:stored_public){ core_csv_importer.csv_object.gets; core_csv_importer.csv_object.first['username'] }
 
-        before(:each) do
+        before(:example) do
           Metasploit::Credential::Username.create!(username: stored_public)
           core_csv_importer.csv_object.rewind
         end
@@ -247,7 +247,7 @@ RSpec.describe Metasploit::Credential::Importer::Core do
         let(:stored_private_row){ core_csv_importer.csv_object.gets; core_csv_importer.csv_object.first }
         let(:private_class){ stored_private_row['private_type'].constantize }
 
-        before(:each) do
+        before(:example) do
           private_cred      = private_class.new
           private_cred.data = stored_private_row['private_data']
           private_cred.save!
@@ -272,7 +272,7 @@ RSpec.describe Metasploit::Credential::Importer::Core do
         # Contains 2 unique Realms
         let(:stored_realm_row){ core_csv_importer.csv_object.gets; core_csv_importer.csv_object.first }
 
-        before(:each) do
+        before(:example) do
           Metasploit::Credential::Realm.create(key: stored_realm_row['realm_key'],
                                                value: stored_realm_row['realm_value'])
         end
@@ -296,7 +296,7 @@ RSpec.describe Metasploit::Credential::Importer::Core do
     end
 
     context "when there are Logins in the input" do
-      before(:each) do
+      before(:example) do
         core_csv_importer.input = FactoryGirl.generate :well_formed_csv_compliant_header_with_service_info
       end