metasploit-credential 0.14.7 → 0.14.8

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

@@ -1,4 +1,6 @@
-RSpec.describe Metasploit::Credential::Exporter::Pwdump do
+require 'spec_helper'
+
+describe Metasploit::Credential::Exporter::Pwdump do
   include_context 'Mdm::Workspace'
 
   subject(:exporter){ Metasploit::Credential::Exporter::Pwdump.new}
@@ -11,7 +13,7 @@ RSpec.describe Metasploit::Credential::Exporter::Pwdump do
     describe "associated Mdm::Service objects" do
       it 'should properly format the service information' do
         service = login.service
-        expect(exporter.format_service_for_login(login)).to eq("#{service.host.address}:#{service.port}/#{service.proto} (#{service.name})")
+        exporter.format_service_for_login(login).should == "#{service.host.address}:#{service.port}/#{service.proto} (#{service.name})"
       end
     end
 
@@ -23,17 +25,17 @@ RSpec.describe Metasploit::Credential::Exporter::Pwdump do
       end
 
       it 'should have the proper formatting with extant data' do
-        expect(exporter.format_password(login)).to eq("#{login.core.public.username} #{login.core.private.data}")
+        exporter.format_password(login).should == "#{login.core.public.username} #{login.core.private.data}"
       end
 
       it 'should have the proper formatting with a missing public' do
         login.core.public.username = ""
-        expect(exporter.format_password(login)).to eq("#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING} #{login.core.private.data}")
+        exporter.format_password(login).should == "#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING} #{login.core.private.data}"
       end
 
       it 'should have the proper formatting with a missing private' do
         login.core.private.data = ""
-        expect(exporter.format_password(login)).to eq("#{login.core.public.username} #{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}")
+        exporter.format_password(login).should == "#{login.core.public.username} #{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}"
       end
     end
 
@@ -45,17 +47,17 @@ RSpec.describe Metasploit::Credential::Exporter::Pwdump do
       end
 
       it 'should have the proper formatting with extant data' do
-        expect(exporter.format_nonreplayable_hash(login)).to eq("#{login.core.public.username}:#{login.core.private.data}:::")
+        exporter.format_nonreplayable_hash(login).should == "#{login.core.public.username}:#{login.core.private.data}:::"
       end
 
       it 'should have the proper formatting with a missing public' do
         login.core.public.username = ""
-        expect(exporter.format_nonreplayable_hash(login)).to eq("#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:#{login.core.private.data}:::")
+        exporter.format_nonreplayable_hash(login).should == "#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:#{login.core.private.data}:::"
       end
 
       it 'should have the proper formatting with a missing private' do
         login.core.private.data = ""
-        expect(exporter.format_nonreplayable_hash(login)).to eq("#{login.core.public.username}:#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:::")
+        exporter.format_nonreplayable_hash(login).should == "#{login.core.public.username}:#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:::"
       end
     end
 
@@ -67,17 +69,17 @@ RSpec.describe Metasploit::Credential::Exporter::Pwdump do
       end
 
       it 'should have the proper formatting with extant data' do
-        expect(exporter.format_ntlm_hash(login)).to eq("#{login.core.public.username}:#{login.id}:#{login.core.private.data}:::")
+        exporter.format_ntlm_hash(login).should == "#{login.core.public.username}:#{login.id}:#{login.core.private.data}:::"
       end
 
       it 'should have the proper formatting with a missing public' do
         login.core.public.username = ""
-        expect(exporter.format_ntlm_hash(login)).to eq("#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:#{login.id}:#{login.core.private.data}:::")
+        exporter.format_ntlm_hash(login).should == "#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:#{login.id}:#{login.core.private.data}:::"
       end
 
       it 'should have the proper formatting with a missing private' do
         login.core.private.data = ""
-        expect(exporter.format_ntlm_hash(login)).to eq("#{login.core.public.username}:#{login.id}:#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:::")
+        exporter.format_ntlm_hash(login).should == "#{login.core.public.username}:#{login.id}:#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:::"
       end
     end
 
@@ -89,17 +91,17 @@ RSpec.describe Metasploit::Credential::Exporter::Pwdump do
       end
 
       it 'should have the proper formatting with extant data' do
-        expect(exporter.format_postgres_md5(login)).to eq("#{login.core.public.username}:#{login.core.private.data}")
+        exporter.format_postgres_md5(login).should == "#{login.core.public.username}:#{login.core.private.data}"
       end
 
       it 'should have the proper formatting with a missing public' do
         login.core.public.username = ""
-        expect(exporter.format_postgres_md5(login)).to eq("#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:#{login.core.private.data}")
+        exporter.format_postgres_md5(login).should == "#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:#{login.core.private.data}"
       end
 
       it 'should have the proper formatting with a missing private' do
         login.core.private.data = ""
-        expect(exporter.format_postgres_md5(login)).to eq("#{login.core.public.username}:#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}")
+        exporter.format_postgres_md5(login).should == "#{login.core.public.username}:#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}"
       end
 
     end

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

@@ -1,4 +1,6 @@
-RSpec.describe Metasploit::Credential::Importer::Core do
+require 'spec_helper'
+
+describe Metasploit::Credential::Importer::Core do
   include_context 'Mdm::Workspace'
   let(:workspace){FactoryGirl.create(:mdm_workspace)}
 
@@ -17,7 +19,7 @@ RSpec.describe Metasploit::Credential::Importer::Core do
           core_csv_importer.private_credential_type = "Metasploit::Credential::Password"
         end
 
-        it { is_expected.to be_valid }
+        it { should be_valid }
       end
 
       describe "with a non-supported credential type" do
@@ -34,7 +36,7 @@ RSpec.describe Metasploit::Credential::Importer::Core do
 
         it 'should report the error being invalid private type' do
           core_csv_importer.valid?
-          expect(core_csv_importer.errors[:private_credential_type]).to include error
+          core_csv_importer.errors[:private_credential_type].should include error
         end
       end
 
@@ -52,7 +54,7 @@ RSpec.describe Metasploit::Credential::Importer::Core do
 
         it 'should report the error being invalid headers' do
           core_csv_importer.valid?
-          expect(core_csv_importer.errors[:input]).to include error
+          core_csv_importer.errors[:input].should include error
         end
       end
     end
@@ -60,7 +62,7 @@ RSpec.describe Metasploit::Credential::Importer::Core do
     describe "long-form imports" do
       describe "with well-formed CSV data" do
         describe "with a compliant header" do
-          it { is_expected.to be_valid }
+          it { should be_valid }
         end
 
         describe "with data that includes a missing Public (username)" do
@@ -125,7 +127,7 @@ RSpec.describe Metasploit::Credential::Importer::Core do
 
           it 'should report the error being incorrect headers' do
             core_csv_importer.valid?
-            expect(core_csv_importer.errors[:input]).to include error
+            core_csv_importer.errors[:input].should include error
           end
         end
 
@@ -138,11 +140,11 @@ RSpec.describe Metasploit::Credential::Importer::Core do
             core_csv_importer.input = FactoryGirl.generate(:malformed_csv)
           end
 
-          it { is_expected.to be_invalid }
+          it { should be_invalid }
 
           it 'should report the error being malformed CSV' do
             core_csv_importer.valid?
-            expect(core_csv_importer.errors[:input]).to include error
+            core_csv_importer.errors[:input].should include error
           end
         end
 
@@ -155,11 +157,11 @@ RSpec.describe Metasploit::Credential::Importer::Core do
             core_csv_importer.input = FactoryGirl.generate(:empty_core_csv)
           end
 
-          it { is_expected.to be_invalid }
+          it { should be_invalid }
 
           it 'should show the proper error message' do
             core_csv_importer.valid?
-            expect(core_csv_importer.errors[:input]).to include error
+            core_csv_importer.errors[:input].should include error
           end
         end
 

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

@@ -1,4 +1,6 @@
-RSpec.describe Metasploit::Credential::Importer::Multi do
+require 'spec_helper'
+
+describe Metasploit::Credential::Importer::Multi do
   include_context 'Mdm::Workspace'
   include_context 'metasploit_credential_importer_zip_file'
 
@@ -29,7 +31,7 @@ RSpec.describe Metasploit::Credential::Importer::Multi do
     context "when given zip file" do
       subject(:multi_importer){ Metasploit::Credential::Importer::Multi.new(input: File.open(supported_file), origin: import_origin)}
 
-      it { is_expected.to be_valid }
+      it { should be_valid }
     end
 
     describe "#csv?" do
@@ -37,7 +39,7 @@ RSpec.describe Metasploit::Credential::Importer::Multi do
         subject(:multi_importer){ Metasploit::Credential::Importer::Multi.new(input: File.open(valid_csv_file), origin: import_origin)}
 
         it 'should return true' do
-          expect(multi_importer.csv?).to eq(true)
+          multi_importer.csv?.should be_true
         end
       end
 
@@ -45,7 +47,7 @@ RSpec.describe Metasploit::Credential::Importer::Multi do
         subject(:multi_importer){ Metasploit::Credential::Importer::Multi.new(input: File.open(unsupported_file), origin: import_origin)}
 
         it 'should return true' do
-          expect(multi_importer.csv?).to eq(false)
+          multi_importer.csv?.should be_false
         end
       end
     end

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

@@ -1,4 +1,6 @@
-RSpec.describe Metasploit::Credential::Importer::Pwdump do
+require 'spec_helper'
+
+describe Metasploit::Credential::Importer::Pwdump do
   include_context 'Mdm::Workspace'
 
   let(:workspace) {FactoryGirl.create(:mdm_workspace)}
@@ -9,12 +11,12 @@ RSpec.describe Metasploit::Credential::Importer::Pwdump do
                                                origin: origin)}
 
   describe "validation" do
-    it { is_expected.to be_valid }
+    it { should be_valid }
 
     describe "without a filename" do
       it 'should not be valid' do
         pwdump_importer.filename = nil
-        expect(pwdump_importer).not_to be_valid
+        pwdump_importer.should_not be_valid
       end
     end
   end
@@ -22,32 +24,32 @@ RSpec.describe Metasploit::Credential::Importer::Pwdump do
   describe "#blank_or_string" do
     context "with a blank string" do
       it 'should return empty string' do
-        expect(pwdump_importer.blank_or_string("")).to eq("")
+        pwdump_importer.blank_or_string("").should == ""
       end
     end
     context "with a BLANK_CRED_STRING" do
       it 'should return empty string' do
-        expect(pwdump_importer.blank_or_string(Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING)).to eq("")
+        pwdump_importer.blank_or_string(Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING).should == ""
       end
     end
 
     context "with a JTR_NO_PASSWORD_STRING" do
       it 'should return empty string' do
-        expect(pwdump_importer.blank_or_string(Metasploit::Credential::Importer::Pwdump::JTR_NO_PASSWORD_STRING)).to eq("")
+        pwdump_importer.blank_or_string(Metasploit::Credential::Importer::Pwdump::JTR_NO_PASSWORD_STRING).should == ""
       end
     end
 
     context "with a present string" do
       it 'should return the string' do
         string = "mah-hard-passwerd"
-        expect(pwdump_importer.blank_or_string(string)).to eq(string)
+        pwdump_importer.blank_or_string(string).should == string
       end
     end
 
     context "with the dehex flag" do
       it 'should dehex the string with the Metasploit::Credential::Text#dehex method' do
         string = "mah-hard-passwerd"
-        expect(Metasploit::Credential::Text).to receive(:dehex).with string
+        Metasploit::Credential::Text.should_receive(:dehex).with string
         pwdump_importer.blank_or_string(string, true)
       end
     end
@@ -62,8 +64,8 @@ RSpec.describe Metasploit::Credential::Importer::Pwdump do
       it 'should create Cores with the same Origin' do
         pwdump_importer.import!
         origins = Metasploit::Credential::Core.all.collect(&:origin).uniq
-        expect(origins.size).to be(1)
-        expect(origins.first.id).to be(origin.id)
+        origins.size.should be(1)
+        origins.first.id.should be(origin.id)
       end
 
       it 'should create the proper number of Logins' do
@@ -94,7 +96,7 @@ RSpec.describe Metasploit::Credential::Importer::Pwdump do
         # Legacy files may have these lines when missing SSH key files
         it 'should not create a Private from a "Warning" line' do
           pwdump_importer.import!
-          expect(Metasploit::Credential::Private.where(data:'missing')).to be_blank
+          Metasploit::Credential::Private.where(data:'missing').should be_blank
         end
       end
     end

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

@@ -1,4 +1,6 @@
-RSpec.describe Metasploit::Credential::Importer::Zip do
+require 'spec_helper'
+
+describe Metasploit::Credential::Importer::Zip do
   include_context 'Mdm::Workspace'
   include_context 'metasploit_credential_importer_zip_file'
 
@@ -9,7 +11,7 @@ RSpec.describe Metasploit::Credential::Importer::Zip do
     DUMMY_ZIP_PATH = "/tmp/import-test-dummy.zip"
 
     context "when the zip file contains a keys directory and a manifest CSV" do
-      it { is_expected.to be_valid }
+      it { should be_valid }
     end
 
     context "when the zip file is not actually an archive" do
@@ -30,7 +32,7 @@ RSpec.describe Metasploit::Credential::Importer::Zip do
 
       it 'should show the proper error message' do
         zip_importer.valid?
-        expect(zip_importer.errors[:input]).to include error
+        zip_importer.errors[:input].should include error
       end
     end
 
@@ -47,7 +49,7 @@ RSpec.describe Metasploit::Credential::Importer::Zip do
 
       it 'should show the proper error message' do
         zip_importer.valid?
-        expect(zip_importer.errors[:input]).to include error
+        zip_importer.errors[:input].should include error
       end
     end
 
@@ -61,7 +63,7 @@ RSpec.describe Metasploit::Credential::Importer::Zip do
 
   describe "zip constants" do
     it 'should have ZIP_HEADER_IDENTIFIER whose length corresponds to ZIP_HEADER_BYTE_LENGTH' do
-      expect(Metasploit::Credential::Importer::Zip::ZIP_HEADER_IDENTIFIER.size).to eq(Metasploit::Credential::Importer::Zip::ZIP_HEADER_BYTE_LENGTH)
+      Metasploit::Credential::Importer::Zip::ZIP_HEADER_IDENTIFIER.size.should == Metasploit::Credential::Importer::Zip::ZIP_HEADER_BYTE_LENGTH
     end
   end
 end

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'tempfile'
 
-RSpec.describe Metasploit::Credential::Migrator do
+describe Metasploit::Credential::Migrator do
   include_context 'Mdm::Workspace'
 
   let(:workspace){ FactoryGirl.create(:mdm_workspace) }
@@ -62,9 +62,9 @@ RSpec.describe Metasploit::Credential::Migrator do
         end
 
         it "should be created for each Mdm::Cred" do
-          expect(Metasploit::Credential::Public.where(username: cred1.user)).not_to be_blank
-          expect(Metasploit::Credential::Public.where(username: cred2.user)).not_to be_blank
-          expect(Metasploit::Credential::Public.where(username: cred3.user)).not_to be_blank
+          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
         end
       end
 
@@ -75,9 +75,9 @@ RSpec.describe Metasploit::Credential::Migrator do
 
         it "should be created for each Mdm::Cred" do
           migrator.convert_creds_in_workspace(workspace)
-          expect(Metasploit::Credential::Password.where(data: cred1.pass)).not_to be_blank
-          expect(Metasploit::Credential::Password.where(data: cred2.pass)).not_to be_blank
-          expect(Metasploit::Credential::Password.where(data: cred3.pass)).not_to be_blank
+          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
         end
       end
     end
@@ -97,7 +97,7 @@ RSpec.describe Metasploit::Credential::Migrator do
         end
 
         it 'should create a new NTLMHash in the database' do
-          expect(Metasploit::Credential::NTLMHash.where(data: cred.pass)).not_to be_blank
+          Metasploit::Credential::NTLMHash.where(data: cred.pass).should_not be_blank
         end
       end
 
@@ -126,7 +126,7 @@ RSpec.describe Metasploit::Credential::Migrator do
           end
 
           it 'should create a new SSHKey in the database' do
-            expect(Metasploit::Credential::SSHKey.where(data: ssh_key_content)).not_to be_blank
+            Metasploit::Credential::SSHKey.where(data: ssh_key_content).should_not be_blank
           end
         end
 
@@ -144,7 +144,7 @@ RSpec.describe Metasploit::Credential::Migrator do
           end
 
           it 'should create a new SSHKey in the database' do
-            expect(Metasploit::Credential::SSHKey.where(data: ssh_key_content)).not_to be_blank
+            Metasploit::Credential::SSHKey.where(data: ssh_key_content).should_not be_blank
           end
         end
 
@@ -162,7 +162,7 @@ RSpec.describe Metasploit::Credential::Migrator do
           end
 
           it 'should not create a new SSHKey in the database' do
-            expect(Metasploit::Credential::SSHKey.count).to be_zero
+            Metasploit::Credential::SSHKey.count.should be_zero
           end
         end
 
@@ -182,7 +182,7 @@ RSpec.describe Metasploit::Credential::Migrator do
         end
 
         it 'should create a new Password in the database' do
-          expect(Metasploit::Credential::Password.where(data: cred.pass)).not_to be_blank
+          Metasploit::Credential::Password.where(data: cred.pass).should_not be_blank
         end
       end
 
@@ -200,7 +200,7 @@ RSpec.describe Metasploit::Credential::Migrator do
         end
 
         it 'should create a new NonreplayableHash in the database' do
-          expect(Metasploit::Credential::NonreplayableHash.where(data: cred.pass)).not_to be_blank
+          Metasploit::Credential::NonreplayableHash.where(data: cred.pass).should_not be_blank
         end
       end
     end

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

@@ -1,3 +1,141 @@
-RSpec.describe Metasploit::Credential::Version do
-  it_should_behave_like 'Metasploit::Version Version Module'
-end
+require 'spec_helper'
+
+describe Metasploit::Credential::Version do
+  context 'CONSTANTS' do
+    context 'MAJOR' do
+      subject(:major) do
+        described_class::MAJOR
+      end
+
+      it 'is 0 because the API is not locked yet' do
+        expect(major).to eq(0)
+      end
+    end
+
+    context 'MINOR' do
+      subject(:minor) do
+        described_class::MINOR
+      end
+
+      it { should be_a Integer }
+    end
+
+    context 'PATCH' do
+      subject(:patch) do
+        described_class::PATCH
+      end
+
+      it { should be_a Integer }
+    end
+
+    pull_request = ENV['TRAVIS_PULL_REQUEST']
+
+    # a pull request cannot check PRERELEASE because it will be tested in the target branch, but the source itself
+    # is from the source branch and so has the source branch PRERELEASE.
+    #
+    # PRERELEASE can only be set appropriately for a merge by merging to the target branch and then updating PRERELEASE
+    # on the target branch before committing and/or pushing to github and travis-ci.
+    if pull_request.nil? || pull_request == 'false'
+      context 'PREPRELEASE' do
+        subject(:prerelease) do
+          described_class::PRERELEASE
+        end
+
+        branch = ENV['TRAVIS_BRANCH']
+
+        if branch.blank?
+          branch = `git rev-parse --abbrev-ref HEAD`.strip
+        end
+
+        if branch == 'master'
+          it 'does not have a PRERELEASE' do
+            expect(defined? described_class::PRERELEASE).to be_nil
+          end
+        else
+          branch_regex = %r{\A(?:refs/remotes/)?(?<type>bug|chore|feature|staging)(/(?<story>[^/]+))?/(?<prerelease>[^\/]+)\z}
+          match = branch.match(branch_regex)
+
+          if match
+            it 'matches the branch relative name' do
+              expect(prerelease).to eq(match[:prerelease])
+            end
+          else
+            tag_regex = /\Av(?<major>\d+).(?<minor>\d+).(?<patch>\d+)(\.pre\.(?<prerelease>.*))?\z/
+            # travis-ci sets TRAVIS_BRANCH to the tag name for tag builds
+            match = branch.match(tag_regex)
+
+            if match
+              tag_prerelease = match[:prerelease]
+
+              if tag_prerelease
+                it 'matches the tag prerelease converted from a gem version to a VERSION' do
+                  expect(prerelease).to eq(tag_prerelease.gsub('.pre.', '-'))
+                end
+              else
+                it 'does not have a PRERELEASE' do
+                  expect(defined? described_class::PRERELEASE).to be_nil
+                end
+              end
+            else
+              it 'has a abbreviated reference that can be parsed for prerelease' do
+                fail "Do not know how to parse #{branch.inspect} for PRERELEASE"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  context 'full' do
+    subject(:full) do
+      described_class.full
+    end
+
+    #
+    # lets
+    #
+
+    let(:major) do
+      1
+    end
+
+    let(:minor) do
+      2
+    end
+
+    let(:patch) do
+      3
+    end
+
+    before(:each) do
+      stub_const("#{described_class}::MAJOR", major)
+      stub_const("#{described_class}::MINOR", minor)
+      stub_const("#{described_class}::PATCH", patch)
+    end
+
+    context 'with PRERELEASE' do
+      let(:prerelease) do
+        'prerelease'
+      end
+
+      before(:each) do
+        stub_const("#{described_class}::PRERELEASE", prerelease)
+      end
+
+      it 'is <major>.<minor>.<patch>-<prerelease>' do
+        expect(full).to eq("#{major}.#{minor}.#{patch}-#{prerelease}")
+      end
+    end
+
+    context 'without PRERELEASE' do
+      before(:each) do
+        hide_const("#{described_class}::PRERELEASE")
+      end
+
+      it 'is <major>.<minor>.<patch>' do
+        expect(full).to eq("#{major}.#{minor}.#{patch}")
+      end
+    end
+  end
+end