metasploit_data_models 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4025dff28108e5c8947f6b6a3cf804d1a229fc2b
-  data.tar.gz: b628f7bfbb605dcf70be7ecf245e2398cb20f338
+  metadata.gz: 83f4eb115aa26dd700383c116a5ec6b375366ef1
+  data.tar.gz: d56bf1bdb8501bdfcd5294c04ae6095a5e4f1dfe
 SHA512:
-  metadata.gz: b325373dd94bdde2d38d2389f9975670d8867bc9ccc922f047c5efebc054dcf3451c88bff8d2f8bf1486adc196da70c30c11121d105694448fa3ba5c0d274c70
-  data.tar.gz: 87cd515fbfd12d241290d56941cc20983a959fd113b71b7162af6cb5d5eec2a6d9da05e89013ff70476c1d1991e29dbb15f520f951dcca04f5a965a0ac39caca
+  metadata.gz: fd5314538018c26d8ff05e94904968fa84a54f78c1f5156c5394f69a9b00083eb43d37398e1569576cd9dc62f3b0aac7a7ed5f44b69518b0265d773c37ceb460
+  data.tar.gz: ce758ea76068e7078ec25d8193ab6e1558a8f3ba4b1cb1e5f20e5f1add2e1fda516cb759b061c51d942a533be8796513bceb0f9d1543295e5eff7657d54e9029

data/app/models/mdm/workspace.rb

@@ -235,15 +235,12 @@ class Mdm::Workspace < ActiveRecord::Base
   #
   # @return [ActiveRecord::Relation<Mdm::WebForm>]
   def web_forms
-    query = <<-EOQ
-          SELECT DISTINCT web_forms.*
-          FROM hosts, services, web_sites, web_forms
-          WHERE hosts.workspace_id = #{id} AND
-            services.host_id = hosts.id AND
-            web_sites.service_id = services.id AND
-            web_forms.web_site_id = web_sites.id
-    EOQ
-    Mdm::WebForm.find_by_sql(query)
+    Mdm::WebForm.joins(
+      Mdm::WebForm.join_association(:web_site),
+      Mdm::WebSite.join_association(:service),
+      Mdm::Service.join_association(:host),
+      Mdm::Host.join_association(:workspace)
+    ).where(Mdm::Workspace[:id].eq(id)).uniq
   end
 
 
@@ -251,59 +248,43 @@ class Mdm::Workspace < ActiveRecord::Base
   #
   # @return [ActiveRecord::Relation<Mdm::WebPage>]
   def web_pages
-    query = <<-EOQ
-          SELECT DISTINCT web_pages.*
-            FROM hosts, services, web_sites, web_pages
-            WHERE hosts.workspace_id = #{id} AND
-            services.host_id = hosts.id AND
-            web_sites.service_id = services.id AND
-            web_pages.web_site_id = web_sites.id
-    EOQ
-    Mdm::WebPage.find_by_sql(query)
+    Mdm::WebPage.joins(
+      Mdm::WebPage.join_association(:web_site),
+      Mdm::WebSite.join_association(:service),
+      Mdm::Service.join_association(:host),
+      Mdm::Host.join_association(:workspace)
+    ).where(Mdm::Workspace[:id].eq(id)).uniq
   end
 
   # Web sites running on {#services}.
   #
   # @return [ActiveRecord::Relation<Mdm::WebSite>]
   def web_sites
-    query = <<-EOQ
-          SELECT DISTINCT web_sites.*
-            FROM hosts, services, web_sites
-            WHERE hosts.workspace_id = #{id} AND
-            services.host_id = hosts.id AND
-            web_sites.service_id = services.id
-    EOQ
-    Mdm::WebSite.find_by_sql(query)
+    Mdm::WebSite.joins(
+      Mdm::WebSite.join_association(:service),
+      Mdm::Service.join_association(:host),
+      Mdm::Host.join_association(:workspace)
+    ).where(Mdm::Workspace[:id].eq(id)).uniq
+    
   end
 
   # Web vulnerability found on {#web_sites}.
   #
   # @return [ActiveRecord::Relation<Mdm::WebVuln>]
   def web_vulns
-    query = <<-EOQ
-          SELECT DISTINCT web_vulns.*
-          FROM hosts, services, web_sites, web_vulns
-            WHERE hosts.workspace_id = #{id} AND
-            services.host_id = hosts.id AND
-            web_sites.service_id = services.id AND
-            web_vulns.web_site_id = web_sites.id
-    EOQ
-    Mdm::WebVuln.find_by_sql(query)
+    Mdm::WebVuln.joins(
+      Mdm::WebVuln.join_association(:web_site),
+      Mdm::WebSite.join_association(:service),
+      Mdm::Service.join_association(:host),
+      Mdm::Host.join_association(:workspace)
+    ).where(Mdm::Workspace[:id].eq(id)).uniq
   end
 
   # Web forms on {#web_sites}.
   #
   # @return [ActiveRecord::Relation<Mdm::WebForm>]
   def unique_web_forms
-    query = <<-EOQ
-          SELECT DISTINCT web_forms.web_site_id, web_forms.path, web_forms.method, web_forms.query
-            FROM hosts, services, web_sites, web_forms
-            WHERE hosts.workspace_id = #{id} AND
-            services.host_id = hosts.id AND
-            web_sites.service_id = services.id AND
-            web_forms.web_site_id = web_sites.id
-    EOQ
-    Mdm::WebForm.find_by_sql(query)
+    web_forms.select('web_forms.id, web_forms.web_site_id, web_forms.path, web_forms.method, web_forms.query')
   end
 
   # {#unique_web_forms} hosted on `addrs`.

data/lib/metasploit_data_models/version.rb

@@ -10,7 +10,7 @@ module MetasploitDataModels
     # The minor version number, scoped to the {MAJOR} version number.
     MINOR = 2
     # The patch version number, scoped to the {MAJOR} and {MINOR} version numbers.
-    PATCH = 2
+    PATCH = 3
 
     #
     # Module Methods

data/spec/app/models/mdm/workspace_spec.rb

@@ -433,8 +433,7 @@ RSpec.describe Mdm::Workspace, type: :model do
         }
       end
 
-      it 'should return an ActiveRecord:Relation',
-         :pending => 'https://www.pivotaltracker.com/story/show/43219917' do
+      it 'should return an ActiveRecord:Relation' do
         should be_a ActiveRecord::Relation
       end
 
@@ -465,8 +464,7 @@ RSpec.describe Mdm::Workspace, type: :model do
         web_sites
       end
 
-      it 'should return an ActiveRecord:Relation',
-         :pending => 'https://www.pivotaltracker.com/story/show/43219917' do
+      it 'should return an ActiveRecord:Relation' do
         should be_a ActiveRecord::Relation
       end
 
@@ -507,8 +505,7 @@ RSpec.describe Mdm::Workspace, type: :model do
         }
       end
 
-      it 'should return an ActiveRecord:Relation',
-         :pending => 'https://www.pivotaltracker.com/story/show/43219917' do
+      it 'should return an ActiveRecord:Relation' do
         should be_a ActiveRecord::Relation
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Samuel Huckins