Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions server/pkg/handler/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,7 @@ func ipFromForwardedHeader(ctx *fasthttp.RequestCtx) string {
}

func (h *handler) Serve() error {
rateLimitMiddleware, err := newRateLimitMiddleware(h.trustProxy)
if err != nil {
return err
}
rateLimitMiddleware := newRateLimitMiddleware(h.trustProxy)

requestHandler := func(ctx *fasthttp.RequestCtx) {
log.Debug().Msgf("%s %s", ctx.Method(), ctx.RequestURI())
Expand Down
4 changes: 2 additions & 2 deletions server/pkg/handler/ratelimit.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,12 @@ type rateLimitMiddleware struct {
// value, which identifies the real client. Never enable trustProxy in
// front of an untrusted hop: any client could then forge a fresh "IP" per
// request and defeat the per-client DoS throttle.
func newRateLimitMiddleware(trustProxy bool) (*rateLimitMiddleware, error) {
func newRateLimitMiddleware(trustProxy bool) *rateLimitMiddleware {
keyGetter := remoteAddrKey
if trustProxy {
keyGetter = forwardedIPKey
}
return &rateLimitMiddleware{limiter: newRateLimiter(), keyGetter: keyGetter}, nil
return &rateLimitMiddleware{limiter: newRateLimiter(), keyGetter: keyGetter}
}

// Handle wraps next with rate limiting: requests that exceed the key's
Expand Down
5 changes: 1 addition & 4 deletions server/pkg/handler/ratelimit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ import (
func startRateLimitedServer(t *testing.T, trustProxy bool) string {
t.Helper()

middleware, err := newRateLimitMiddleware(trustProxy)
if err != nil {
t.Fatalf("newRateLimitMiddleware(%v): %v", trustProxy, err)
}
middleware := newRateLimitMiddleware(trustProxy)

next := func(ctx *fasthttp.RequestCtx) {
ctx.SetBodyString("ok")
Expand Down
Loading