metasploit_data_models 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83f4eb115aa26dd700383c116a5ec6b375366ef1
-  data.tar.gz: d56bf1bdb8501bdfcd5294c04ae6095a5e4f1dfe
+  metadata.gz: d60b2cfe141cf2b3ad7f5c68c4d2a6c1691efcf7
+  data.tar.gz: 1003666ecbc6ad0995736cbcd760bf9148f9bc28
 SHA512:
-  metadata.gz: fd5314538018c26d8ff05e94904968fa84a54f78c1f5156c5394f69a9b00083eb43d37398e1569576cd9dc62f3b0aac7a7ed5f44b69518b0265d773c37ceb460
-  data.tar.gz: ce758ea76068e7078ec25d8193ab6e1558a8f3ba4b1cb1e5f20e5f1add2e1fda516cb759b061c51d942a533be8796513bceb0f9d1543295e5eff7657d54e9029
+  metadata.gz: 2c9e27ed550c0ce6379b2e1a19ce0ada035fcb5d40526cb5b7617e6c59b27338b619071d87cedab183d20e9b7addecd77339664e9e9dd86eb1dbd92c54961af0
+  data.tar.gz: ef87d2788f0424aa1152f02f6c44947c92fd0a13603a316a99e8456cf90d3df42b46354ff8ac1236787b6b047f4bd9e56afdc14423c90fe2a611cca623239b29

data/app/models/mdm/tag.rb

@@ -82,11 +82,11 @@ class Mdm::Tag < ActiveRecord::Base
   validates :desc,
             :length => {
                 :maximum => ((8 * (2 ** 10)) - 1),
-                :message => "desc must be less than 8k."
+                :message => I18n.t('activerecord.ancestors.mdm/tag.model.errors.messages.length')
             }
   validates :name,
             :format => {
-                :with => /\A[A-Za-z0-9\x2e\x2d_]+\z/, :message => "must be alphanumeric, dots, dashes, or underscores"
+                :with => /\A[A-Za-z0-9\x2e\x2d_]+\z/, :message => I18n.t('activerecord.ancestors.mdm/tag.model.errors.messages.character')
             },
             :presence => true
 

data/config/locales/en.yml

@@ -26,6 +26,12 @@ en:
               os_name:
                 help: "Filters the results by operating system."
       mdm/tag:
+        model:
+          errors:
+            messages:
+              character: "Tag names can only contain alphanumeric characters, dots, dashes, and underscores."
+              length: "desc must be less than 8k."
+
         search:
           operator:
             names:

data/lib/metasploit_data_models/version.rb

@@ -10,7 +10,8 @@ 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 = 3
+    PATCH = 4
+
 
     #
     # Module Methods

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

@@ -37,6 +37,7 @@ RSpec.describe Mdm::Tag, type: :model do
     end
 
     context 'name' do
+      let(:error_msg) {I18n.t('activerecord.ancestors.mdm/tag.model.errors.messages.character')}
       it 'must be present' do
         nameless_tag = FactoryGirl.build(:mdm_tag, :name => nil)
         expect(nameless_tag).not_to be_valid
@@ -49,19 +50,19 @@ RSpec.describe Mdm::Tag, type: :model do
         #Test for various bad inputs we should never allow
         mytag = FactoryGirl.build(:mdm_tag, :name => "A'1")
         expect(mytag).not_to be_valid
-        expect(mytag.errors[:name]).to include('must be alphanumeric, dots, dashes, or underscores')
+        expect(mytag.errors[:name]).to include(error_msg)
         mytag = FactoryGirl.build(:mdm_tag, :name => "A;1")
         expect(mytag).not_to be_valid
-        expect(mytag.errors[:name]).to include('must be alphanumeric, dots, dashes, or underscores')
+        expect(mytag.errors[:name]).to include(error_msg)
         mytag = FactoryGirl.build(:mdm_tag, :name => "A%1")
         expect(mytag).not_to be_valid
-        expect(mytag.errors[:name]).to include('must be alphanumeric, dots, dashes, or underscores')
+        expect(mytag.errors[:name]).to include(error_msg)
         mytag = FactoryGirl.build(:mdm_tag, :name => "A=1")
         expect(mytag).not_to be_valid
-        expect(mytag.errors[:name]).to include('must be alphanumeric, dots, dashes, or underscores')
+        expect(mytag.errors[:name]).to include(error_msg)
         mytag = FactoryGirl.build(:mdm_tag, :name => "#A1")
         expect(mytag).not_to be_valid
-        expect(mytag.errors[:name]).to include('must be alphanumeric, dots, dashes, or underscores')
+        expect(mytag.errors[:name]).to include(error_msg)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Samuel Huckins
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-version