mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-07 06:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #65 from globekeeper/DEV-378/forward-original-ip

Browse source 
🐛 Do not store proxy ips as device's ip.
This commit is contained in:
Daniel Aloni 2023-02-27 19:03:26 +02:00 committed by GitHub
parent 937afcfa2d 90e2b5cecc
commit d08130a375
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
internal/httputil/httpapi.go
View file

@ -240,7 +240,8 @@ func MakeExternalAPI(metricsName string, f func(*http.Request) util.JSONResponse
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 != "" { if forwardedFor := req.Header.Get("X-Forwarded-For"); forwardedFor != "" {
req.RemoteAddr = forwardedFor ips := strings.Split(forwardedFor, ", ")
req.RemoteAddr = ips[0]
} }
h.ServeHTTP(nextWriter, req) h.ServeHTTP(nextWriter, req)

3
syncapi/sync/requestpool.go
View file

@ -192,7 +192,8 @@ func (rp *RequestPool) updateLastSeen(req *http.Request, device *userapi.Device)
} }
if forwardedFor := req.Header.Get("X-Forwarded-For"); forwardedFor != "" { if forwardedFor := req.Header.Get("X-Forwarded-For"); forwardedFor != "" {
req.RemoteAddr = forwardedFor ips := strings.Split(forwardedFor, ", ")
req.RemoteAddr = ips[0]
} }
remoteAddr := req.RemoteAddr remoteAddr := req.RemoteAddr
if rp.cfg.RealIPHeader != "" { if rp.cfg.RealIPHeader != "" {