fix: Add uri to rate limiter request key

ReVanced · Jul 8, 2024 · e8c2488 · e8c2488
1 parent a6008a2
commit e8c2488
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/main/kotlin/app/revanced/api/configuration/HTTP.kt b/src/main/kotlin/app/revanced/api/configuration/HTTP.kt
@@ -5,6 +5,7 @@ import io.ktor.server.application.*
 import io.ktor.server.plugins.*
 import io.ktor.server.plugins.cors.routing.*
 import io.ktor.server.plugins.ratelimit.*
+import io.ktor.server.request.*
 import org.koin.ktor.ext.get
 import kotlin.time.Duration.Companion.minutes
 
@@ -19,13 +20,19 @@ fun Application.configureHTTP() {
     }
 
     install(RateLimit) {
-        register(RateLimitName("weak")) {
+        fun rateLimit(name: String, block: RateLimitProviderConfig.() -> Unit) = register(RateLimitName(name)) {
+            requestKey {
+                it.request.uri + it.request.origin.remoteAddress
+            }
+
+            block()
+        }
+
+        rateLimit("weak") {
             rateLimiter(limit = 30, refillPeriod = 2.minutes)
-            requestKey { it.request.origin.remoteAddress }
         }
-        register(RateLimitName("strong")) {
+        rateLimit("strong") {
             rateLimiter(limit = 5, refillPeriod = 1.minutes)
-            requestKey { it.request.origin.remoteHost }
         }
     }
 }