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: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ pom.xml.next
release.properties
dependency-reduced-pom.xml

#####################
target/
temp-repo/
.m2/

############################################
# Logs
############################################
Expand Down
7 changes: 5 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,22 +87,25 @@
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
</dependency>

<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-database-postgresql</artifactId>
</dependency>

<dependency>
<groupId>com.bucket4j</groupId>
<artifactId>bucket4j-core</artifactId>
<version>8.6.0</version>
<version>8.9.0</version>
</dependency>

<dependency>
<groupId>com.bucket4j</groupId>
<artifactId>bucket4j-redis</artifactId>
<version>8.6.0</version>
<version>8.9.0</version>
</dependency>

<!-- Spring Redis -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,30 @@

import io.github.bucket4j.Bandwidth;
import io.github.bucket4j.Bucket;
import io.github.bucket4j.BucketConfiguration;
import io.github.bucket4j.distributed.proxy.ProxyManager;
import io.github.bucket4j.redis.lettuce.cas.LettuceBasedProxyManager;

import io.lettuce.core.RedisClient;
import io.lettuce.core.RedisURI;

import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter;

import java.io.IOException;
import java.time.Duration;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;

@Component
@Profile("prod")
public class RedisRateLimitFilter extends OncePerRequestFilter {

private final ProxyManager<byte[]> proxyManager;

public RedisRateLimitFilter(
@Value("${spring.data.redis.host}") String host,
@Value("${spring.data.redis.port}") int port
) {

RedisURI redisURI = RedisURI.Builder.redis(host)
.withPort(port)
.build();

RedisClient redisClient = RedisClient.create(redisURI);
public class IpRateLimitFilter extends OncePerRequestFilter {

this.proxyManager = LettuceBasedProxyManager
.builderFor(redisClient)
.build();
}
private final Map<String, Bucket> buckets = new ConcurrentHashMap<>();

private BucketConfiguration configuration() {
return BucketConfiguration.builder()
private Bucket createBucket() {
return Bucket.builder()
.addLimit(Bandwidth.simple(10, Duration.ofMinutes(1)))
.build();
}
Expand All @@ -66,8 +45,7 @@ protected void doFilterInternal(HttpServletRequest request,
.map(s -> s.split(",")[0].trim())
.orElse(request.getRemoteAddr());

Bucket bucket = proxyManager.builder()
.build(("ip:" + ip).getBytes(), this::configuration);
Bucket bucket = buckets.computeIfAbsent(ip, k -> createBucket());

if (bucket.tryConsume(1)) {
filterChain.doFilter(request, response);
Expand Down