2 files changed, 14 insertions, 0 deletions

diff --git a/src/config.rs b/src/config.rs
index 0f0d853..0014003 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -469,6 +469,11 @@ pub struct Config {
     /// All events from these authors are blocked from both relay storage and purgatory
     #[arg(long, env = "NGIT_EVENT_BLACKLIST", default_value = "")]
     pub event_blacklist: String,
+
+    /// Maximum total connections to the relay (default: 500)
+    /// Prevents connection exhaustion DoS attacks
+    #[arg(long, env = "NGIT_MAX_CONNECTIONS", default_value_t = 500)]
+    pub max_connections: usize,
 }
 
 impl Config {
@@ -703,6 +708,7 @@ impl Config {
             repository_whitelist: String::new(),
             repository_blacklist: String::new(),
             event_blacklist: String::new(),
+            max_connections: 500,
         }
     }
 }
diff --git a/src/nostr/builder.rs b/src/nostr/builder.rs
index c2de1df..ef1b700 100644
--- a/src/nostr/builder.rs
+++ b/src/nostr/builder.rs
@@ -624,6 +624,14 @@ pub async fn create_relay(
     let relay = LocalRelayBuilder::default()
         .database(database.clone())
         .write_policy(write_policy.clone())
+        // Explicitly set rate limits (make defaults visible in code)
+        // Per-connection limits: 500 max subscriptions, 60 events/min
+        .rate_limit(RateLimit {
+            max_reqs: 500,        // Max concurrent subscriptions per connection
+            notes_per_minute: 60, // Max events per minute per connection
+        })
+        // Total connection limit to prevent DoS attacks
+        .max_connections(config.max_connections)
         .build();
 
     tracing::info!(