metasploit-credential 2.0.9 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7998b6cf02c5be557c8d7f1572cde894611c953
-  data.tar.gz: 69603488d2bca55a98201e9cdaa3c4b59af94dbc
+  metadata.gz: 1807d97661a3efe9045a071a3d29403adb5547ed
+  data.tar.gz: 6c1894e7fdbebc31283a313789029a4b21bd6803
 SHA512:
-  metadata.gz: 50ea198779d58c01875b42f666c8745755f698bcf4b1d8c7af38704c7bdf3a0789ac3d87fa665c3ac22eab75c7bc5aa84817e1856d349120ebbf6a52bbdeba28
-  data.tar.gz: 9373a0d95c5d441fa2b92f0233f737caf60963887f3ad994fd1158aa1d3348281d1c210f3ea7cdc63421ac73099070d04fd0f709ad68561edac7042d06da4863
+  metadata.gz: 6f9083b61fae53212cbffc74e6cb612d235a1efa8d6d4353a860a987717470bef9a8c13a617c563e17c4d02f276e4adc588f59956b521a009a4f20ffbea616a9
+  data.tar.gz: 82d256807c57c226980b6fc560a3db344c389c3f12d6b07d531ebd3b584ecf27f530f3ae6568d8d759a2345e283229612b9566c98d147a2bb8e8f7cdf6e587d0

data/lib/metasploit/credential/creation.rb

@@ -1,3 +1,5 @@
+require 'rex/socket'
+
 # Implements a set of "convenience methods" for creating credentials and related portions of the object graph.  Creates
 # {Metasploit::Credential::Core} objects and their attendant relationships as well as {Metasploit::Credential::Login}
 # objects and their attendant `Mdm::Host` and `Mdm::Service` objects.
@@ -116,6 +118,7 @@ module Metasploit::Credential::Creation
     else
       origin = create_credential_origin(opts)
     end
+    return nil if origin.nil?
 
     core_opts = {
         origin: origin,
@@ -125,7 +128,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,7 +143,7 @@ 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
@@ -188,8 +191,6 @@ module Metasploit::Credential::Creation
   #       service_name: 'smb',
   #       status: status: Metasploit::Model::Login::Status::UNTRIED
   #     )
-  
-  
   def create_credential_and_login(opts={})
     return nil unless active_db?
 
@@ -205,6 +206,7 @@ module Metasploit::Credential::Creation
     login_object = nil
     retry_transaction do
       service_object = create_credential_service(opts)
+      return nil if service_object.nil?
       login_object = Metasploit::Credential::Login.where(core_id: core.id, service_id: service_object.id).first_or_initialize
 
       if opts[:task_id]
@@ -297,6 +299,7 @@ module Metasploit::Credential::Creation
     login_object = nil
     retry_transaction do
       service_object = create_credential_service(opts)
+      return nil if service_object.nil?
       login_object = Metasploit::Credential::Login.where(core_id: core.id, service_id: service_object.id).first_or_initialize
 
       if opts[:task_id]
@@ -419,13 +422,12 @@ module Metasploit::Credential::Creation
   def create_credential_origin_service(opts={})
     return nil unless active_db?
     module_fullname  = opts.fetch(:module_fullname)
-
     service_object = create_credential_service(opts)
+    return nil if service_object.nil?
 
     retry_transaction do
       Metasploit::Credential::Origin::Service.where(service_id: service_object.id, module_full_name: module_fullname).first_or_create!
     end
-
   end
 
   # This method is responsible for creating {Metasploit::Credential::Origin::Session} objects.
@@ -547,6 +549,7 @@ module Metasploit::Credential::Creation
   def create_credential_service(opts={})
     return nil unless active_db?
     address          = opts.fetch(:address)
+    return nil unless Rex::Socket.is_ipv4?(address) || Rex::Socket.is_ipv6?(address)
     port             = opts.fetch(:port)
     service_name     = opts.fetch(:service_name)
     protocol         = opts.fetch(:protocol)
@@ -577,6 +580,7 @@ module Metasploit::Credential::Creation
   def invalidate_login(opts = {})
     return nil unless active_db?
     address     = opts.fetch(:address)
+    return nil unless Rex::Socket.is_ipv4?(address) || Rex::Socket.is_ipv6?(address)
     port        = opts.fetch(:port)
     protocol    = opts.fetch(:protocol)
     public      = opts.fetch(:username, nil)

data/lib/metasploit/credential/version.rb

@@ -3,7 +3,7 @@
 module Metasploit
   module Credential
     # VERSION is managed by GemRelease
-    VERSION = '2.0.9'
+    VERSION = '2.0.10'
   
     # @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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-credential
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.0.10
 platform: ruby
 authors:
 - Luke Imhoff
@@ -89,7 +89,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-concern
@@ -175,6 +175,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rex-socket
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement