Implement dynamic tier-based rate limiting

.gitignore

@@ -0,0 +1 @@
+data

docker-compose.yml

@@ -55,7 +55,7 @@ services:
     command: redis-server /etc/redis.conf
     volumes:
       - ./redis.conf:/etc/redis.conf
-      - /redis/node-1:/data
+      - ./data/redis/node-1:/data
     environment:
       - REDISCLI_AUTH=openvsx
     healthcheck:
@@ -76,7 +76,7 @@ services:
     command: redis-server /etc/redis.conf
     volumes:
       - ./redis.conf:/etc/redis.conf
-      - /redis/node-2:/data
+      - ./data/redis/node-2:/data
     environment:
       - REDISCLI_AUTH=openvsx
     healthcheck:
@@ -97,7 +97,7 @@ services:
     command: redis-server /etc/redis.conf
     volumes:
       - ./redis.conf:/etc/redis.conf
-      - /redis/node-3:/data
+      - ./data/redis/node-3:/data
     environment:
       - REDISCLI_AUTH=openvsx
     healthcheck:
@@ -118,7 +118,7 @@ services:
     command: redis-server /etc/redis.conf
     volumes:
       - ./redis.conf:/etc/redis.conf
-      - /redis/node-4:/data
+      - ./data/redis/node-4:/data
     environment:
       - REDISCLI_AUTH=openvsx
     healthcheck:
@@ -139,7 +139,7 @@ services:
     command: redis-server /etc/redis.conf
     volumes:
       - ./redis.conf:/etc/redis.conf
-      - /redis/node-5:/data
+      - ./data/redis/node-5:/data
     environment:
       - REDISCLI_AUTH=openvsx
     healthcheck:
@@ -160,7 +160,7 @@ services:
     command: redis-server /etc/redis.conf
     volumes:
       - ./redis.conf:/etc/redis.conf
-      - /redis/node-6:/data
+      - ./data/redis/node-6:/data
     environment:
       - REDISCLI_AUTH=openvsx
     healthcheck:
@@ -218,7 +218,7 @@ services:
     profiles:
       - openvsx
       - backend
-    
+
   webui:
     image: node:18
     working_dir: /app

redis.conf

@@ -7,6 +7,6 @@ appendonly yes
 maxmemory 64mb
 maxmemory-policy allkeys-lru
 user default off
-user openvsx on >openvsx ~* +@all
+user openvsx on >openvsx ~* +@all allchannels
 masteruser openvsx
 masterauth openvsx

server/build.gradle

@@ -34,7 +34,7 @@ def versions = [
     jackson: '2.15.2',
     woodstox: '6.4.0',
     jobrunr: '7.5.0',
-    bucket4j: '0.12.7',
+    bucket4j: '0.12.10',
     bucket4j_redis: '8.10.1',
     tika: '3.2.2',
     bouncycastle: '1.80',
@@ -43,7 +43,8 @@ def versions = [
     jaxb_impl: '2.3.8',
     gatling: '3.14.9',
     loki4j: '1.4.2',
-    jedis: '6.2.0'
+    jedis: '6.2.0',
+    ipaddress: '5.5.1'
 ]
 ext['junit-jupiter.version'] = versions.junit
 java {
@@ -117,6 +118,7 @@ dependencies {
     implementation "redis.clients:jedis:${versions.jedis}"
     implementation "com.giffing.bucket4j.spring.boot.starter:bucket4j-spring-boot-starter:${versions.bucket4j}"
     implementation "com.bucket4j:bucket4j-redis:${versions.bucket4j_redis}"
+    implementation "com.github.seancfoley:ipaddress:${versions.ipaddress}"
     implementation "org.jobrunr:jobrunr-spring-boot-3-starter:${versions.jobrunr}"
     implementation "org.flywaydb:flyway-core:${versions.flyway}"
     implementation "com.google.cloud:google-cloud-storage:${versions.gcloud}"

server/src/dev/resources/db/migration/V1_58_1__RateLimit.sql

@@ -0,0 +1,6 @@
+-- add basic tier and assign customer for loopback IP to it
+
+INSERT INTO tier (id, name, description, tier_type, capacity, duration, refill_strategy) VALUES (1, 'free', '', 'FREE', 50, 60, 'GREEDY');
+INSERT INTO tier (id, name, description, tier_type, capacity, duration, refill_strategy) VALUES (2, 'safety', '', 'SAFETY', 200, 60, 'GREEDY');
+INSERT INTO tier (id, name, description, tier_type, capacity, duration, refill_strategy) VALUES (3, 'basic', '', 'NON_FREE', 100, 60, 'GREEDY');
+INSERT INTO customer (id, name, tier_id, state, cidr_blocks) VALUES (1, 'loopback', 1, 'EVALUATION', '127.0.0.1/32');