Disable TLS certificate verification to make it more worky.

diff --git a/halcyon.cabal b/halcyon.cabal
index da45e30a20c21e3f8e3d6ec2a110f3bd5eeb8dda..ee35e16b52bbb6e339ba8a47f0810c975783517e 100644 (file)
--- a/halcyon.cabal
+++ b/halcyon.cabal
@@ -20,6 +20,7 @@ executable halcyon
     base                        >= 4.6 && < 5,
     bytestring                  >= 0.10,
     cmdargs                     >= 0.10.5,
     base                        >= 4.6 && < 5,
     bytestring                  >= 0.10,
     cmdargs                     >= 0.10.5,

+    connection                  >= 0.2.1,

     configurator                >= 0.2,
     directory                   >= 1.2,
     filepath                    >= 1.3,
     configurator                >= 0.2,
     directory                   >= 1.2,
     filepath                    >= 1.3,


@@ -83,6 +84,7 @@ test-suite testsuite
     base                        >= 4.6 && < 5,
     bytestring                  >= 0.10,
     cmdargs                     >= 0.10.5,
     base                        >= 4.6 && < 5,
     bytestring                  >= 0.10,
     cmdargs                     >= 0.10.5,

+    connection                  >= 0.2.1,

     configurator                >= 0.2,
     directory                   >= 1.2,
     filepath                    >= 1.3,
     configurator                >= 0.2,
     directory                   >= 1.2,
     filepath                    >= 1.3,

diff --git a/src/Mail.hs b/src/Mail.hs
index 3faa789a165a7235000db77dd93c5f706dad7de4..dcb686c4837f349ae9d29e367c5f3094f524484d 100644 (file)
--- a/src/Mail.hs
+++ b/src/Mail.hs
@@ -10,7 +10,6 @@ where
 import Control.Concurrent ( forkIO, newEmptyMVar, putMVar, readMVar )
 import Control.Exception ( evaluate )
 import Control.Monad ( liftM )
 import Control.Concurrent ( forkIO, newEmptyMVar, putMVar, readMVar )
 import Control.Exception ( evaluate )
 import Control.Monad ( liftM )

-import Data.List ( intercalate )

 import Data.Time ( formatTime, getZonedTime )
 import System.Console.CmdArgs.Default ( Default(..) )
 import System.Exit ( ExitCode(..) )
 import Data.Time ( formatTime, getZonedTime )
 import System.Console.CmdArgs.Default ( Default(..) )
 import System.Exit ( ExitCode(..) )


@@ -81,7 +80,7 @@ to_rfc822 m =
     formatted_headers =
       if null (headers m)
       then ""
     formatted_headers =
       if null (headers m)
       then ""

-      else (intercalate "\n" (headers m)) ++ "\n"
+      else unlines (headers m)

 
 
 
 
 
 

diff --git a/src/Twitter/Http.hs b/src/Twitter/Http.hs
index 21e47ba1b6352f71b5f5d439f6cf94e848c78c19..6862ffc0f8f23b3d7485c2f82ea86da4ff21bf81 100644 (file)
--- a/src/Twitter/Http.hs
+++ b/src/Twitter/Http.hs
@@ -6,12 +6,14 @@ where
 
 import qualified Data.ByteString.Lazy as B ( ByteString )
 import qualified Data.ByteString.Char8 as BC ( pack )
 
 import qualified Data.ByteString.Lazy as B ( ByteString )
 import qualified Data.ByteString.Char8 as BC ( pack )

+import Network.Connection ( TLSSettings(..) )

 import Network.HTTP.Client (
 import Network.HTTP.Client (

+  ManagerSettings,

   httpLbs,
   newManager,
   parseUrl,
   responseBody )
   httpLbs,
   newManager,
   parseUrl,
   responseBody )

-import Network.HTTP.Client.TLS ( tlsManagerSettings )
+import Network.HTTP.Client.TLS ( mkManagerSettings )

 import Web.Authenticate.OAuth (
   OAuth(..),
   Credential,
 import Web.Authenticate.OAuth (
   OAuth(..),
   Credential,


@@ -74,12 +76,32 @@ get_user_new_statuses cfg username last_status_id = do
   http_get cfg uri
 
 
   http_get cfg uri
 
 

+-- | The default 'tlsManagerSettings' attempts to verify the
+--   certificate that we get from the server, but it's quite pointless
+--   for our purposes.
+--
+--   The default  'tlsManagerSettings' is constructed is like,
+--
+--     tlsManagerSettings = mkManagerSettings def Nothing
+--
+--   and the 'def' passes in a 'TLSSettings' from
+--   \"Network.Connection\". By constructing our own 'TLSSettings', we
+--   can disable the certificate validation.
+--
+novalidate_tls_manager_settings :: ManagerSettings
+novalidate_tls_manager_settings =
+  mkManagerSettings mytls Nothing
+  where
+    -- The first field is "disable validation"
+    mytls = TLSSettingsSimple True False False
+
+

 -- | Retrieve a URL, or crash. The request is signed using all of the
 --   OAuth junk contained in the configuration.
 --
 http_get :: Cfg -> String -> IO B.ByteString
 http_get cfg url = do
 -- | Retrieve a URL, or crash. The request is signed using all of the
 --   OAuth junk contained in the configuration.
 --
 http_get :: Cfg -> String -> IO B.ByteString
 http_get cfg url = do

-  manager <- newManager tlsManagerSettings
+  manager <- newManager novalidate_tls_manager_settings

   request <- parseUrl url
   signed_request <- signOAuth oauth credential request
   response <- httpLbs signed_request manager
   request <- parseUrl url
   signed_request <- signOAuth oauth credential request
   response <- httpLbs signed_request manager