Adjust readme, add rate limiting event listener, remove unused proper…

…ty (#76)
entur · Feb 19, 2024 · 08fb12c · 08fb12c
1 parent a17206c
commit 08fb12c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/jwt-server/README.md b/jwt-server/README.md
@@ -236,7 +236,6 @@ entur:
               time-to-live: 36000 #seconds
             rate-limit: # per tenant
               enabled: true
-              bucket-size: 10
               refill-rate: 0.1 # per second
 ```
 

diff --git a/...rver/spring/jwt-spring-common/src/main/java/org/entur/jwt/spring/JwkSourceMapFactory.java b/...rver/spring/jwt-spring-common/src/main/java/org/entur/jwt/spring/JwkSourceMapFactory.java
@@ -55,6 +55,8 @@ public JwkSourceMap getJwkSourceMap(Map<String, JwtTenantProperties> tenants, Jw
                 throw new IllegalArgumentException("Invalid location " + tenantJwkConfiguration.getLocation() + " for " + entry.getKey());
             }
 
+            JwkSetSourceEventListener eventListener = new JwkSetSourceEventListener(entry.getKey());
+
             int connectTimeout = jwkConfiguration.getConnectTimeout();
             int readTimeout = jwkConfiguration.getReadTimeout();
 
@@ -70,13 +72,11 @@ public JwkSourceMap getJwkSourceMap(Map<String, JwtTenantProperties> tenants, Jw
 
                 int millisecondsPerToken = (int) (secondsPerToken * 1000); // note quantization, ms precision is sufficient
 
-                builder.rateLimited(millisecondsPerToken);
+                builder.rateLimited(millisecondsPerToken, eventListener);
             } else {
                 builder.rateLimited(false);
             }
 
-            JwkSetSourceEventListener eventListener = new JwkSetSourceEventListener(entry.getKey());
-
             JwkCacheProperties cache = jwkConfiguration.getCache();
             if (cache != null && cache.isEnabled()) {
                 builder.cache(cache.getTimeToLive() * 1000, cache.getRefreshTimeout() * 1000, eventListener);

diff --git a/...ring-common/src/main/java/org/entur/jwt/spring/properties/jwk/JwkRateLimitProperties.java b/...ring-common/src/main/java/org/entur/jwt/spring/properties/jwk/JwkRateLimitProperties.java
@@ -4,19 +4,9 @@ public class JwkRateLimitProperties {
 
     protected boolean enabled = true;
 
-    protected long bucketSize = 10;
-
     /** tokens per second */
     protected double refillRate = 0.1d;
 
-    public long getBucketSize() {
-        return bucketSize;
-    }
-
-    public void setBucketSize(long bucketSize) {
-        this.bucketSize = bucketSize;
-    }
-
     public double getRefillRate() {
         return refillRate;
     }