sensu 0.9.9.beta.3 → 0.9.9.beta.4

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.9.9.beta.3'
+    VERSION = '0.9.9.beta.4'
 
     DEFAULT_OPTIONS = {
       :config_file => '/etc/sensu/config.json',

data/lib/sensu/sandbox.rb

@@ -0,0 +1,11 @@
+module Sensu
+  module Sandbox
+    def self.eval(expression, value=nil)
+      result = Proc.new do
+        $SAFE = 4
+        Kernel.eval(expression)
+      end
+      result.call
+    end
+  end
+end

data/lib/sensu/server.rb

@@ -1,6 +1,7 @@
 require File.join(File.dirname(__FILE__), 'base')
 require File.join(File.dirname(__FILE__), 'redis')
 require File.join(File.dirname(__FILE__), 'socket')
+require File.join(File.dirname(__FILE__), 'sandbox')
 
 module Sensu
   class Server
@@ -121,10 +122,30 @@ module Sensu
       subdue && subdue_at == (check[:subdue][:at] || 'handler').to_sym
     end
 
+    def filter_attributes_match?(hash_one, hash_two)
+      hash_one.keys.all? do |key|
+        case
+        when hash_one[key] == hash_two[key]
+          true
+        when hash_one[key].is_a?(Hash) && hash_two[key].is_a?(Hash)
+          filter_attributes_match?(hash_one[key], hash_two[key])
+        when hash_one[key].is_a?(String) && hash_one[key].start_with?('eval: ')
+          begin
+            expression = hash_one[key].gsub(/^eval:(\s+)?/, '')
+            !!Sandbox.eval(expression, hash_two[key])
+          rescue
+            false
+          end
+        else
+          false
+        end
+      end
+    end
+
     def event_filtered?(filter_name, event)
       if @settings.filter_exists?(filter_name)
         filter = @settings[:filters][filter_name]
-        matched = hash_values_equal?(filter[:attributes], event)
+        matched = filter_attributes_match?(filter[:attributes], event)
         filter[:negate] ? matched : !matched
       else
         @logger.error('unknown filter', {

data/lib/sensu/utilities.rb

@@ -57,19 +57,5 @@ module Sensu
         diff
       end
     end
-
-    def hash_values_equal?(hash_one, hash_two)
-      hash_one.keys.all? do |key|
-        if hash_one[key] == hash_two[key]
-          true
-        else
-          if hash_one[key].is_a?(Hash) && hash_two[key].is_a?(Hash)
-            hash_values_equal?(hash_one[key], hash_two[key])
-          else
-            false
-          end
-        end
-      end
-    end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 2679144457
+  hash: 1725596175
   prerelease: true
   segments: 
   - 0
   - 9
   - 9
   - beta
-  - 3
-  version: 0.9.9.beta.3
+  - 4
+  version: 0.9.9.beta.4
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-11 00:00:00 -08:00
+date: 2013-01-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -192,6 +192,7 @@ files:
 - lib/sensu/socket.rb
 - lib/sensu/constants.rb
 - lib/sensu/api.rb
+- lib/sensu/sandbox.rb
 - lib/sensu/settings.rb
 - lib/sensu/redis.rb
 - lib/sensu/server.rb