tmp-proc 0.7.0.0 → 0.7.1.0

raw patch · 4 files changed

+38/−10 lines, 4 filesdep ~crypton-connection

Dependency ranges changed: crypton-connection

Files

• ChangeLog.md +5/−1
• test/Network/Connection/CPP.hs +24/−0
• test/Test/NginxGateway.hs +6/−7
• tmp-proc.cabal +3/−2

@@ -1,7 +1,11 @@ # Revision history for tmp-proc  `tmp-proc` uses [PVP Versioning][1].- ++## 0.7.1.0 -- 2024-05-29++* Relax the upper version bounds of crypton-connection to allow 0.4+ ## 0.7.0.0 -- 2024-05-12  * Convert ProcHandle constructor into a unidirectional PatternSynonym

@@ -0,0 +1,24 @@+{-# LANGUAGE CPP #-}++{- |+Module      : Network.Connection.CPP+Copyright   : (c) 2022 Tim Emiola+Maintainer  : Tim Emiola <adetokunbo@emio.la>+SPDX-License-Identifier: BSD3+-}+module Network.Connection.CPP (noCheckSettings) where++import Network.Connection (TLSSettings (..))+++#if MIN_VERSION_crypton_connection(0,4,0)+import Data.Default (def)+#endif++#if MIN_VERSION_crypton_connection(0,4,0)+noCheckSettings :: TLSSettings+noCheckSettings = TLSSettingsSimple True False False def+#else+noCheckSettings :: TLSSettings+noCheckSettings = TLSSettingsSimple True False False+#endif

@@ -28,7 +28,7 @@ import Data.Text (Text) import qualified Data.Text as Text import qualified Data.Text.IO as Text-import Network.Connection (TLSSettings (..))+import Network.Connection.CPP (noCheckSettings) import qualified Network.HTTP.Client as HC import qualified Network.HTTP.Client.TLS as HC import Network.HTTP.Types.Header (hHost)@@ -218,12 +218,11 @@ httpsGet handle urlPath = do   -- _tlsSettings <- TLSSettings <$> _mkClientParams "localHost"   let theUri = "https://" <> hAddr handle <> "/" <> Text.dropWhile (== '/') urlPath-      -- use TLS settings that disable hostname verification. What's not-      -- currently possible is to actually specify the hostname to use for SNI-      -- that differs from the connection IP address, that's not supported by-      -- http-client-tls-      tlsSettings = TLSSettingsSimple True False False-  manager <- HC.newTlsManagerWith $ HC.mkManagerSettings tlsSettings Nothing+  -- use TLS settings that disable hostname verification. What's not+  -- currently possible is to actually specify the hostname to use for SNI+  -- that differs from the connection IP address, that's not supported by+  -- http-client-tls+  manager <- HC.newTlsManagerWith $ HC.mkManagerSettings noCheckSettings Nothing   getReq <- HC.parseRequest $ Text.unpack theUri   let withHost = getReq {HC.requestHeaders = [(hHost, "localhost")]}   statusCode . HC.responseStatus <$> HC.httpLbs withHost manager

@@ -1,6 +1,6 @@ cabal-version:      3.0 name:               tmp-proc-version:            0.7.0.0+version:            0.7.1.0 synopsis:           Run 'tmp' processes in integration tests description:   @tmp-proc@ runs services in docker containers for use in integration tests.@@ -78,12 +78,13 @@     Test.System.TmpProc.Hspec     Test.System.TmpProc.HttpBinSpec     Test.System.TmpProc.WarpSpec+    Network.Connection.CPP    hs-source-dirs:   test   build-depends:     , base     , bytestring-    , crypton-connection    >=0.3 && <0.4+    , crypton-connection    >=0.3 && <0.5     , crypton-x509-system   >=1.6 && <1.8     , data-default          >=0.5 && <0.8     , directory             >=1.3 && <1.4