Skip to content

Avoid roundtrip to Text when inspecting x-forwarded-for header #49

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

Merged
merged 1 commit into from
Aug 11, 2025
Merged

Avoid roundtrip to Text when inspecting x-forwarded-for header #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions Network/HTTP/ReverseProxy.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ import Data.Streaming.Network (AppData, readLens)
import qualified Data.Text.Lazy as TL
import qualified Data.Text.Lazy.Encoding as TLE
import qualified Data.Text as T
import qualified Data.Text.Encoding as TE
import Data.Word8 (isSpace, _colon, _cr)
import GHC.Generics (Generic)
import Network.HTTP.Client (BodyReader, brRead)
Expand Down Expand Up @@ -362,7 +361,7 @@ fixReqHeaders wps req =
fromSocket = (("X-Real-IP", S8.pack $ showSockAddr $ WAI.remoteHost req):)
fromForwardedFor = do
h <- lookup "x-forwarded-for" (WAI.requestHeaders req)
listToMaybe $ map (TE.encodeUtf8 . T.strip) $ T.splitOn "," $ TE.decodeUtf8 h
listToMaybe $ map S8.strip $ S8.split ',' h
addXRealIP =
case wpsSetIpHeader wps of
SIHFromSocket -> fromSocket
Expand Down
15 changes: 15 additions & 0 deletions test/main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,21 @@ main = hspec $
withCApp (rawTcpProxyTo (ProxyDest "127.0.0.1" port3)) $ \port4 -> do
lbs <- httpWithForwardedFor $ "http://127.0.0.1:" ++ show port4
lbs `shouldBe` "127.0.0.1"
it "doesn't fail on invalid utf8 in x-forwarded-for header" $
let getRealIp req = L8.fromStrict $ fromMaybe "" $ lookup "x-real-ip" (requestHeaders req)
httpWithForwardedFor url = liftIO $ do
man <- HC.newManager HC.tlsManagerSettings
oreq <- liftIO $ HC.parseUrlThrow url
let req = oreq { HC.requestHeaders = [("X-Forwarded-For", "\xbf\xf0\x9f\x92\xa1"), ("Connection", "close")] }
HC.responseBody <$> HC.httpLbs req man
waiProxyTo' getDest onError = waiProxyToSettings getDest defaultWaiProxySettings { wpsOnExc = onError, wpsSetIpHeader = SIHFromHeader }
in withMan $ \manager ->
withWApp (\r f -> f $ responseLBS status200 [] $ getRealIp r ) $ \port1 ->
withWApp (waiProxyTo' (const $ return $ WPRProxyDest $ ProxyDest "127.0.0.1" port1) defaultOnExc manager) $ \port2 ->
withCApp (rawProxyTo (const $ return $ Right $ ProxyDest "127.0.0.1" port2)) $ \port3 ->
withCApp (rawTcpProxyTo (ProxyDest "127.0.0.1" port3)) $ \port4 -> do
lbs <- httpWithForwardedFor $ "http://127.0.0.1:" ++ show port4
lbs `shouldBe` "\xbf\xf0\x9f\x92\xa1"
it "performs log action" $
let ioref :: IO (IORef Int)
ioref = newIORef 1
Expand Down
Loading