metasploit_data_models 0.22.2 → 0.22.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beb915aba1fb4d85ab017f76f7d31ff538913a5a
-  data.tar.gz: b0e62635cdfdec070b670a6f9647e490ee7d6346
+  metadata.gz: 0c7dc8ddf2d81a943835e4557b1fa00525e852a6
+  data.tar.gz: 65bb0813c285665a44ed89c608e750e5afdfda1b
 SHA512:
-  metadata.gz: 02815fdbe61b9a55a542f66eb4a7abd9cd0ee756b4c2d2dce9dbefd70acc8e87bcaa9038ddc9191a4cc33c30cb59bc0bd60e1c8489f497fb579ed9638c570331
-  data.tar.gz: 5bc91a434e144eb058d6fe31c2950d6b6c77ea6cee52583d436f96c065b672a7c2cfdb31847b76cb3d3b0dd7c05b5b932afa5ceb503487e2c8aa33e28ab5eca7
+  metadata.gz: bf07e6ee742d234373cf08b82c43b5edade0b804af31af704f91cc1e1109c88af9113d6c27b1f38172b30c6bf2c0e7a001fafa895a660577a35cf93a667ece72
+  data.tar.gz: 2bdf1f360479034a866c2593f360dc70a37a87db359a594d1711869d0032eb41d731bfb427917084100b7ef407e2d60ffb513bb5dec74c2a0e10013dc952c89a

data/app/models/mdm/service.rb

@@ -222,19 +222,14 @@ class Mdm::Service < ActiveRecord::Base
                 in: PROTOS
             }
 
-  validate :uniq_port_proto_per_host
-
-  # Custom validation to ensure that the combination of port and protocol
-  # for a service doesn't already exist for the same host.
-  def uniq_port_proto_per_host
-    no_dupes = Mdm::Service.where(host_id: host.id, port: port, proto: proto).blank?
-    error_msg = 'This host already has a service with this port and protocol.'
-
-    unless no_dupes
-      errors.add(:port, error_msg)
-      errors.add(:proto, error_msg)
-    end
-  end
+  validates :host_id,
+            uniqueness: {
+              message: 'already has a service with this port and proto',
+              scope: [
+                :port,
+                :proto
+              ]
+            }
 
   #
   # Class Methods

data/lib/metasploit_data_models/version.rb

@@ -6,7 +6,7 @@ module MetasploitDataModels
     # The minor version number, scoped to the {MAJOR} version number.
     MINOR = 22
     # The patch number, scoped to the {MINOR} version number.
-    PATCH = 2
+    PATCH = 3
 
     # The full version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the `PRERELEASE` in the
     # {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0} format.

metadata

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