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

Fix parsing of X-Forwarded-For header when trustAnyForwardedAddress is enabled #611

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix parsing of X-Forwarded-For header when trustAnyForwardedAddress is enabled #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3cf8297
Fix parsing of X-Forwarded-For header
silkeh Aug 28, 2024
20cc568
Add resolved remote address/host to log entries
silkeh Aug 28, 2024
e1b1c7a
Log rate limit subject
silkeh Aug 28, 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
50 changes: 33 additions & 17 deletions api/_routers/03-host_detection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/sebest/xff"
"github.com/sirupsen/logrus"

"github.com/t2bot/matrix-media-repo/api/_responses"
"github.com/t2bot/matrix-media-repo/common"
"github.com/t2bot/matrix-media-repo/common/config"
Expand All @@ -28,27 +29,14 @@ func NewHostRouter(next http.Handler) *HostRouter {
}

func (h *HostRouter) ServeHTTP(w http.ResponseWriter, r *http.Request) {
origHost := r.Host
origRemoteAddr := r.RemoteAddr

if r.Header.Get("X-Forwarded-Host") != "" && config.Get().General.UseForwardedHost {
r.Host = r.Header.Get("X-Forwarded-Host")
}
r.Host = strings.Split(r.Host, ":")[0]

var raddr string
if config.Get().General.TrustAnyForward {
raddr = r.Header.Get("X-Forwarded-For")
} else {
raddr = xff.GetRemoteAddr(r)
}
if raddr == "" {
raddr = r.RemoteAddr
}
host, _, err := net.SplitHostPort(raddr)
if err != nil {
logrus.Error(err)
sentry.CaptureException(err)
host = raddr
}
r.RemoteAddr = host
r.RemoteAddr = GetRemoteAddr(r)

ignoreHost := ShouldIgnoreHost(r)
isOurs := ignoreHost || util.IsServerOurs(r.Host)
Expand All @@ -70,6 +58,13 @@ func (h *HostRouter) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return // don't call next handler
}

logger := GetLogger(r).WithFields(logrus.Fields{
"host": r.Host,
"remoteAddr": r.RemoteAddr,
"origHost": origHost,
"origRemoteAddr": origRemoteAddr,
})

cfg := config.GetDomain(r.Host)
if ignoreHost {
dc := config.DomainConfigFrom(*config.Get())
Expand All @@ -78,13 +73,34 @@ func (h *HostRouter) ServeHTTP(w http.ResponseWriter, r *http.Request) {

ctx := r.Context()
ctx = context.WithValue(ctx, common.ContextDomainConfig, cfg)
ctx = context.WithValue(ctx, common.ContextLogger, logger)
r = r.WithContext(ctx)

if h.next != nil {
h.next.ServeHTTP(w, r)
}
}

func GetRemoteAddr(r *http.Request) string {
if config.Get().General.TrustAnyForward {
return r.Header.Get("X-Forwarded-For")
}

raddr := xff.GetRemoteAddr(r)
if raddr == "" {
raddr = r.RemoteAddr
}

host, _, err := net.SplitHostPort(raddr)
if err != nil {
logrus.WithField("raddr", raddr).WithError(err).Error("Invalid remote address")
sentry.CaptureException(err)
host = raddr
}

return host
}

func GetDomainConfig(r *http.Request) *config.DomainRepoConfig {
x, ok := r.Context().Value(common.ContextDomainConfig).(*config.DomainRepoConfig)
if !ok {
Expand Down
10 changes: 7 additions & 3 deletions pipelines/pipeline_download/pipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/getsentry/sentry-go"
"github.com/t2bot/go-leaky-bucket"
"github.com/t2bot/go-singleflight-streams"

"github.com/t2bot/matrix-media-repo/common"
"github.com/t2bot/matrix-media-repo/common/rcontext"
"github.com/t2bot/matrix-media-repo/database"
Expand Down Expand Up @@ -76,7 +77,8 @@ func Execute(ctx rcontext.RequestContext, origin string, mediaId string, opts Do
}

// Check rate limits before moving on much further
limitBucket, err := limits.GetBucket(ctx, limits.GetRequestIP(ctx.Request))
subject := limits.GetRequestIP(ctx.Request)
limitBucket, err := limits.GetBucket(ctx, subject)
if err != nil {
cancel()
return nil, nil, err
Expand All @@ -90,7 +92,8 @@ func Execute(ctx rcontext.RequestContext, origin string, mediaId string, opts Do
if limitErr := limitBucket.Add(ctx.Config.Downloads.MaxSizeBytes); limitErr != nil {
cancel()
if errors.Is(limitErr, leaky.ErrBucketFull) {
ctx.Log.Debugf("Rate limited on MaxSizeBytes=%d/%d", ctx.Config.Downloads.MaxSizeBytes, limitBucket.Remaining())
ctx.Log.WithField("subject", subject).
Debugf("Rate limited on MaxSizeBytes=%d/%d", ctx.Config.Downloads.MaxSizeBytes, limitBucket.Remaining())
return nil, nil, common.ErrRateLimitExceeded
}
return nil, nil, limitErr
Expand All @@ -101,7 +104,8 @@ func Execute(ctx rcontext.RequestContext, origin string, mediaId string, opts Do
if limitErr := limitBucket.Add(record.SizeBytes); limitErr != nil {
cancel()
if errors.Is(limitErr, leaky.ErrBucketFull) {
ctx.Log.Debugf("Rate limited on SizeBytes=%d/%d", record.SizeBytes, limitBucket.Remaining())
ctx.Log.WithField("subject", subject).
Debugf("Rate limited on SizeBytes=%d/%d", record.SizeBytes, limitBucket.Remaining())
return nil, nil, common.ErrRateLimitExceeded
}
return nil, nil, limitErr
Expand Down
7 changes: 5 additions & 2 deletions pipelines/pipeline_thumbnail/pipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/getsentry/sentry-go"
"github.com/t2bot/go-leaky-bucket"
sfstreams "github.com/t2bot/go-singleflight-streams"

"github.com/t2bot/matrix-media-repo/common"
"github.com/t2bot/matrix-media-repo/common/rcontext"
"github.com/t2bot/matrix-media-repo/database"
Expand Down Expand Up @@ -87,7 +88,8 @@ func Execute(ctx rcontext.RequestContext, origin string, mediaId string, opts Th
}

// Check rate limits before moving on much further
limitBucket, err := limits.GetBucket(ctx, limits.GetRequestIP(ctx.Request))
subject := limits.GetRequestIP(ctx.Request)
limitBucket, err := limits.GetBucket(ctx, subject)
if err != nil {
cancel()
return nil, nil, err
Expand All @@ -96,7 +98,8 @@ func Execute(ctx rcontext.RequestContext, origin string, mediaId string, opts Th
if limitErr := limitBucket.Add(record.SizeBytes); limitErr != nil {
cancel()
if errors.Is(limitErr, leaky.ErrBucketFull) {
ctx.Log.Debugf("Rate limited on SizeBytes=%d/%d", record.SizeBytes, limitBucket.Remaining())
ctx.Log.WithField("subject", subject).
Debugf("Rate limited on SizeBytes=%d/%d", record.SizeBytes, limitBucket.Remaining())
return nil, nil, common.ErrRateLimitExceeded
}
return nil, nil, limitErr
Expand Down