Skip to content

Updating the Haskell stub #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kazu-yamamoto wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updating the Haskell stub #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad0f652
using LTS 12.17 and http-client (>= 0.5) for Haskell TLS.
kazu-yamamoto Nov 6, 2018
dc52217
using ciphersuite_default.
kazu-yamamoto Nov 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions stubs/haskell-http-client-tls/src/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ import Data.ByteString.Char8 (unpack)
import System.Environment (getArgs, getProgName)
import System.Exit (exitFailure, exitSuccess)

import Network.HTTP.Client (HttpException (..), httpLbs,
import Network.HTTP.Client (HttpException (..),
HttpExceptionContent(..),
httpLbs,
newManager, parseRequest,
responseStatus)
import Network.HTTP.Client.TLS (mkManagerSettings)
Expand All @@ -23,7 +25,7 @@ import Network.TLS (ClientParams, clientShared,
clientSupported,
defaultParamsClient, sharedCAStore,
supportedCiphers)
import Network.TLS.Extra.Cipher (ciphersuite_all)
import Network.TLS.Extra.Cipher (ciphersuite_default)

main :: IO ()
main = do
Expand Down Expand Up @@ -54,7 +56,7 @@ main = do

_ <- catch (doGet request manager)
(\exp' -> case exp' of
TlsExceptionHostPort e _ _ -> do
HttpExceptionRequest _req (InternalException e) -> do
print e
putStrLn "REJECT"
exitSuccess
Expand Down Expand Up @@ -84,6 +86,6 @@ injectCA caBundle p =

injectCiphers :: ClientParams -> ClientParams
injectCiphers p =
p { clientSupported = supported { supportedCiphers = ciphersuite_all } }
p { clientSupported = supported { supportedCiphers = ciphersuite_default } }
where
supported = clientSupported p
5 changes: 4 additions & 1 deletion stubs/haskell-http-client-tls/stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
resolver: lts-7.15
resolver: lts-12.17
packages:
- .
- /Users/kazu/work/hs-tls/core
2 changes: 1 addition & 1 deletion stubs/haskell-http-client-tls/test-http-client-tls.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ executable test-http-client-tls
build-depends: base >= 4.7 && < 5
, bytestring
, connection
, http-client
, http-client >= 0.5
, http-client-tls
, http-types
, tls
Expand Down