SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

If the rate limiter key resolver returns an empty key, set response status to Forbidden

Browse Source
This commit is contained in:
sgibb
2023-12-05 16:16:10 -05:00
parent 3d4a17ce4c
commit 26d8fcbb55
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/Bucket4jFilterFunctions.java
View File

@@ -35,6 +35,7 @@ import org.springframework.cloud.gateway.server.mvc.common.MvcUtils;
import org.springframework.http.HttpStatus;
import org.springframework.http.HttpStatusCode;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import org.springframework.web.servlet.function.HandlerFilterFunction;
import org.springframework.web.servlet.function.ServerRequest;
import org.springframework.web.servlet.function.ServerResponse;
@@ -47,7 +48,9 @@ public abstract class Bucket4jFilterFunctions {
public static final String DEFAULT_HEADER_NAME = "X-RateLimit-Remaining";
private static final Function<RateLimitConfig, BucketConfiguration> DEFAULT_CONFIGURATION_BUILDER = config -> BucketConfiguration
.builder().addLimit(Bandwidth.simple(config.getCapacity(), config.getPeriod())).build();
.builder().addLimit(Bandwidth.builder().capacity(config.getCapacity())
.refillGreedy(config.getCapacity(), config.getPeriod()).build())
.build();
private Bucket4jFilterFunctions() {
}
@@ -65,8 +68,12 @@ public abstract class Bucket4jFilterFunctions {
BucketConfiguration bucketConfiguration = config.getConfigurationBuilder().apply(config);
return (request, next) -> {
AsyncProxyManager proxyManager = MvcUtils.getApplicationContext(request).getBean(AsyncProxyManager.class);
AsyncBucketProxy bucket = proxyManager.builder().build(config.getKeyResolver().apply(request),
bucketConfiguration);
String key = config.getKeyResolver().apply(request);
if (!StringUtils.hasText(key)) {
// TODO: configurable empty key status code
return ServerResponse.status(HttpStatus.FORBIDDEN).build();
}
AsyncBucketProxy bucket = proxyManager.builder().build(key, bucketConfiguration);
CompletableFuture<ConsumptionProbe> bucketFuture = bucket.tryConsumeAndReturnRemaining(config.getTokens());
ConsumptionProbe consumptionProbe;
if (config.getTimeout() != null) {