1 files changed, 24 insertions, 22 deletions

diff --git a/internal/handler/websocket/handler.go b/internal/handler/websocket/handler.go
index 909e2ec..c1b23b8 100644
--- a/internal/handler/websocket/handler.go
+++ b/internal/handler/websocket/handler.go
@@ -265,19 +265,8 @@ func (h *Handler) handleEvent(ctx context.Context, conn *websocket.Conn, raw []j
                 return fmt.Errorf("invalid event: %w", err)
         }
 
-        if err := h.requireAuth(ctx, conn, true, state); err != nil {
-                status = "unauthorized"
-                h.sendOK(ctx, conn, event.ID, false, err.Error())
-                return nil
-        }
-
-        if state.authenticatedPubkey == "" && h.authConfig != nil && h.authConfig.WriteEnabled {
-                status = "unauthenticated"
-                h.sendOK(ctx, conn, event.ID, false, "auth-required: authentication required")
-                return nil
-        }
-
         // Rate limiting - use pubkey if authenticated, otherwise IP
+        // Check this BEFORE auth to prevent spam from wasting resources
         if h.limiter != nil {
                 identifier := state.authenticatedPubkey
                 if identifier == "" {
@@ -290,6 +279,18 @@ func (h *Handler) handleEvent(ctx context.Context, conn *websocket.Conn, raw []j
                 }
         }
 
+        if err := h.requireAuth(ctx, conn, true, state); err != nil {
+                status = "unauthorized"
+                h.sendOK(ctx, conn, event.ID, false, err.Error())
+                return nil
+        }
+
+        if state.authenticatedPubkey == "" && h.authConfig != nil && h.authConfig.WriteEnabled {
+                status = "unauthenticated"
+                h.sendOK(ctx, conn, event.ID, false, "auth-required: authentication required")
+                return nil
+        }
+
         // Event already parsed above for auth check
 
         if !event.CheckID() {
@@ -376,17 +377,8 @@ func (h *Handler) handleReq(ctx context.Context, conn *websocket.Conn, raw []jso
                 return fmt.Errorf("REQ expects at least 3 elements")
         }
 
-        if err := h.requireAuth(ctx, conn, false, state); err != nil {
-                status = "unauthorized"
-                return err
-        }
-
-        if state.authenticatedPubkey == "" && h.authConfig != nil && h.authConfig.ReadEnabled {
-                status = "unauthenticated"
-                return nil
-        }
-
         // Rate limiting - use pubkey if authenticated, otherwise IP
+        // Check this BEFORE auth to prevent spam from wasting resources
         if h.limiter != nil {
                 identifier := state.authenticatedPubkey
                 if identifier == "" {
@@ -398,6 +390,16 @@ func (h *Handler) handleReq(ctx context.Context, conn *websocket.Conn, raw []jso
                 }
         }
 
+        if err := h.requireAuth(ctx, conn, false, state); err != nil {
+                status = "unauthorized"
+                return err
+        }
+
+        if state.authenticatedPubkey == "" && h.authConfig != nil && h.authConfig.ReadEnabled {
+                status = "unauthenticated"
+                return nil
+        }
+
         var subID string
         if err := json.Unmarshal(raw[1], &subID); err != nil {
                 status = "error"