mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-02-24 13:33:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

🌐 Forward IP for login/register device creation (external API)

Browse source
This commit is contained in:
Daniel Aloni 2023-02-27 17:00:26 +02:00
parent 5b83b4754c
commit 0d9f37f427
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
internal/httputil/httpapi.go
View file

@ -239,6 +239,9 @@ func MakeExternalAPI(metricsName string, f func(*http.Request) util.JSONResponse
span := opentracing.StartSpan(metricsName) span := opentracing.StartSpan(metricsName)
defer span.Finish() defer span.Finish()
req = req.WithContext(opentracing.ContextWithSpan(req.Context(), span)) req = req.WithContext(opentracing.ContextWithSpan(req.Context(), span))
if forwardedFor := req.Header.Get("X-Forwarded-For"); forwardedFor != "" {
req.RemoteAddr = forwardedFor
}
h.ServeHTTP(nextWriter, req) h.ServeHTTP(nextWriter, req)
} }

3
syncapi/sync/requestpool.go
View file

@ -191,6 +191,9 @@ func (rp *RequestPool) updateLastSeen(req *http.Request, device *userapi.Device)
return return
} }
if forwardedFor := req.Header.Get("X-Forwarded-For"); forwardedFor != "" {
req.RemoteAddr = forwardedFor
}
remoteAddr := req.RemoteAddr remoteAddr := req.RemoteAddr
if rp.cfg.RealIPHeader != "" { if rp.cfg.RealIPHeader != "" {
if header := req.Header.Get(rp.cfg.RealIPHeader); header != "" { if header := req.Header.Get(rp.cfg.RealIPHeader); header != "" {