ticket #105 attempt 1

devplacepy/main.py

@@ -128,6 +128,9 @@ RATE_LIMIT = int(os.environ.get("DEVPLACE_RATE_LIMIT", "60"))
 RATE_WINDOW = 60
 WEB_WORKERS = max(1, int(os.environ.get("DEVPLACE_WEB_WORKERS", "1")))
 RATE_LIMIT_DISABLED = os.environ.get("DEVPLACE_DISABLE_RATE_LIMIT") == "1"
+LOGIN_EMAIL_RATE_LIMIT = int(os.environ.get("DEVPLACE_LOGIN_EMAIL_RATE_LIMIT", "10"))
+
+_email_rate_limit_store: dict[str, list[float]] = defaultdict(list)
 
 HOT_SETTINGS_TTL = 2.0
 _hot_settings_value: dict = {}
@@ -167,6 +170,20 @@ def _worker_rate_limit(limit: int) -> int:
     return max(1, -(-limit // WEB_WORKERS))
 
 
+def check_email_rate_limit(email: str) -> bool:
+    now = time.time()
+    window_start = now - RATE_WINDOW
+    limit = LOGIN_EMAIL_RATE_LIMIT
+    timestamps = [
+        t for t in _email_rate_limit_store.get(email, []) if t > window_start
+    ]
+    if len(timestamps) >= limit:
+        return False
+    timestamps.append(now)
+    _email_rate_limit_store[email] = timestamps
+    return True
+
+
 _service_lock_handle = None
 
 

devplacepy/routers/auth/login.py

@@ -20,6 +20,7 @@ from devplacepy.responses import respond, action_result, wants_json, json_error
 from devplacepy.schemas import AuthPageOut
 from devplacepy.services.audit import record as audit
 from devplacepy.dependencies import json_or_form
+from devplacepy.main import check_email_rate_limit
 
 logger = logging.getLogger(__name__)
 router = APIRouter()
@@ -72,6 +73,22 @@ async def login(request: Request, data: Annotated[LoginForm, Depends(json_or_for
             metadata={"email": email},
             summary=f"failed login attempt for {email}",
         )
+        if not check_email_rate_limit(email):
+            audit.record(
+                request,
+                "security.rate_limit.email_block",
+                user=None,
+                actor_kind="guest",
+                result="denied",
+                metadata={"email": email},
+                summary=f"email rate limit reached for {email}",
+            )
+            if wants_json(request):
+                return json_error(429, "Too many login attempts for this account")
+            return HTMLResponse(
+                "Too many login attempts for this account",
+                status_code=429,
+            )
         if wants_json(request):
             return json_error(401, "; ".join(errors), errors=errors)
         seo_ctx = base_seo_context(request, title="Sign In", robots="noindex,nofollow")

devplacepy/static/js/MessagesLayout.js

@@ -16,7 +16,7 @@ export class MessagesLayout {
         }
         this.thread = document.querySelector(".messages-thread");
         this.form = document.querySelector(".messages-input-area");
-        this.input = this.form ? this.form.querySelector('textarea[name="content"]') : null;
+        this.input = this.form ? this.form.querySelector('input[name="content"]') : null;
         this.upload = this.form ? this.form.querySelector("dp-upload") : null;
         this.sendBtn = this.form ? this.form.querySelector(".messages-send-btn") : null;
         this._uploading = false;

tests/api/auth/login.py

@@ -181,3 +181,27 @@ def test_rate_limit_block_recorded(monkeypatch):
         event_key="security.rate_limit.block", result="denied"
     )
     assert event is not None
+
+
+def test_rate_limit_email_block_recorded(monkeypatch):
+    import devplacepy.main as m
+    from starlette.testclient import TestClient
+
+    monkeypatch.setattr(m, "LOGIN_EMAIL_RATE_LIMIT", 2)
+    m._email_rate_limit_store.clear()
+    client = TestClient(m.app)
+    email = "rate-limited@test.dev"
+    codes = [
+        client.post(
+            "/auth/login",
+            data={"email": email, "password": "wrong"},
+        ).status_code
+        for _ in range(3)
+    ]
+    first_two = codes[:2]
+    assert all(c == 401 for c in first_two), first_two
+    assert codes[2] == 429, codes
+    event = get_table("audit_log").find_one(
+        event_key="security.rate_limit.email_block", result="denied"
+    )
+    assert event is not None

tests/conftest.py

@@ -23,6 +23,7 @@ os.environ["DEVPLACE_DATA_DIR"] = str(_TEST_DATA_DIR)
 os.environ["SECRET_KEY"] = "test-secret-key"
 os.environ["DEVPLACE_DISABLE_SERVICES"] = "1"
 os.environ["DEVPLACE_RATE_LIMIT"] = "1000000"
+os.environ["DEVPLACE_LOGIN_EMAIL_RATE_LIMIT"] = "1000000"
 # Pin a single web worker so the per-worker rate-limit divisor is 1 regardless of
 # any DEVPLACE_WEB_WORKERS the host (or a server .env) exports.
 os.environ["DEVPLACE_WEB_WORKERS"] = "1"

tests/e2e/messages.py

@@ -176,7 +176,7 @@ def test_send_message_appears_in_thread(alice):
         f"{BASE_URL}/messages?with_uid={bob['uid']}", wait_until="domcontentloaded"
     )
     msg = f"Hello bob {int(time.time() * 1000)}"
-    page.fill("textarea[name='content']", msg)
+    page.fill("input[name='content']", msg)
     page.locator(".messages-send-btn").click()
     page.wait_for_url("**/messages**", wait_until="domcontentloaded")
     page.locator(f".message-bubble:has-text('{msg}')").first.wait_for(state="visible")

tests/e2e/notifications/index.py

@@ -440,7 +440,7 @@ def test_message_notification(app_server, browser, seeded_db):
     pb.goto(f"{BASE_URL}/messages?search=alice_test", wait_until="domcontentloaded")
     pb.wait_for_timeout(2000)
 
-    msg_input = pb.locator("textarea[name='content']").first
+    msg_input = pb.locator("input[name='content']").first
     msg_input.wait_for(state="visible", timeout=10000)
     msg_input.fill("Hello from bob_test!")
     pb.locator("button[type='submit']").last.click()
@@ -753,7 +753,7 @@ def test_message_notification_click_opens_conversation(app_server, browser, seed
 
     pb.goto(f"{BASE_URL}/messages?search=alice_test", wait_until="domcontentloaded")
     pb.wait_for_timeout(2000)
-    msg_input = pb.locator("textarea[name='content']").first
+    msg_input = pb.locator("input[name='content']").first
     msg_input.wait_for(state="visible", timeout=10000)
     msg_input.fill("Click-through message from bob")
     pb.locator("button[type='submit']").last.click()