sensu-settings 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b52b0d7d44f148e43deac0e2450f8e023bc5a6f3
-  data.tar.gz: f9b954ae820cc6256c3ea5981ec2b4fd8b8e9655
+  metadata.gz: d07bac3d033762f1692fc77a8ee78cfa93b8af23
+  data.tar.gz: d51b987e700c9aaa9da75d4486e875acdecbd35f
 SHA512:
-  metadata.gz: 08b52a7c91d24a07b79e116d628bbfe591f5396c43abe6632f4bce65f7c3793eeae5f447b226690076122caf72587e25cb56d9c1b645a7d84d4745dbeda374da
-  data.tar.gz: c5f8afca71385402593b9615b976086218f439504c95fa0b9b2debf64e22e58f54c4cb384d470d7de9cdaa5ed03b3bbc2292b59d803b1992c7d177858037fec6
+  metadata.gz: abf335edc0f6cb4174bf52c1c2a9c3241cca29db316e6ce27d19bcd948d981ff5d5fc20da4cc7314ec39f8d3ea5a7d49d7b12d97d2b0b1d633819af29b76804b
+  data.tar.gz: 440a5744b1bcc636f4ed3b59582918c94c24714c165a62d74b668416c2bfcb68d869d08d12f38cb62a39c2f90fefdda1502ad7e5bb682471a67229d8df13d608

data/lib/sensu/settings/rules.rb

@@ -42,6 +42,7 @@ module Sensu
       def must_be_a_string(value)
         value.is_a?(String)
       end
+      alias_method :is_a_string?, :must_be_a_string
 
       # Check that a value is a string, if set (not nil).
       #

data/lib/sensu/settings/validators/check.rb

@@ -2,6 +2,19 @@ module Sensu
   module Settings
     module Validators
       module Check
+        # Validate check source.
+        # Validates: source
+        #
+        # @param check [Hash] sensu check definition.
+        def validate_check_source(check)
+          if is_a_string?(check[:source])
+            must_match_regex(/^[\w\.-]+$/, check[:source]) ||
+              invalid(check, "check source cannot contain spaces or special characters")
+          else
+            invalid(check, "check source must be a string")
+          end
+        end
+
         # Validate check scheduling.
         # Validates: interval, standalone, subscribers
         #
@@ -69,14 +82,11 @@ module Sensu
             invalid(check, "either check command or extension must be set")
           must_be_a_numeric_if_set(check[:timeout]) ||
             invalid(check, "check timeout must be numeric")
-          must_be_a_string_if_set(check[:source]) ||
-            invalid(check, "check source must be a string")
+          validate_check_source(check) if check[:source]
           validate_check_scheduling(check)
           validate_check_handling(check)
           validate_check_flap_detection(check)
-          if check[:subdue]
-            validate_subdue(check)
-          end
+          validate_subdue(check) if check[:subdue]
         end
       end
     end

data/sensu-settings.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-settings"
-  spec.version       = "1.3.0"
+  spec.version       = "1.4.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu settings library, loader and validator"

data/spec/validator_spec.rb

@@ -145,6 +145,9 @@ describe "Sensu::Settings::Validator" do
     expect(@validator.reset).to eq(1)
     check[:source] = "switch-%42%"
     @validator.validate_check(check)
+    expect(@validator.reset).to eq(1)
+    check[:source] = "switch-42"
+    @validator.validate_check(check)
     expect(@validator.reset).to eq(0)
     check[:extension] = 'foo'
     @validator.validate_check(check)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json