keter 2.1.7 → 2.1.8
raw patch · 3 files changed
+9/−6 lines, 3 filesdep ~tls
Dependency ranges changed: tls
Files
- ChangeLog.md +3/−0
- keter.cabal +2/−2
- src/Keter/Proxy.hs +4/−4
ChangeLog.md view
@@ -1,3 +1,6 @@+## 2.1.8++ Bump tls, make it build with new release+ ## 2.1.7 + add lower limit for tar to 0.6.0.0, which fixes "FileNotExecutable" bug. see #291, special thanks to @scheottl for finding and debugging.
keter.cabal view
@@ -1,6 +1,6 @@ cabal-version: 3.0 name: keter-version: 2.1.7+version: 2.1.8 synopsis: Web application deployment manager, focusing on Haskell web frameworks. It mitigates downtime. @@ -64,7 +64,7 @@ template-haskell >=2.17.0 && <3.0, text >=1.2.5 && <3.0, time >=1.9.3 && <2.0,- tls >=1.5.7 && <2.0 || ^>=2.0.0,+ tls >=1.5.7 && <2.1 || ^>= 2.1.0 || ^>=2.1.1, tls-session-manager >=0.0.4 && <0.1, transformers >=0.5.6 && <0.7, unix >=2.7.2 && <2.9,
src/Keter/Proxy.hs view
@@ -134,9 +134,9 @@ settings <- ask let (run, isSecure) = case listener of- LPInsecure host port -> + LPInsecure host port -> (liftIO . Warp.runSettings (warp host port), False)- LPSecure host port cert chainCerts key session -> + LPSecure host port cert chainCerts key session -> (liftIO . WarpTLS.runTLS (connectClientCertificates (psHostLookup settings) session $ WarpTLS.tlsSettingsChain cert@@ -150,7 +150,7 @@ connectClientCertificates :: (ByteString -> IO (Maybe (ProxyAction, TLS.Credentials))) -> Bool -> WarpTLS.TLSSettings -> WarpTLS.TLSSettings connectClientCertificates hl session s = let- newHooks@TLS.ServerHooks{..} = WarpTLS.tlsServerHooks s+ newHooks = WarpTLS.tlsServerHooks s -- todo: add nested lookup newOnServerNameIndication (Just n) = maybe mempty snd <$> hl (S8.pack n)@@ -179,7 +179,7 @@ } psManager where logException :: Wai.Request -> SomeException -> KeterM ProxySettings ()- logException a b = logErrorN $ pack $ + logException a b = logErrorN $ pack $ "Got a proxy exception on request " <> show a <> " with exception " <> show b