Calendar now honours ssl verify + http timeout settings.

3 files changed, 13 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 715b756..39dfebb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mauvealert (3.8.1) stable; urgency=low
+
+  * Calendar now honours http timeout + ssl verify settings.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Fri, 27 Apr 2012 09:11:17 +0100
+
 mauvealert (3.8.0) stable; urgency=low
 
   * HTML sanitizing only takes place if the text looks like HTML.
@@ -32,8 +38,9 @@ mauvealert (3.7.8) stable; urgency=low
     buffer make the disconnection betweeen the processing loop and
     notifications happen sooner.
   * Manpage typo sorted out.
+  * -
 
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 18 Apr 2012 12:10:07 +0100
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Fri, 27 Apr 2012 09:10:37 +0100
 
 mauvealert (3.7.7) stable; urgency=low
 
diff --git a/lib/mauve/authentication.rb b/lib/mauve/authentication.rb
index 24c6bd3..2637047 100644
--- a/lib/mauve/authentication.rb
+++ b/lib/mauve/authentication.rb
@@ -113,7 +113,7 @@ module Mauve
       # Make sure we verify our peer before attempting login.
       #
       if client.http.use_ssl?
-        client.http.ca_path     = "/etc/ssl/certs/"
+        client.http.ca_path     = "/etc/ssl/certs/" if File.directory?("/etc/ssl/certs")
         client.http.verify_mode = Configuration.current.remote_https_verify_mode
       end
 
diff --git a/lib/mauve/calendar_interface.rb b/lib/mauve/calendar_interface.rb
index 692981d..d0a6c52 100644
--- a/lib/mauve/calendar_interface.rb
+++ b/lib/mauve/calendar_interface.rb
@@ -95,11 +95,12 @@ module Mauve
           #
           # Five second timeouts.
           #
-          http.open_timeout = http.read_timeout = 5
+          http.open_timeout = http.read_timeout = Configuration.current.remote_http_timeout || 5
  
           if (uri.scheme == "https")
-            http.use_ssl = true
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+            http.use_ssl     = true
+            http.ca_path     = "/etc/ssl/certs/" if File.directory?("/etc/ssl/certs")
+            http.verify_mode = Configuration.current.remote_https_verify_mode || OpenSSL::SSL::VERIFY_NONE
           end
 
           response = http.start { http.get(uri.request_uri()) }