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

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

Browse source 
🌐 Forward IP for login/register device creation (external API)
This commit is contained in:
Daniel Aloni 2023-02-27 18:06:36 +02:00 committed by GitHub
parent 5b83b4754c c40555c836
commit 937afcfa2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 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)
} }

4
syncapi/storage/sqlite3/account_data_table.go
View file

@ -105,7 +105,9 @@ func (s *accountDataStatements) SelectAccountDataInRange(
filter.Senders, filter.NotSenders, filter.Senders, filter.NotSenders,
filter.Types, filter.NotTypes, filter.Types, filter.NotTypes,
[]string{}, nil, filter.Limit, FilterOrderAsc) []string{}, nil, filter.Limit, FilterOrderAsc)
if err != nil {
return
}
rows, err := stmt.QueryContext(ctx, params...) rows, err := stmt.QueryContext(ctx, params...)
if err != nil { if err != nil {
return return

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 != "" {