Updated version. Added holiday checks

4 files changed, 118 insertions, 119 deletions

diff --git a/debian/changelog b/debian/changelog
index 9b0b1b4..88dd009 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mauvealert (3.5.2) stable; urgency=low
+
+  * Added holiday checks
+  * Suppression now a bit less jumpy.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 31 Aug 2011 13:07:50 +0100
+
 mauvealert (3.5.1) stable; urgency=low
 
   * Fixed XMPP interface to allow ack's from groupchat.
diff --git a/lib/mauve/calendar_interface.rb b/lib/mauve/calendar_interface.rb
index 20c884c..4479bf4 100644
--- a/lib/mauve/calendar_interface.rb
+++ b/lib/mauve/calendar_interface.rb
@@ -15,132 +15,125 @@ module Mauve
   # @author yann Golanski.
   class CalendarInterface 
     
-    TIMEOUT = 7
-
-    public
-
-    # Gets a list of ssologin on support.
-    #
-    # Class method.
-    #
-    # @param [String] url A Calendar API url.
-    # @return [Array] A list of all the username on support.
-    def self.get_users_on_support(url)
-      result = get_URL(url)
-      logger = Log4r::Logger.new "Mauve::CalendarInterface"
-      logger.debug("Cheching who is on support: #{result}")
-      return result 
-    end
+    class << self
 
-    # Check to see if the user is on support.
-    #
-    # Class method.
-    #
-    # @param [String] url A Calendar API url.
-    # @param [String] usr User single sign on.
-    # @return [Boolean] True if on support, false otherwise.
-    def self.is_user_on_support?(url, usr)
-      logger = Log4r::Logger.new "Mauve::CalendarInterface"
-      list = get_URL(url)
-      if true == list.include?("nobody")
-        logger.error("Nobody is on support thus alerts are ignored.")
-        return false
+      def logger
+        @logger ||= Log4r::Logger.new(self.to_s)
       end
-      result = list.include?(usr)
-      logger.debug("Cheching if #{usr} is on support: #{result}")
-      return result
-    end
 
-    # Check to see if the user is on holiday.
-    #
-    # Class method.
-    #
-    # @param [String] url A Calendar API url.
-    # @param [String] usr User single sign on.
-    # @return [Boolean] True if on holiday, false otherwise.
-    def self.is_user_on_holiday?(url, usr)
-      list = get_URL(url)
-      return false if true == list.nil? or true == list.empty?
-      pattern = /[\d]{4}-[\d]{2}-[\d]{2}\s[\d]{2}:[\d]{2}:[\d]{2}/
-      result = (list[0].match(pattern))? true : false
-      logger = Log4r::Logger.new "Mauve::CalendarInterface"
-      logger.debug("Cheching if #{usr} is on holiday: #{result}")
-      return result
-    end
+      # Gets a list of ssologin on support.
+      #
+      # Class method.
+      #
+      # @param [String] url A Calendar API url.
+      # @return [Array] A list of all the username on support.
+      def get_users_on_support(url)
+        result = do_get(url)
 
-  
-    private
-
-    # Gets a URL from the wide web.
-    #
-    # Must NOT crash Mauveserver.
-    #
-    # Class method.
-    #
-    # @TODO: boot this in its own class since list of ips will need it too.
-    #
-    # @param [String] url A Calendar API url.
-    # @retur [Array] An array of strings, each newline creates an new item.
-    def self.get_URL (uri_str, limit = 11)
-
-      logger = Log4r::Logger.new "Mauve::CalendarInterface"
-      
-      if 0 == limit
-        logger.warn("HTTP redirect deeper than 11 on #{uri_str}.")
-        return false
-      end
-      
-      begin
-        uri_str = 'http://' + uri_str unless uri_str.match(uri_str) 
-        url = URI.parse(uri_str)
-        http = Net::HTTP.new(url.host, url.port)
-        http.open_timeout = TIMEOUT
-        http.read_timeout = TIMEOUT
-        if (url.scheme == "https")
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        end
-        response = nil
-        if nil == url.query
-          response = http.start { http.get(url.path) }
+        if result.is_a?(String)
+          result = result.split("\n")
         else
-          response = http.start { http.get("#{url.path}?#{url.query}") }
+          result = []
         end
-        case response
-        when Net::HTTPRedirection
-          then
-          newURL = response['location'].match(/^http/)?
-            response['Location']:
-            uri_str+response['Location']
-          self.getURL(newURL, limit-1)
+
+        return result
+      end
+
+      # Check to see if the user is on support.
+      #
+      # Class method.
+      #
+      # @param [String] url A Calendar API url.
+      # @param [String] usr User single sign on.
+      # @return [Boolean] True if on support, false otherwise.
+      def is_user_on_support?(url, usr)
+        return get_users_on_support(url).include?(usr)
+      end
+
+      # Check to see if the user is on holiday.
+      #
+      # Class method.
+      #
+      # @param [String] url A Calendar API url.
+      # @param [String] usr User single sign on.
+      # @return [Boolean] True if on holiday, false otherwise.
+      def is_user_on_holiday?(url, usr)
+        result = do_get(url)
+
+        if result.is_a?(String) and result =~ /^\d{4}(-\d\d){2}[ T](\d\d:){2}\d\d/
+          return result
         else
-          return response.body.split("\n")
+          return false
         end
-      rescue Errno::EHOSTUNREACH => ex
-        logger.warn("no route to host.")
-        return Array.new
-      rescue Timeout::Error => ex
-        logger.warn("time out reached.")
-        return Array.new
-      rescue ArgumentError => ex
-        unless uri_str.match(/\/$/)
-          logger.debug("Potential missing '/' at the end of hostname #{uri_str}")
-          uri_str += "/"
-          retry
-        else
-          str = "ArgumentError raise: #{ex.message} #{ex.backtrace.join("\n")}"
-          logger.fatal(str)
-          return Array.new
-          #raise ex
+      end
+
+    
+      private
+
+      # Grab a URL from the wide web.
+      #
+      # @TODO: boot this in its own class since list of ips will need it too.
+      #
+      # @param [String] uri -- a URL
+      # @return [String or nil] -- the contents of the URI or nil if an error has been encountered.
+      #
+      def do_get (uri, limit = 11)
+
+        if 0 == limit
+          logger.warn("HTTP redirect too deep for #{uri}.")
+          return nil
+        end
+        
+        begin
+          uri = URI.parse(uri) unless uri.is_a?(URI::HTTP)
+
+          raise ArgumentError, "#{uri_str.inspect} doesn't look like an HTTP uri" unless uri.is_a?(URI::HTTP)
+
+          http = Net::HTTP.new(uri.host, uri.port)
+
+          http.open_timeout = http.read_timeout = TIMEOUT
+ 
+          if (uri.scheme == "https")
+            http.use_ssl = true
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          end
+
+          response = http.start { http.get(uri.request_uri()) }
+
+          if response.is_a?(Net::HTTPOK)
+              return response.body
+
+          elsif response.is_a?(Net::HTTPRedirection) and response.has_key?('Location')
+            location = response['Location']
+            
+            #
+            # Bodge locations..
+            #
+            if location =~ /^\//
+              location = uri.class.build([uri.userinfo, uri.host, uri.port, nil, nil, nil]).to_s + location
+            end
+
+            return do_get(location, limit-1) 
+
+          else
+            logger.warn("Request to #{uri.to_s} returned #{response.code} #{response.message}.")
+            return nil
+
+          end
+
+        rescue Timeout::Error => ex
+          logger.error("Time out reached during fetch of #{uri.to_s}.")
+
+        rescue StandardError => ex
+          logger.error("Time out reached during fetch of #{uri.to_s}.")
+
         end
-      rescue => ex
-        str = "ArgumentError raise: #{ex.message} #{ex.backtrace.join("\n")}"
-        logger.fatal(str)
-        return Array.new
-        #raise ex
+
+        return nil
       end
 
     end
+
   end
 
 end
diff --git a/lib/mauve/person.rb b/lib/mauve/person.rb
index c26c456..5484271 100644
--- a/lib/mauve/person.rb
+++ b/lib/mauve/person.rb
@@ -118,14 +118,13 @@ module Mauve
       # We only suppress notifications if we were suppressed before we started,
       # and are still suppressed.
       #
-      if was_suppressed and self.suppressed?
+      if (was_suppressed and self.suppressed?) or self.is_on_holiday?
         note =  "#{alert.update_type.capitalize} notification to #{self.username} suppressed"
         logger.info note + " about #{alert}."
         History.create(:alerts => [alert], :type => "notification", :event => note)
         return true 
       end
 
-    
       # FIXME current_alerts is very slow.  So much so it slows everything
       # down.  A lot.  
       result = NotificationCaller.new(
@@ -168,12 +167,12 @@ module Mauve
       end
     end
     
-    protected
     # Whether the person is on holiday or not.
     #
     # @return [Boolean] True if person on holiday, false otherwise.
     def is_on_holiday? ()
-      return false if true == holiday_url.nil? or '' == holiday_url
+      return false if holiday_url.nil? or holiday_url.empty?
+
       return CalendarInterface.is_user_on_holiday?(holiday_url, username)
     end
 
diff --git a/lib/mauve/version.rb b/lib/mauve/version.rb
index a846291..c473b83 100644
--- a/lib/mauve/version.rb
+++ b/lib/mauve/version.rb
@@ -1,5 +1,5 @@
 module Mauve
 
-  VERSION="3.5.1"
+  VERSION="3.5.2"
 
 end