metasploit_data_models 0.22.2-java → 0.22.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 703619595ed4157d465b8c3452d7a2448c0a7aeb
-  data.tar.gz: 84e23d000a56b7c15569bdc6140475672fd466e5
+  metadata.gz: 0c95936fada78f2510c3f2b4feb776c630ee04ba
+  data.tar.gz: c861d190758743f8412d34eb451d5719a08740ef
 SHA512:
-  metadata.gz: 84019d5b0aa840b29ab44b93338531435fc2a13829264f3468f10866342eca6e6e6e994933173cf51a2fd97f6e021b59bc56cd319bf5edae75ddfb95ae19a7ca
-  data.tar.gz: a6a430993271b3187cb61221e255e5cc407b5d10d69fe0b6b658c1494268fe13a5f291d23fde94af23dddb87ebea7f8eeec982e928ff44f02d8bec1b954d7296
+  metadata.gz: aebb116fca12dc00105669f0c5160718bb66c3ed68ab54774c3bc220cf50e6baef4a8cbf4c8f1b5a1f00344c4e8f4c3b7bdbc27dd616b96191459756e33ab900
+  data.tar.gz: 22fcef2c702f9b2fa217eb41e344372a710f0d3e2ec01d8f377b61ee27d45bfdb39efbc1691567d24ed2c5bc3458456f7ed1cc007a907b1b8c29b96aaa5658f8

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: java
 authors:
 - Samuel Huckins