snoyberg/keter
1
1
Fork 0
mirror of https://github.com/snoyberg/keter.git synced 2024-11-27 10:12:01 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #297 from mpilgrem/tls-2.1.0

Browse Source 
Accommodate tls-2.1.0
This commit is contained in:
Jappie Klooster 2024-10-24 13:15:09 +02:00 committed by GitHub
commit 729bdfa926
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Keter/Proxy.hs
View File

@ -134,9 +134,9 @@ reverseProxy listener = do
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 @@ reverseProxy listener = do
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 @@ withClient isSecure = do
} 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