From 904829094816fb38d8f1e1d2c19c4c9c014baa88 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Mon, 27 Jan 2025 19:21:13 +0100 Subject: [chore] skip `trusted-proxies` warning if ip excepted from rate limiting (#3699) * [chore] skip `trusted-proxies` warning if ip excepted from rate limiting * weep * typo * fix env parsing test --- cmd/gotosocial/action/server/server.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'cmd') diff --git a/cmd/gotosocial/action/server/server.go b/cmd/gotosocial/action/server/server.go index 7a374fbcd..c08017e60 100644 --- a/cmd/gotosocial/action/server/server.go +++ b/cmd/gotosocial/action/server/server.go @@ -455,11 +455,10 @@ var Start action.GTSAction = func(ctx context.Context) error { // create required middleware // rate limiting rlLimit := config.GetAdvancedRateLimitRequests() - rlExceptions := config.GetAdvancedRateLimitExceptions() - clLimit := middleware.RateLimit(rlLimit, rlExceptions) // client api - s2sLimit := middleware.RateLimit(rlLimit, rlExceptions) // server-to-server (AP) - fsMainLimit := middleware.RateLimit(rlLimit, rlExceptions) // fileserver / web templates - fsEmojiLimit := middleware.RateLimit(rlLimit*2, rlExceptions) // fileserver (emojis only, use high limit) + clLimit := middleware.RateLimit(rlLimit, config.GetAdvancedRateLimitExceptionsParsed()) // client api + s2sLimit := middleware.RateLimit(rlLimit, config.GetAdvancedRateLimitExceptionsParsed()) // server-to-server (AP) + fsMainLimit := middleware.RateLimit(rlLimit, config.GetAdvancedRateLimitExceptionsParsed()) // fileserver / web templates + fsEmojiLimit := middleware.RateLimit(rlLimit*2, config.GetAdvancedRateLimitExceptionsParsed()) // fileserver (emojis only, use high limit) // throttling cpuMultiplier := config.GetAdvancedThrottlingMultiplier() -- cgit v1.3