Skip to content
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

Add wpsModifyResponseHeaders function #48

Merged
merged 2 commits into from
Jun 25, 2024
Merged

Add wpsModifyResponseHeaders function #48

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acc23b9
Add wpsModifyResponseHeaders function
adinapoli Jun 17, 2024
22c6027
Update changelong, bump to 0.6.1.0
adinapoli Jun 24, 2024
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
16 changes: 13 additions & 3 deletions Network/HTTP/ReverseProxy.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ module Network.HTTP.ReverseProxy
, wpsUpgradeToRaw
, wpsGetDest
, wpsLogRequest
, wpsModifyResponseHeaders
, SetIpHeader (..)
-- *** Local settings
, LocalWaiProxySettings
Expand Down Expand Up @@ -272,6 +273,13 @@ data WaiProxySettings = WaiProxySettings
-- Default: no op
--
-- @since 0.6.0.1
, wpsModifyResponseHeaders :: WAI.Request -> HC.Response () -> HT.ResponseHeaders -> HT.ResponseHeaders
-- ^ Allow to override the response headers before the response is returned upstream. Useful for example
-- to override overly-strict 'Content-Security-Policy' when the source is known to be trustworthy.
--
-- Default: no op
--
-- @since 0.6.0.4
adinapoli marked this conversation as resolved.
Show resolved Hide resolved
}

-- | How to set the X-Real-IP request header.
Expand All @@ -294,6 +302,7 @@ defaultWaiProxySettings = WaiProxySettings
(CI.mk <$> lookup "upgrade" (WAI.requestHeaders req)) == Just "websocket"
, wpsGetDest = Nothing
, wpsLogRequest = const (pure ())
, wpsModifyResponseHeaders = \_ _ -> id
}

renderHeaders :: WAI.Request -> HT.RequestHeaders -> Builder
Expand Down Expand Up @@ -422,9 +431,10 @@ waiProxyToSettings getDest wps' manager req0 sendResponse = do
$ \case
Left e -> wpsOnExc wps e req sendResponse
Right res -> do
let conduit = fromMaybe
let res' = const () <$> res
conduit = fromMaybe
(awaitForever (\bs -> yield (Chunk $ fromByteString bs) >> yield Flush))
(wpsProcessBody wps req $ const () <$> res)
(wpsProcessBody wps req res')
src = bodyReaderSource $ HC.responseBody res
headers = HC.responseHeaders res
notEncoded = isNothing (lookup "content-encoding" headers)
Expand All @@ -433,7 +443,7 @@ waiProxyToSettings getDest wps' manager req0 sendResponse = do
(HC.responseStatus res)
(filter (\(key, v) -> not (key `Set.member` strippedHeaders) ||
key == "content-length" && (notEncoded && notChunked || v == "0"))
headers)
(wpsModifyResponseHeaders wps req res' headers))
(\sendChunk flush -> runConduit $ src .| conduit .| CL.mapM_ (\mb ->
case mb of
Flush -> flush
Expand Down
Loading