limit

Author: epompeii

lib/bencher_json/src/system/config/plus/rate_limiting.rs

@@ -6,6 +6,7 @@ use serde::{Deserialize, Serialize};
 #[cfg_attr(feature = "schema", derive(JsonSchema))]
 pub struct JsonRateLimiting {
     pub window: Option<u32>,
+    pub user_limit: Option<u32>,
     pub unclaimed_limit: Option<u32>,
     pub claimed_limit: Option<u32>,
 }

lib/bencher_schema/src/context/rate_limiting.rs

@@ -16,11 +16,13 @@ use crate::{
 use super::DbConnection;
 
 const DAY: Duration = Duration::from_secs(24 * 60 * 60);
-const UNCLAIMED_RATE_LIMIT: u32 = u8::MAX as u32;
-const CLAIMED_RATE_LIMIT: u32 = u16::MAX as u32;
+const USER_LIMIT: u32 = u8::MAX as u32;
+const UNCLAIMED_LIMIT: u32 = u8::MAX as u32;
+const CLAIMED_LIMIT: u32 = u16::MAX as u32;
 
 pub struct RateLimiting {
     pub window: Duration,
+    pub user_limit: u32,
     pub unclaimed_limit: u32,
     pub claimed_limit: u32,
 }
@@ -69,13 +71,15 @@ impl From<JsonRateLimiting> for RateLimiting {
     fn from(json: JsonRateLimiting) -> Self {
         let JsonRateLimiting {
             window,
+            user_limit,
             unclaimed_limit,
             claimed_limit,
         } = json;
         Self {
             window: window.map(u64::from).map_or(DAY, Duration::from_secs),
-            unclaimed_limit: unclaimed_limit.unwrap_or(UNCLAIMED_RATE_LIMIT),
-            claimed_limit: claimed_limit.unwrap_or(CLAIMED_RATE_LIMIT),
+            user_limit: user_limit.unwrap_or(USER_LIMIT),
+            unclaimed_limit: unclaimed_limit.unwrap_or(UNCLAIMED_LIMIT),
+            claimed_limit: claimed_limit.unwrap_or(CLAIMED_LIMIT),
         }
     }
 }
@@ -84,8 +88,9 @@ impl Default for RateLimiting {
     fn default() -> Self {
         Self {
             window: DAY,
-            unclaimed_limit: UNCLAIMED_RATE_LIMIT,
-            claimed_limit: CLAIMED_RATE_LIMIT,
+            user_limit: USER_LIMIT,
+            unclaimed_limit: UNCLAIMED_LIMIT,
+            claimed_limit: CLAIMED_LIMIT,
         }
     }
 }

lib/bencher_schema/src/model/organization/mod.rs

@@ -327,7 +327,7 @@ impl InsertOrganization {
                     )}
                 )?;
 
-        let rate_limit = context.rate_limiting.unclaimed_limit;
+        let rate_limit = context.rate_limiting.user_limit;
         if creation_count >= rate_limit {
             Err(crate::error::too_many_requests(RateLimitingError::User {
                 user: query_user.clone(),

lib/bencher_schema/src/model/project/mod.rs

@@ -505,6 +505,8 @@ impl InsertProject {
     ) -> Result<(), HttpError> {
         use crate::context::RateLimitingError;
 
+        let is_claimed = query_organization.is_claimed(conn_lock!(context))?;
+
         let resource = BencherResource::Project;
         let (start_time, end_time) = context.rate_limiting.window();
         let creation_count: u32 = schema::project::table
@@ -523,7 +525,11 @@ impl InsertProject {
                     )}
                 )?;
 
-        let rate_limit = context.rate_limiting.unclaimed_limit;
+        let rate_limit = if is_claimed {
+            context.rate_limiting.claimed_limit
+        } else {
+            context.rate_limiting.unclaimed_limit
+        };
         if creation_count >= rate_limit {
             Err(crate::error::too_many_requests(
                 RateLimitingError::Organization {

lib/bencher_schema/src/model/user/token.rs

@@ -118,7 +118,7 @@ impl InsertToken {
                     )}
                 )?;
 
-        let rate_limit = context.rate_limiting.unclaimed_limit;
+        let rate_limit = context.rate_limiting.user_limit;
         if creation_count >= rate_limit {
             Err(crate::error::too_many_requests(RateLimitingError::User {
                 user: query_user.clone(),

services/api/openapi.json

@@ -10651,6 +10651,12 @@
             "format": "uint32",
             "minimum": 0
           },
+          "user_limit": {
+            "nullable": true,
+            "type": "integer",
+            "format": "uint32",
+            "minimum": 0
+          },
           "window": {
             "nullable": true,
             "type": "integer",