metasploit-credential 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f442d7c518fb88b5d296d632a798fa8251f79159
-  data.tar.gz: 580f1859d9614a66dc18ac39601469ac6a98fb3f
+  metadata.gz: a56ce07c1860329469314749756ff7ca1cae3155
+  data.tar.gz: 2bf103c57ab677118ff33f078d9a6acd6c2cbc81
 SHA512:
-  metadata.gz: cb6339e14224f2f123c9ee7c05da49c991fa1b2a9ec5e4c7cc568e0252c02f5025ea5981d91c5e47651291267751d799604528cd62c12249a1bc8f1985c22370
-  data.tar.gz: ec32a5757ef994c302f727e7fc4c5cdc5d898da74d65b65988f5dc76bcd3bfde33437fc624f3023e0ee90a56816f471f5cb762c25c2189def5fb91c10940e7c3
+  metadata.gz: 65b4dfd7ed3a2e18291ff22c849ccb3d1c117d71d896dff96bf127b079e59c282350cf007d445d8a4a419ef86876ec5ffc6dfcad647eb3484755a99489a14a81
+  data.tar.gz: 557568c2baa26e11281694c5fc843034a9526e1f75a149462c8add24f093f39871da8f8270b28f9232a2a7e95673507cbfc4e0aa77d1b6f2093b5783809f0909

data/lib/metasploit/credential/creation.rb

@@ -125,7 +125,7 @@ module Metasploit::Credential::Creation
     if opts.has_key?(:realm_key) && opts.has_key?(:realm_value)
       core_opts[:realm] = create_credential_realm(opts)
     end
-
+    
     if opts.has_key?(:private_type) && opts.has_key?(:private_data)
       core_opts[:private] = create_credential_private(opts)
     end
@@ -140,6 +140,91 @@ module Metasploit::Credential::Creation
 
     create_credential_core(core_opts)
   end
+  
+  # This method is responsible for creation {Metasploit::Credential::Core} and
+  # {Metasploit::Credential::Login}.
+  # This method is responsible for creating a {Metasploit::Credential::Login} object
+  # which ties a {Metasploit::Credential::Core} to the `Mdm::Service` it is a valid
+  # credential for.
+  #
+  # NOTE: for origin_type: service it must be the same service your going to create a login for.
+  #
+  # {Metasploit::Credential::Core} options
+  # @option opts [String] :jtr_format The format for John the ripper to use to try and crack this
+  # @option opts [Symbol] :origin_type The Origin type we are trying to create
+  # @option opts [String] :address The address of the `Mdm::Host` to link this Origin to
+  # @option opts [Fixnum] :port The port number of the `Mdm::Service` to link this Origin to
+  # @option opts [String] :service_name The service name to use for the `Mdm::Service`
+  # @option opts [String] :protocol The protocol type of the `Mdm::Service` to link this Origin to
+  # @option opts [String] :module_fullname The fullname of the Metasploit Module to link this Origin to
+  # @option opts [Fixnum] :workspace_id The ID of the `Mdm::Workspace` to use for the `Mdm::Host`
+  # @option opts [Fixnum] :task_id The ID of the `Mdm::Task` to link this Origin and Core to
+  # @option opts [String] :filename The filename of the file that was imported
+  # @option opts [Fixnum] :user_id The ID of the `Mdm::User` to link this Origin to
+  # @option opts [Fixnum] :session_id The ID of the `Mdm::Session` to link this Origin to
+  # @option opts [String] :post_reference_name The reference name of the Metasploit Post module to link the origin to
+  # @option opts [String] :private_data The actual data for the private (e.g. password, hash, key etc)
+  # @option opts [Symbol] :private_type The type of {Metasploit::Credential::Private} to create
+  # {Metasploit::Credential::Login}
+  # @option opts [String] :access_level The access level to assign to this login if we know it
+  # @option opts [String] :status The status for the Login object
+  # @raise [KeyError] if a required option is missing
+  # @raise [ArgumentError] if an invalid :private_type is specified
+  # @raise [ArgumentError] if an invalid :origin_type is specified
+  # @return [NilClass] if there is no active database connection
+  # @return [Metasploit::Credential::Core]
+  # @example Reporting a Bruteforced Credential and Login
+  #     create_credential_and_login(
+  #       origin_type: :service,
+  #       address: '192.168.1.100',
+  #       port: 445,
+  #       service_name: 'smb',
+  #       protocol: 'tcp',
+  #       module_fullname: 'auxiliary/scanner/smb/smb_login',
+  #       workspace_id: myworkspace.id,
+  #       private_data: 'password1',
+  #       private_type: :password,
+  #       username: 'Administrator',
+  #       service_name: 'smb',
+  #       status: status: Metasploit::Model::Login::Status::UNTRIED
+  #     )
+  
+  
+  def create_credential_and_login(opts={})
+    return nil unless active_db?
+
+    if self.respond_to?(:[]) and self[:task]
+      opts[:task_id] ||= self[:task].record.id
+    end
+
+    core               = opts.fetch(:core, create_credential(opts))
+    access_level       = opts.fetch(:access_level, nil)
+    last_attempted_at  = opts.fetch(:last_attempted_at, nil)
+    status             = opts.fetch(:status, Metasploit::Model::Login::Status::UNTRIED)
+
+    login_object = nil
+    retry_transaction do
+      service_object = create_credential_service(opts)
+      login_object = Metasploit::Credential::Login.where(core_id: core.id, service_id: service_object.id).first_or_initialize
+
+      if opts[:task_id]
+        login_object.tasks << Mdm::Task.find(opts[:task_id])
+      end
+
+      login_object.access_level      = access_level if access_level
+      login_object.last_attempted_at = last_attempted_at if last_attempted_at
+      if status == Metasploit::Model::Login::Status::UNTRIED
+        if login_object.last_attempted_at.nil?
+          login_object.status = status
+        end
+      else
+        login_object.status = status
+      end
+      login_object.save!
+    end
+
+    login_object
+  end
 
   # This method is responsible for creating {Metasploit::Credential::Core} objects.
   #

data/lib/metasploit/credential/version.rb

@@ -3,7 +3,7 @@
 module Metasploit
   module Credential
     # VERSION is managed by GemRelease
-    VERSION = '2.0.3'
+    VERSION = '2.0.4'
   
     # @return [String]
     #

data/spec/dummy/config/database.yml

@@ -1,6 +1,6 @@
 development: &pgsql
   adapter: postgresql
-  database: metasploit-credential_development1
+  database: metasploit-credential_development0
   username: msf
   password: pass123
   host: localhost
@@ -10,4 +10,4 @@ development: &pgsql
   min_messages: warning
 test:
   <<: *pgsql
-  database: metasploit-credential_test1
+  database: metasploit-credential_test0

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

@@ -15,6 +15,358 @@ RSpec.describe Metasploit::Credential::Creation do
   let(:workspace) { FactoryGirl.create(:mdm_workspace) }
 
   subject(:test_object) { dummy_class.new }
+  
+  context '#create_credential' do
+    let(:workspace) { FactoryGirl.create(:mdm_workspace) }
+    let(:service) { FactoryGirl.create(:mdm_service, host: FactoryGirl.create(:mdm_host, workspace: workspace)) }
+    let(:task) { FactoryGirl.create(:mdm_task, workspace: workspace) }
+    {
+      cracked_password: Metasploit::Credential::Origin::CrackedPassword,
+      import: Metasploit::Credential::Origin::Import,
+      manual: Metasploit::Credential::Origin::Manual,
+      service: Metasploit::Credential::Origin::Service,
+      session: Metasploit::Credential::Origin::Session
+    }.each_pair do |origin_type, origin_class|
+      context "Origin[#{origin_type}], Public[Username], Private[Password]" do
+        let(:service) { FactoryGirl.create(:mdm_service) }
+        let!(:origin_data) {{
+          cracked_password: {
+            originating_core_id: FactoryGirl.create(
+              :metasploit_credential_core, workspace: workspace, origin_factory: :metasploit_credential_origin_manual).id
+          },
+          import: {
+            filename: FactoryGirl.generate(:metasploit_credential_origin_import_filename)
+          },
+          manual: {user_id: user.id},
+          service: {
+            module_fullname: "exploit/" + FactoryGirl.generate(:metasploit_credential_origin_service_reference_name),
+            address: service.host.address,
+            port: service.port,
+            service_name: service.name,
+            protocol: service.proto
+          },
+          session: {
+            session_id: FactoryGirl.create(:mdm_session, workspace: workspace, host: service.host),
+            post_reference_name: FactoryGirl.generate(:metasploit_credential_origin_session_post_reference_name)
+          }
+        }}
+        let(:credential_data) {{
+          workspace_id: workspace.id,
+          origin_type: origin_type,
+          username: 'admin',
+          private_data: 'password',
+          private_type: :password,
+          workspace_id: workspace.id
+        }.merge(origin_data[origin_type])}
+        it 'creates a credential core' do
+          expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Core.count }.by(1)
+        end
+        it "creates a Origin of type #{origin_type}" do
+          expect{ test_object.create_credential(credential_data) }.to change{ origin_class.count }.by(1)
+        end
+        it 'creates a Private with data \'password\'' do
+          expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Private.where(data: 'password').count }.by(1)
+        end
+        it 'creates a Public with username \'username\'' do
+          expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Public.where(username: 'admin').count }.by(1)
+        end
+      end
+    end
+    [
+      Metasploit::Model::Realm::Key::ACTIVE_DIRECTORY_DOMAIN,
+      Metasploit::Model::Realm::Key::DB2_DATABASE,
+      Metasploit::Model::Realm::Key::ORACLE_SYSTEM_IDENTIFIER,
+      Metasploit::Model::Realm::Key::POSTGRESQL_DATABASE,
+      Metasploit::Model::Realm::Key::RSYNC_MODULE,
+      Metasploit::Model::Realm::Key::WILDCARD
+    ].each do |realm_type|
+      context "Origin[manual], Realm[#{realm_type}], Public[Username], Private[Password]" do
+        let(:credential_data) {{
+          workspace_id: workspace.id,
+          user_id: user.id,
+          realm_key: realm_type,
+          realm_value: 'Some Value',
+          origin_type: :manual,
+          username: 'admin',
+          private_data: 'password',
+          private_type: :password,
+          workspace_id: workspace.id
+        }}
+        it 'creates a credential core' do
+          expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Core.count }.by(1)
+        end
+        it "creates a Realm with #{realm_type} key" do
+          expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Realm.where(key: realm_type).count }.by(1)
+        end
+        it 'creates a Private with data \'password\'' do
+          expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Private.where(data: 'password').count }.by(1)
+        end
+        it 'creates a Public with username \'username\'' do
+          expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Public.where(username: 'admin').count }.by(1)
+        end
+      end
+    end
+    {
+      "Metasploit::Credential::Username" => 'admin',
+      "Metasploit::Credential::BlankUsername" => ''
+    }.each_pair do |public_type, public_value|
+      context "Origin[manual], Public[#{public_type}], Private[Password]" do
+        let(:credential_data) {{
+          workspace_id: workspace.id,
+          user_id: user.id,
+          origin_type: :manual,
+          username: public_value,
+          private_data: 'password',
+          private_type: :password,
+          workspace_id: workspace.id
+        }}
+        it 'creates a credential core' do
+          expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Core.count }.by(1)
+        end
+        it 'creates a Private with data \'password\'' do
+          expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Private.where(data: 'password').count }.by(1)
+        end
+        it 'creates a Public with username \'username\'' do
+          expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Public.where(type: public_type).count }.by(1)
+        end
+      end 
+    end
+    {
+      password: "Metasploit::Credential::Password",
+      blank_password: "Metasploit::Credential::BlankPassword",
+      nonreplayable_hash: "Metasploit::Credential::NonreplayableHash",
+      ntlm_hash: "Metasploit::Credential::NTLMHash",
+      postgres_md5: "Metasploit::Credential::PostgresMD5",
+      ssh_key: "Metasploit::Credential::SSHKey"
+    }.each_pair do |private_type, public_class|
+      context "Origin[manual], Public[Username], Private[#{private_type}]" do
+        let(:ssh_key) {
+          key_class = OpenSSL::PKey.const_get(:RSA)
+          key_class.generate(512).to_s
+        }
+        let(:private_data) { {
+          password: 'password',
+          blank_password: '',
+          nonreplayable_hash: '435ba65d2e46d35bc656086694868d1ab2c0f9fd',
+          ntlm_hash: 'aad3b435b51404eeaad3b435b51404ee:31d6cfe0d16ae931b73c59d7e0c089c0',
+          postgres_md5: 'md5ac4bbe016b808c3c0b816981f240dcae',
+          ssh_key: ssh_key
+        }}
+        let(:credential_data) {{
+          workspace_id: workspace.id,
+          user_id: user.id,
+          origin_type: :manual,
+          username: 'admin',
+          private_data: private_data[private_type],
+          private_type: private_type,
+          workspace_id: workspace.id
+        }}
+        it 'creates a credential core' do
+          expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Core.count }.by(1)
+        end
+        it 'creates a Private with data \'password\'' do
+          expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Private.where(type: public_class).count }.by(1)
+        end
+        it 'creates a Public with username \'username\'' do
+          expect{ test_object.create_credential(credential_data) }.to change{ Metasploit::Credential::Public.where(username: 'admin').count }.by(1)
+        end
+      end 
+    end
+  end
+  
+  context '#create_credential_and_login' do
+    let(:workspace) { FactoryGirl.create(:mdm_workspace) }
+    let(:service) { FactoryGirl.create(:mdm_service, host: FactoryGirl.create(:mdm_host, workspace: workspace)) }
+    let(:task) { FactoryGirl.create(:mdm_task, workspace: workspace) }
+    {
+      cracked_password: Metasploit::Credential::Origin::CrackedPassword,
+      import: Metasploit::Credential::Origin::Import,
+      manual: Metasploit::Credential::Origin::Manual,
+      service: Metasploit::Credential::Origin::Service,
+      session: Metasploit::Credential::Origin::Session
+    }.each_pair do |origin_type, origin_class|
+      context "Origin[#{origin_type}], Public[Username], Private[Password]" do
+        let!(:origin_data) {{
+          cracked_password: {
+            originating_core_id: FactoryGirl.create(
+              :metasploit_credential_core, workspace: workspace, origin_factory: :metasploit_credential_origin_manual).id
+          },
+          import: {
+            filename: FactoryGirl.generate(:metasploit_credential_origin_import_filename)
+          },
+          manual: {user_id: user.id},
+          service: {
+            module_fullname: "exploit/" + FactoryGirl.generate(:metasploit_credential_origin_service_reference_name),
+            address: service.host.address,
+            port: service.port,
+            service_name: service.name,
+            protocol: service.proto
+          },
+          session: {
+            session_id: FactoryGirl.create(:mdm_session, workspace: workspace, host: service.host),
+            post_reference_name: FactoryGirl.generate(:metasploit_credential_origin_session_post_reference_name)
+          }
+        }}
+        let(:login_data) {{
+          workspace_id: workspace.id,
+          origin_type: origin_type,
+          username: 'admin',
+          private_data: 'password',
+          private_type: :password,
+          workspace_id: workspace.id,
+          address: service.host.address,
+          port: service.port,
+          service_name: service.name,
+          protocol: service.proto,
+          last_attempted_at: DateTime.current,
+          status: Metasploit::Model::Login::Status::SUCCESSFUL,
+        }.merge(origin_data[origin_type])}
+        it 'creates a credential core' do
+          expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Core.count }.by(1)
+        end
+        it "creates a Origin of type #{origin_type}" do
+          expect{ test_object.create_credential_and_login(login_data) }.to change{ origin_class.count }.by(1)
+        end
+        it 'creates a Private with data \'password\'' do
+          expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Private.where(data: 'password').count }.by(1)
+        end
+        it 'creates a Public with username \'username\'' do
+          expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Public.where(username: 'admin').count }.by(1)
+        end
+        it 'creates a Login with status for the service' do
+          expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Login.where(service_id: service.id, status: login_data[:status]).count }.by(1)
+        end
+      end
+    end
+    [
+      Metasploit::Model::Realm::Key::ACTIVE_DIRECTORY_DOMAIN,
+      Metasploit::Model::Realm::Key::DB2_DATABASE,
+      Metasploit::Model::Realm::Key::ORACLE_SYSTEM_IDENTIFIER,
+      Metasploit::Model::Realm::Key::POSTGRESQL_DATABASE,
+      Metasploit::Model::Realm::Key::RSYNC_MODULE,
+      Metasploit::Model::Realm::Key::WILDCARD
+    ].each do |realm_type|
+      context "Origin[manual], Realm[#{realm_type}], Public[Username], Private[Password]" do
+        let(:login_data) {{
+          workspace_id: workspace.id,
+          user_id: user.id,
+          realm_key: realm_type,
+          realm_value: 'Some Value',
+          origin_type: :manual,
+          username: 'admin',
+          private_data: 'password',
+          private_type: :password,
+          workspace_id: workspace.id,
+          address: service.host.address,
+          port: service.port,
+          service_name: service.name,
+          protocol: service.proto,
+          last_attempted_at: DateTime.current,
+          status: Metasploit::Model::Login::Status::SUCCESSFUL,
+        }}
+        it 'creates a credential core' do
+          expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Core.count }.by(1)
+        end
+        it "creates a Realm with #{realm_type} key" do
+          expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Realm.where(key: realm_type).count }.by(1)
+        end
+        it 'creates a Private with data \'password\'' do
+          expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Private.where(data: 'password').count }.by(1)
+        end
+        it 'creates a Public with username \'username\'' do
+          expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Public.where(username: 'admin').count }.by(1)
+        end
+        it 'creates a Login with status for the service' do
+          expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Login.where(service_id: service.id, status: login_data[:status]).count }.by(1)
+        end
+      end
+    end
+    
+    {
+      "Metasploit::Credential::Username" => 'admin',
+      "Metasploit::Credential::BlankUsername" => ''
+    }.each_pair do |public_type, public_value|
+      context "Origin[manual], Public[#{public_type}], Private[Password]" do
+        let(:login_data) {{
+          workspace_id: workspace.id,
+          user_id: user.id,
+          origin_type: :manual,
+          username: public_value,
+          private_data: 'password',
+          private_type: :password,
+          workspace_id: workspace.id,
+          address: service.host.address,
+          port: service.port,
+          service_name: service.name,
+          protocol: service.proto,
+          last_attempted_at: DateTime.current,
+          status: Metasploit::Model::Login::Status::SUCCESSFUL,
+        }}
+        it 'creates a credential core' do
+          expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Core.count }.by(1)
+        end
+        it 'creates a Private with data \'password\'' do
+          expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Private.where(data: 'password').count }.by(1)
+        end
+        it 'creates a Public with username \'username\'' do
+          expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Public.where(type: public_type).count }.by(1)
+        end
+        it 'creates a Login with status for the service' do
+          expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Login.where(service_id: service.id, status: login_data[:status]).count }.by(1)
+        end
+      end 
+    end
+    {
+      password: "Metasploit::Credential::Password",
+      blank_password: "Metasploit::Credential::BlankPassword",
+      nonreplayable_hash: "Metasploit::Credential::NonreplayableHash",
+      ntlm_hash: "Metasploit::Credential::NTLMHash",
+      postgres_md5: "Metasploit::Credential::PostgresMD5",
+      ssh_key: "Metasploit::Credential::SSHKey"
+    }.each_pair do |private_type, public_class|
+      context "Origin[manual], Public[Username], Private[#{private_type}]" do
+        let(:ssh_key) {
+          key_class = OpenSSL::PKey.const_get(:RSA)
+          key_class.generate(512).to_s
+        }
+        let(:private_data) { {
+          password: 'password',
+          blank_password: '',
+          nonreplayable_hash: '435ba65d2e46d35bc656086694868d1ab2c0f9fd',
+          ntlm_hash: 'aad3b435b51404eeaad3b435b51404ee:31d6cfe0d16ae931b73c59d7e0c089c0',
+          postgres_md5: 'md5ac4bbe016b808c3c0b816981f240dcae',
+          ssh_key: ssh_key
+        }}
+        let(:login_data) {{
+          workspace_id: workspace.id,
+          user_id: user.id,
+          origin_type: :manual,
+          username: 'admin',
+          private_data: private_data[private_type],
+          private_type: private_type,
+          workspace_id: workspace.id,
+          address: service.host.address,
+          port: service.port,
+          service_name: service.name,
+          protocol: service.proto,
+          last_attempted_at: DateTime.current,
+          status: Metasploit::Model::Login::Status::SUCCESSFUL,
+        }}
+        it 'creates a credential core' do
+          expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Core.count }.by(1)
+        end
+        it 'creates a Private with data \'password\'' do
+          expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Private.where(type: public_class).count }.by(1)
+        end
+        it 'creates a Public with username \'username\'' do
+          expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Public.where(username: 'admin').count }.by(1)
+        end
+        it 'creates a Login with status for the service' do
+          expect{ test_object.create_credential_and_login(login_data) }.to change{ Metasploit::Credential::Login.where(service_id: service.id, status: login_data[:status]).count }.by(1)
+        end
+      end 
+    end
+  end
 
   context '#create_cracked_credential' do
     let(:public) { FactoryGirl.create(:metasploit_credential_public) }
@@ -34,7 +386,7 @@ RSpec.describe Metasploit::Credential::Creation do
             username: public.username,
             password: password
         )
-      }.to change{Metasploit::Credential::Core.count}.by(1)
+      }.to change{ Metasploit::Credential::Core.count }.by(1)
       expect(Metasploit::Credential::Private.last).to be_a Metasploit::Credential::Password
     end
 
@@ -46,7 +398,7 @@ RSpec.describe Metasploit::Credential::Creation do
           username: public.username,
           password: password
         )
-      }.to change{Metasploit::Credential::Core.count}.by(1)
+      }.to change{ Metasploit::Credential::Core.count }.by(1)
       expect(Metasploit::Credential::Core.last.realm).to eq(realm)
     end
 
@@ -85,7 +437,7 @@ RSpec.describe Metasploit::Credential::Creation do
       opts = {
           filename: "test_import.xml",
       }
-      expect { test_object.create_credential_origin_import(opts)}.to change{Metasploit::Credential::Origin::Import.count}.by(1)
+      expect { test_object.create_credential_origin_import(opts)}.to change{ Metasploit::Credential::Origin::Import.count }.by(1)
     end
 
     it 'should return nil if there is no database connection' do
@@ -100,7 +452,7 @@ RSpec.describe Metasploit::Credential::Creation do
             task_id: task.id
         }
         test_object.create_credential_origin_import(opts)
-        expect { test_object.create_credential_origin_import(opts)}.to_not change{Metasploit::Credential::Origin::Import.count}
+        expect { test_object.create_credential_origin_import(opts)}.to_not change{ Metasploit::Credential::Origin::Import.count }
       end
     end
 
@@ -119,7 +471,7 @@ RSpec.describe Metasploit::Credential::Creation do
       opts = {
           user_id: user.id
       }
-      expect { test_object.create_credential_origin_manual(opts)}.to change{Metasploit::Credential::Origin::Manual.count}.by(1)
+      expect { test_object.create_credential_origin_manual(opts)}.to change{ Metasploit::Credential::Origin::Manual.count }.by(1)
     end
 
     it 'should return nil if there is no database connection' do
@@ -133,7 +485,7 @@ RSpec.describe Metasploit::Credential::Creation do
             user_id: user.id
         }
         test_object.create_credential_origin_manual(opts)
-        expect { test_object.create_credential_origin_manual(opts)}.to_not change{Metasploit::Credential::Origin::Manual.count}
+        expect { test_object.create_credential_origin_manual(opts)}.to_not change{ Metasploit::Credential::Origin::Manual.count }
       end
     end
 
@@ -173,7 +525,7 @@ RSpec.describe Metasploit::Credential::Creation do
           workspace_id: workspace.id,
           origin_type: :service
       }
-      expect { test_object.create_credential_origin_service(opts)}.to change{Metasploit::Credential::Origin::Service.count}.by(1)
+      expect { test_object.create_credential_origin_service(opts)}.to change{ Metasploit::Credential::Origin::Service.count }.by(1)
     end
 
     it 'should return nil if there is no database connection' do
@@ -194,7 +546,7 @@ RSpec.describe Metasploit::Credential::Creation do
             origin_type: :service
         }
         FactoryGirl.create(:mdm_host, address: opts[:address], workspace_id: opts[:workspace_id])
-        expect { test_object.create_credential_origin_service(opts)}.to_not change{Mdm::Host.count}
+        expect { test_object.create_credential_origin_service(opts)}.to_not change{Mdm::Host.count }
       end
     end
 
@@ -209,7 +561,7 @@ RSpec.describe Metasploit::Credential::Creation do
             workspace_id: workspace.id,
             origin_type: :service
         }
-        expect { test_object.create_credential_origin_service(opts)}.to change{Mdm::Host.count}.by(1)
+        expect { test_object.create_credential_origin_service(opts)}.to change{Mdm::Host.count }.by(1)
       end
     end
 
@@ -226,7 +578,7 @@ RSpec.describe Metasploit::Credential::Creation do
         }
         host = FactoryGirl.create(:mdm_host, address: opts[:address], workspace_id: opts[:workspace_id])
         FactoryGirl.create(:mdm_service, host_id: host.id, port: opts[:port], proto: opts[:protocol])
-        expect { test_object.create_credential_origin_service(opts)}.to_not change{Mdm::Service.count}
+        expect { test_object.create_credential_origin_service(opts)}.to_not change{Mdm::Service.count }
       end
     end
 
@@ -241,7 +593,7 @@ RSpec.describe Metasploit::Credential::Creation do
             workspace_id: workspace.id,
             origin_type: :service
         }
-        expect { test_object.create_credential_origin_service(opts)}.to change{Mdm::Service.count}.by(1)
+        expect { test_object.create_credential_origin_service(opts)}.to change{Mdm::Service.count }.by(1)
       end
     end
 
@@ -257,7 +609,7 @@ RSpec.describe Metasploit::Credential::Creation do
             origin_type: :service
         }
         test_object.create_credential_origin_service(opts)
-        expect { test_object.create_credential_origin_service(opts)}.to_not change{Metasploit::Credential::Origin::Service.count}
+        expect { test_object.create_credential_origin_service(opts)}.to_not change{ Metasploit::Credential::Origin::Service.count }
       end
     end
 
@@ -275,7 +627,7 @@ RSpec.describe Metasploit::Credential::Creation do
           post_reference_name: 'windows/gather/hashdump',
           session_id: session.id
       }
-      expect { test_object.create_credential_origin_session(opts)}.to change{Metasploit::Credential::Origin::Session.count}.by(1)
+      expect { test_object.create_credential_origin_session(opts)}.to change{ Metasploit::Credential::Origin::Session.count }.by(1)
     end
 
     it 'should return nil if there is no database connection' do
@@ -290,7 +642,7 @@ RSpec.describe Metasploit::Credential::Creation do
             session_id: session.id
         }
         test_object.create_credential_origin_session(opts)
-        expect { test_object.create_credential_origin_session(opts)}.to_not change{Metasploit::Credential::Origin::Session.count}
+        expect { test_object.create_credential_origin_session(opts)}.to_not change{ Metasploit::Credential::Origin::Session.count }
       end
     end
 
@@ -359,7 +711,7 @@ RSpec.describe Metasploit::Credential::Creation do
           post_reference_name: 'windows/gather/hashdump',
           session_id: session.id
       }
-      expect{test_object.create_credential_origin(opts)}.to raise_error ArgumentError, "Unknown Origin Type "
+      expect{ test_object.create_credential_origin(opts)}.to raise_error ArgumentError, "Unknown Origin Type "
     end
 
     it 'raises an exception if given an invalid origin type' do
@@ -368,7 +720,7 @@ RSpec.describe Metasploit::Credential::Creation do
           post_reference_name: 'windows/gather/hashdump',
           session_id: session.id
       }
-      expect{test_object.create_credential_origin(opts)}.to raise_error ArgumentError, "Unknown Origin Type aaaaa"
+      expect{ test_object.create_credential_origin(opts)}.to raise_error ArgumentError, "Unknown Origin Type aaaaa"
     end
   end
 
@@ -378,7 +730,7 @@ RSpec.describe Metasploit::Credential::Creation do
           realm_key: 'Active Directory Domain',
           realm_value: 'contosso'
       }
-      expect { test_object.create_credential_realm(opts)}.to change{Metasploit::Credential::Realm.count}.by(1)
+      expect { test_object.create_credential_realm(opts)}.to change{ Metasploit::Credential::Realm.count }.by(1)
     end
 
     it 'should return nil if there is no database connection' do
@@ -393,7 +745,7 @@ RSpec.describe Metasploit::Credential::Creation do
             realm_value: 'contosso'
         }
         test_object.create_credential_realm(opts)
-        expect { test_object.create_credential_realm(opts)}.to_not change{Metasploit::Credential::Realm.count}
+        expect { test_object.create_credential_realm(opts)}.to_not change{ Metasploit::Credential::Realm.count }
       end
     end
 
@@ -424,7 +776,7 @@ RSpec.describe Metasploit::Credential::Creation do
             private_data: 'password1',
             private_type: :password
         }
-        expect{ test_object.create_credential_private(opts) }.to change{Metasploit::Credential::Password.count}.by(1)
+        expect{ test_object.create_credential_private(opts) }.to change{ Metasploit::Credential::Password.count }.by(1)
       end
     end
 
@@ -434,7 +786,7 @@ RSpec.describe Metasploit::Credential::Creation do
             private_data: OpenSSL::PKey::RSA.generate(2048).to_s,
             private_type: :ssh_key
         }
-        expect{ test_object.create_credential_private(opts) }.to change{Metasploit::Credential::SSHKey.count}.by(1)
+        expect{ test_object.create_credential_private(opts) }.to change{ Metasploit::Credential::SSHKey.count }.by(1)
       end
     end
 
@@ -444,7 +796,7 @@ RSpec.describe Metasploit::Credential::Creation do
             private_data: Metasploit::Credential::NTLMHash.data_from_password_data('password1'),
             private_type: :ntlm_hash
         }
-        expect{ test_object.create_credential_private(opts) }.to change{Metasploit::Credential::NTLMHash.count}.by(1)
+        expect{ test_object.create_credential_private(opts) }.to change{ Metasploit::Credential::NTLMHash.count }.by(1)
       end
     end
 
@@ -454,7 +806,7 @@ RSpec.describe Metasploit::Credential::Creation do
             private_data: '10b222970537b97919db36ec757370d2',
             private_type: :nonreplayable_hash
         }
-        expect{ test_object.create_credential_private(opts) }.to change{Metasploit::Credential::NonreplayableHash.count}.by(1)
+        expect{ test_object.create_credential_private(opts) }.to change{ Metasploit::Credential::NonreplayableHash.count }.by(1)
       end
     end
 
@@ -469,23 +821,6 @@ RSpec.describe Metasploit::Credential::Creation do
     end
   end
 
-  context '#create_credential' do
-
-    it 'associates the new Metasploit::Credential::Core with a task if passed' do
-      opts = {
-          origin_type: :manual,
-           user_id: user.id,
-          username: 'username',
-          private_data: 'password',
-          workspace_id: workspace.id,
-          task_id: task.id
-      }
-      core = test_object.create_credential(opts)
-      expect(core.tasks).to include(task)
-    end
-
-  end
-
   context '#create_credential_core' do
     let(:origin)    { FactoryGirl.create(:metasploit_credential_origin_service) }
     let(:public)    { FactoryGirl.create(:metasploit_credential_public)}
@@ -512,7 +847,7 @@ RSpec.describe Metasploit::Credential::Creation do
           realm: realm,
           workspace_id: workspace.id
       }
-      expect{test_object.create_credential_core(opts)}.to change{Metasploit::Credential::Core.count}.by(1)
+      expect{ test_object.create_credential_core(opts)}.to change{ Metasploit::Credential::Core.count }.by(1)
     end
     it 'associates the new Metasploit::Credential::Core with a task if passed' do
       opts = {
@@ -546,7 +881,7 @@ RSpec.describe Metasploit::Credential::Creation do
         last_attempted_at: DateTime.current,
         status: Metasploit::Model::Login::Status::SUCCESSFUL,
       }
-      expect{test_object.create_credential_login(login_data)}.to change{Metasploit::Credential::Login.count}.by(1)
+      expect{ test_object.create_credential_login(login_data) }.to change{ Metasploit::Credential::Login.count }.by(1)
     end
     it "associates the Metasploit::Credential::Core with a task if passed" do
       login_data = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-credential
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Luke Imhoff
@@ -86,7 +86,7 @@ cert_chain:
   2SpuQH+SWteq3NXkAmFEEqvLJQ4sbptZt8OP8ghL3pVAvZNFmww/YVszSkShSzcg
   QdihYCSEL2drS2cFd50jBeq71sxUtxbv82DUa2b+
   -----END CERTIFICATE-----
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-concern