metasploit-credential 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc58a5e5ed24faced9c6f4b0a3e8a7c48304c65e
-  data.tar.gz: fc29c201eb954f08ba9413b109c480b7dfcbd441
+  metadata.gz: f442d7c518fb88b5d296d632a798fa8251f79159
+  data.tar.gz: 580f1859d9614a66dc18ac39601469ac6a98fb3f
 SHA512:
-  metadata.gz: 6b06e8e6dfd0150b0001fac184af6c10f9aa8942c85081fcb9c0e8854907b5ce2380c9242b7b91254a9a98e62b2b9186a5c84f38c78fe9dddeeb4d267d493239
-  data.tar.gz: aec7f1d701c695945f0f8b6c64248bb6f6c03c4cc0bb6d9d71a9b07da18cef0d594fed5540c785aec091d17b5b9f342a208cdd4e0fa2bc4bfd705d4e25194f44
+  metadata.gz: cb6339e14224f2f123c9ee7c05da49c991fa1b2a9ec5e4c7cc568e0252c02f5025ea5981d91c5e47651291267751d799604528cd62c12249a1bc8f1985c22370
+  data.tar.gz: ec32a5757ef994c302f727e7fc4c5cdc5d898da74d65b65988f5dc76bcd3bfde33437fc624f3023e0ee90a56816f471f5cb762c25c2189def5fb91c10940e7c3

data/app/models/metasploit/credential/core.rb

@@ -202,10 +202,12 @@ class Metasploit::Credential::Core < ActiveRecord::Base
   # @scope Metasploit::Credential::Core
   # @param host_id [Integer] the host to look up
   # @return [ActiveRecord::Relation] that contains related Cores
-  scope :originating_host_id, lambda { |host_id|
-    core_table = Metasploit::Credential::Core.arel_table
-    subquery = Metasploit::Credential::Core.cores_from_host_sql(host_id)
-    where(core_table[:id].in(Arel::Nodes::SqlLiteral.new(subquery)))
+  scope :originating_host_id, ->(host_id) {
+    where(
+      Metasploit::Credential::Core[:id].in(
+        Metasploit::Credential::Core.cores_from_host(host_id)
+      )
+    )
   }
 
   # Finds Cores that are attached to a given workspace
@@ -269,31 +271,18 @@ class Metasploit::Credential::Core < ActiveRecord::Base
   # Class Methods
   #
 
-  # Wrapper to provide raw SQL string UNIONing cores from a host via
+  # Provides UNIONing cores from a host via
   # service origins or via session origins.
-  # TODO: Fix this in Rails 4. In Rails 3 there is a known bug that prevents
-  #   .count from being called on the returned ActiveRecord::Relation.
-  #   https://github.com/rails/rails/issues/939
   # @param host_id [Integer]
   # @return [String]
-  def self.cores_from_host_sql(host_id)
+  def self.cores_from_host(host_id)
     left = origin_service_host_id(host_id).ast
     right = origin_session_host_id(host_id).ast
 
-    # TODO: Kill with fire. ActiveRecord 4.0.x leaks order/limit/offset scopes
-    # We strip out order/limit/offset statements from the subquery since it's invalid SQL
-    # https://github.com/rails/rails/issues/14003
-    left.orders = []
-    right.orders = []
-    left.limit = nil
-    right.limit = nil
-    left.offset = nil
-    right.offset = nil
-
-    Arel::Nodes::Union.new(
-      origin_service_host_id(host_id).ast,
-      origin_session_host_id(host_id).ast
-    ).to_sql
+    Arel::Nodes::UnionAll.new(
+      left,
+      right
+    )
   end
 
   #

data/app/models/metasploit/credential/login.rb

@@ -192,7 +192,7 @@ class Metasploit::Credential::Login < ActiveRecord::Base
       Metasploit::Credential::Core[:id].in(
         # We are concerned with per-username access attempts. This
         # can be across any of the cores on a host:
-        Arel::Nodes::SqlLiteral.new(Metasploit::Credential::Core.cores_from_host_sql(host_id))
+        Metasploit::Credential::Core.cores_from_host(host_id)
       ).and(
         Metasploit::Credential::Login[:status].in(
           [

data/lib/metasploit/credential/version.rb

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

data/spec/dummy/config/database.yml

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

metadata

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