flapjack 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d001e3be416a31b890c1d7342e31318de35883b6
-  data.tar.gz: 2fbab643fdaf9689ad1e7cb7b021c8e0c5269405
+  metadata.gz: 0b98530923891264cb55c429358ca9597f1ef4ca
+  data.tar.gz: c957beff3e8d6942157ac1e085cd912932f9e287
 SHA512:
-  metadata.gz: ee9dd7d134bf6c3077ba7dbad4299538e1765073a6a3c5ecdaa3076b6caf944a146885bae9ae85d27541fc091d58eca39ffa819713eae35ff3e489f94a74d42e
-  data.tar.gz: 8b132804ab7416c6110bc607322aeef2ae6bf16741e4f06f744625cdfeaf230dd9dab0f7c8622f7887ab00a2603272466d6c86985403448d9399550900025afa
+  metadata.gz: dd3e6b3b9af05c5f40ea6f884f985d7b5d6765eb4493f40ee12a12f8a51360933c971227b0afab1f0dd6b57f8c851c5e39276300e319610598208c945288f7aa
+  data.tar.gz: 8ecf0255ef2f7e6cdac040f62a3b8468138bb74bca9e024fbf8111d8743bedba5d861791d2d17ace0cba27ee70c0befc12155195b79b60ae9e4e2ad4ae31f861

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Flapjack Changelog
 
+# 0.9.1 - 2014-06-27
+- Bug: PATCHing blackhole properties for notification rule changes other blackholes - further fixes #504 (@ali-graham)
+- Bug: JSONAPI get all entities/contacts with empty db e3725fc (@ali-graham)
+- Bug: Decommission Check button returning a 404 #538 (@ali-graham)
+- Bug: Weekday number 7 is accepted by the jsonapi but causes Flapjack to crash #549 (@ali-graham)
+
 # 0.9.0 - 2014-05-23
 - Chore: split reports data from entities and checks in jsonapi #525 (@ali-graham)
 

data/lib/flapjack/data/notification.rb

@@ -156,7 +156,8 @@ module Flapjack
               matches_regex_entities = rule_has_regex_entities ? rule.match_regex_entities?(@event_id) : true
 
               ((matches_entity && matches_regex_entities && matches_tags && matches_regex_tags) || ! rule.is_specific?) &&
-                rule_occurring_now?(rule, :contact => contact, :default_timezone => default_timezone)
+                rule_occurring_now?(rule, :contact => contact, :default_timezone => default_timezone,
+                  :logger => logger)
             end
 
             logger.debug "#{matchers.length} matchers remain for this contact after time, entity and tags are matched:"
@@ -280,7 +281,7 @@ module Flapjack
         rule.time_restrictions.any? do |tr|
           # add contact's timezone to the time restriction schedule
           schedule = Flapjack::Data::NotificationRule.
-                       time_restriction_to_icecube_schedule(tr, timezone)
+                       time_restriction_to_icecube_schedule(tr, timezone, :logger => options[:logger])
           schedule && schedule.occurring_at?(usertime)
         end
       end

data/lib/flapjack/data/notification_rule.rb

@@ -68,8 +68,16 @@ module Flapjack
       end
 
       def update(update_data, opts = {})
-        rule_data = @redis.hgetall("notification_rule:#{@id}").merge(update_data.merge(:id => @id))
-        errors = self.class.add_or_update(rule_data, :redis => @redis, :logger => opts[:logger])
+        [:entities, :regex_entities, :tags, :regex_tags,
+         :time_restrictions, :unknown_media, :warning_media, :critical_media,
+         :unknown_blackhole, :warning_blackhole, :critical_blackhole].each do |update_key|
+
+          next if update_data.has_key?(update_key)
+          update_data[update_key] = self.send(update_key)
+        end
+
+        update_data.update(:id => @id, :contact_id => @contact_id)
+        errors = self.class.add_or_update(update_data, :redis => @redis, :logger => opts[:logger])
         return errors unless errors.nil? || errors.empty?
 
         refresh
@@ -85,11 +93,19 @@ module Flapjack
       #
       # We don't want to replicate IceCube's from_hash behaviour here,
       # but we do need to apply some sanity checking on the passed data.
-      def self.time_restriction_to_icecube_schedule(tr, timezone)
-        return unless !tr.nil? && tr.is_a?(Hash)
-        return if timezone.nil? && !timezone.is_a?(ActiveSupport::TimeZone)
-        return unless tr = prepare_time_restriction(tr, timezone)
-        IceCube::Schedule.from_hash(tr)
+      def self.time_restriction_to_icecube_schedule(tr, timezone, opts = {})
+        return if tr.nil? || !tr.is_a?(Hash) ||
+                  timezone.nil? || !timezone.is_a?(ActiveSupport::TimeZone)
+        prepared_restrictions = prepare_time_restriction(tr, timezone)
+        return if prepared_restrictions.nil?
+        IceCube::Schedule.from_hash(prepared_restrictions)
+      rescue ArgumentError => ae
+        if logger = opts[:logger]
+          logger.error "Couldn't parse rule data #{e.class}: #{e.message}"
+          logger.error prepared_restrictions.inspect
+          logger.error e.backtrace.join("\n")
+        end
+        nil
       end
 
       def to_json(*args)
@@ -207,6 +223,7 @@ module Flapjack
         # whitelisting fields, rather than passing through submitted data directly
         tag_data       = rule_data[:tags].is_a?(Set) ? rule_data[:tags].to_a : nil
         regex_tag_data = rule_data[:regex_tags].is_a?(Set) ? rule_data[:regex_tags].to_a : nil
+
         json_rule_data = {
           :id                 => rule_data[:id].to_s,
           :contact_id         => rule_data[:contact_id].to_s,
@@ -222,6 +239,7 @@ module Flapjack
           :warning_blackhole  => rule_data[:warning_blackhole],
           :critical_blackhole => rule_data[:critical_blackhole],
         }
+
         logger.debug("NotificationRule#add_or_update json_rule_data: #{json_rule_data.inspect}") if logger
 
         redis.sadd("contact_notification_rules:#{json_rule_data[:contact_id]}",
@@ -315,10 +333,11 @@ module Flapjack
                  d[:regex_tags].all? {|et| et.is_a?(String)} ) } =>
         "regex_tags must be a tag_set of strings",
 
+        # conversion to a schedule needs a time zone, any one will do
         proc {|d| !d.has_key?(:time_restrictions) ||
                ( d[:time_restrictions].nil? ||
                  d[:time_restrictions].all? {|tr|
-                   !!prepare_time_restriction(symbolize(tr))
+                   !!self.time_restriction_to_icecube_schedule(symbolize(tr), ActiveSupport::TimeZone['UTC'])
                  } )
              } =>
         "time restrictions are invalid",

data/lib/flapjack/gateways/jsonapi/contact_methods.rb

@@ -116,7 +116,7 @@ module Flapjack
               raise Flapjack::Gateways::JSONAPI::ContactsNotFound.new(requested_contacts)
             end
 
-            entity_ids = Flapjack::Data::Contact.entity_ids_for(contacts.map(&:id), :redis => redis)
+            entity_ids = contacts.empty? ? [] : Flapjack::Data::Contact.entity_ids_for(contacts.map(&:id), :redis => redis)
 
             contacts_json = contacts.collect {|contact|
               contact.to_jsonapi(:entity_ids => entity_ids[contact.id])

data/lib/flapjack/gateways/jsonapi/entity_methods.rb

@@ -52,7 +52,7 @@ module Flapjack
               raise Flapjack::Gateways::JSONAPI::EntitiesNotFound.new(requested_entities)
             end
 
-            linked_contact_ids = Flapjack::Data::Entity.contact_ids_for(entities.map(&:id), :redis => redis)
+            linked_contact_ids = entities.empty? ? [] : Flapjack::Data::Entity.contact_ids_for(entities.map(&:id), :redis => redis)
 
             entities_json = entities.collect {|entity|
               entity.to_jsonapi(:contact_ids => linked_contact_ids[entity.id])

data/lib/flapjack/gateways/web.rb

@@ -72,6 +72,8 @@ module Flapjack
 
       include Flapjack::Utility
 
+      set :protection, :except => :path_traversal
+
       set :views, settings.root + '/web/views'
       set :public_folder, settings.root + '/web/public'
 

data/lib/flapjack/version.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end
 

data/spec/lib/flapjack/data/notification_rule_spec.rb

@@ -76,11 +76,10 @@ describe Flapjack::Data::NotificationRule, :redis => true do
 
     expect {
       expect {
-        rule_data[:warning_blackhole] = true
-        errors = rule.update(rule_data)
+        errors = rule.update(:warning_blackhole => true)
         expect(errors).to be_nil
       }.to change { rule.warning_blackhole }.from(false).to(true)
-    }.not_to change { rule.warning_media }
+    }.not_to change { rule.contact_id }
   end
 
   it "converts time restriction data to an IceCube schedule" do
@@ -156,6 +155,34 @@ describe Flapjack::Data::NotificationRule, :redis => true do
       }.not_to change { rule.entities }
     end
 
+    # https://github.com/flapjack/flapjack/issues/549
+    it "fails to add a notification rule with invalid data" do
+      rule_data[:time_restrictions] = [
+        {
+          "start_time" => "2014-06-22 00:00:00",
+          "end_time" => "2015-01-01 00:00:00",
+          "rrules" => [
+            {
+              "validations" => {
+                "day" => [1,2,3,4,5,6,7]
+              },
+              "rule_type" => "Weekly",
+              "interval" => 1,
+              "week_start" => 0
+            }
+          ],
+          "exrules" => [],
+          "rtimes" => [],
+          "extimes" => []
+        }
+      ]
+      rule_or_errors = Flapjack::Data::NotificationRule.add(rule_data, :redis => @redis)
+      expect(rule_or_errors).not_to be_nil
+      expect(rule_or_errors).to be_an(Array)
+      expect(rule_or_errors.size).to eq(1)
+      expect(rule_or_errors).to eq(["Rule time restrictions are invalid"])
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante