ticket #105 attempt 1

devplacepy/database/schema.py

@@ -1070,7 +1070,6 @@ def init_db():
         ("planted_at", ""),
         ("ready_at", ""),
         ("watered_by", "[]"),
-        ("cooldown_until", ""),
         ("created_at", ""),
         ("updated_at", ""),
     ):
@@ -1078,18 +1077,6 @@ def init_db():
             game_plots.create_column_by_example(column, example)
     _index(db, "game_plots", "idx_game_plots_farm", ["farm_uid", "slot_index"])
 
-    _drop_index(db, "idx_rate_limit_log_user_ts")
-    rate_limit_log = get_table("rate_limit_log")
-    for column, example in (
-        ("uid", ""),
-        ("user_uid", ""),
-        ("action", ""),
-        ("timestamp", ""),
-    ):
-        if not rate_limit_log.has_column(column):
-            rate_limit_log.create_column_by_example(column, example)
-    _index(db, "rate_limit_log", "idx_rate_limit_log_user_ts", ["user_uid", "timestamp"])
-
     _index(db, "posts", "idx_posts_user_created", ["user_uid", "created_at"])
     _index(
         db,

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/routers/game/farm.py

@@ -1,12 +1,10 @@
 # retoor <retoor@molodetz.nl>
 
-from datetime import datetime, timedelta, timezone
 from typing import Annotated
 
 from fastapi import APIRouter, Form, HTTPException, Request
 from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse
 
-from devplacepy.database import db, get_table
 from devplacepy.models import GameSlotForm
 from devplacepy.responses import json_error, respond, wants_json
 from devplacepy.schemas import GameFarmViewOut
@@ -20,33 +18,6 @@ from devplacepy.utils import (
 
 from ._shared import game_seo, notify_farm, owner_by_username
 
-_MAX_ACTIONS_PER_MINUTE = 30
-_RATE_WINDOW_SECONDS = 60
-
-
-def _check_farm_rate_limit(user_uid: str) -> None:
-    cutoff = (datetime.now(timezone.utc) - timedelta(seconds=_RATE_WINDOW_SECONDS)).isoformat()
-    result = list(
-        db.query(
-            "SELECT COUNT(*) AS c FROM rate_limit_log"
-            " WHERE user_uid = :uid AND timestamp >= :cutoff",
-            uid=user_uid,
-            cutoff=cutoff,
-        )
-    )
-    count = result[0]["c"] if result else 0
-    if count >= _MAX_ACTIONS_PER_MINUTE:
-        raise HTTPException(
-            status_code=429,
-            detail="Rate limit exceeded. Max 30 actions per minute.",
-        )
-    get_table("rate_limit_log").insert({
-        "user_uid": user_uid,
-        "action": "",
-        "timestamp": datetime.now(timezone.utc).isoformat(),
-    })
-
-
 router = APIRouter()
 
 
@@ -82,7 +53,6 @@ async def water_farm(
     request: Request, username: str, data: Annotated[GameSlotForm, Form()]
 ):
     viewer = require_user(request)
-    _check_farm_rate_limit(viewer["uid"])
     owner = owner_by_username(username)
     if not owner:
         raise HTTPException(status_code=404, detail="Farm not found")
@@ -107,7 +77,6 @@ async def steal_farm(
     request: Request, username: str, data: Annotated[GameSlotForm, Form()]
 ):
     viewer = require_user(request)
-    _check_farm_rate_limit(viewer["uid"])
     owner = owner_by_username(username)
     if not owner:
         raise HTTPException(status_code=404, detail="Farm not found")

devplacepy/routers/game/index.py

@@ -1,9 +1,8 @@
 # retoor <retoor@molodetz.nl>
 
-from datetime import datetime, timedelta, timezone
 from typing import Annotated
 
-from fastapi import APIRouter, Form, HTTPException, Request
+from fastapi import APIRouter, Form, Request
 from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse
 
 from devplacepy.models import (
@@ -13,7 +12,7 @@ from devplacepy.models import (
     GameQuestForm,
     GameSlotForm,
 )
-from devplacepy.database import db, get_table, mark_notifications_read_by_target
+from devplacepy.database import mark_notifications_read_by_target
 from devplacepy.responses import json_error, respond, wants_json
 from devplacepy.schemas import GameLeaderboardOut, GameStateOut
 from devplacepy.services.game import GameError, store
@@ -21,33 +20,6 @@ from devplacepy.utils import award_rewards, get_current_user, require_user, trac
 
 from ._shared import game_seo, notify_farm, state_payload
 
-_MAX_ACTIONS_PER_MINUTE = 30
-_RATE_WINDOW_SECONDS = 60
-
-
-def _check_rate_limit(user_uid: str) -> None:
-    cutoff = (datetime.now(timezone.utc) - timedelta(seconds=_RATE_WINDOW_SECONDS)).isoformat()
-    result = list(
-        db.query(
-            "SELECT COUNT(*) AS c FROM rate_limit_log"
-            " WHERE user_uid = :uid AND timestamp >= :cutoff",
-            uid=user_uid,
-            cutoff=cutoff,
-        )
-    )
-    count = result[0]["c"] if result else 0
-    if count >= _MAX_ACTIONS_PER_MINUTE:
-        raise HTTPException(
-            status_code=429,
-            detail="Rate limit exceeded. Max 30 actions per minute.",
-        )
-    get_table("rate_limit_log").insert({
-        "user_uid": user_uid,
-        "action": "",
-        "timestamp": datetime.now(timezone.utc).isoformat(),
-    })
-
-
 router = APIRouter()
 
 
@@ -86,7 +58,6 @@ async def game_leaderboard(request: Request):
 
 
 async def _respond_action(request: Request, user: dict, fn, on_success=None):
-    _check_rate_limit(user["uid"])
     try:
         result = fn()
     except GameError as exc:

devplacepy/services/devii/actions/dispatcher.py

@@ -60,18 +60,6 @@ CONFIRM_REQUIRED = {
     "gateway_model_delete",
     "email_account_delete",
     "email_delete_message",
-    "game_buy_plot",
-    "game_claim_quest",
-    "game_daily",
-    "game_fertilize",
-    "game_harvest",
-    "game_plant",
-    "game_prestige",
-    "game_steal",
-    "game_upgrade_ci",
-    "game_upgrade_legacy",
-    "game_upgrade_perk",
-    "game_water",
 }
 
 CONDITIONAL_CONFIRM = {

devplacepy/services/game/store/actions.py

@@ -39,9 +39,6 @@ def plant(user: dict, slot: int, crop_key: str) -> dict:
     plot = _plot_at(farm["uid"], slot)
     if not plot:
         raise GameError("That plot does not exist.")
-    cooldown = plot.get("cooldown_until", "")
-    if cooldown and _now() < _parse_date(cooldown):
-        raise GameError("This plot is on cooldown. Wait a moment before planting.")
     if plot.get("crop_key"):
         raise GameError("That plot is already in use.")
     coins = int(farm.get("coins", 0))
@@ -88,7 +85,6 @@ def harvest(user: dict, slot: int) -> dict:
             "planted_at": "",
             "ready_at": "",
             "watered_by": "[]",
-            "cooldown_until": _iso(now + timedelta(seconds=5)),
             "updated_at": _iso(now),
         },
         ["uid"],

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/api/game/index.py

@@ -177,23 +177,3 @@ def test_prestige_below_level_returns_400(app_server, seeded_db):
     _reset_farm(name)
     response = session.post(f"{BASE_URL}/game/prestige", headers=JSON)
     assert response.status_code == 400
-
-
-def test_rate_limit_blocks_excess_requests(app_server, seeded_db):
-    session, name = _signup()
-    _reset_farm(name)
-    responses = []
-    for _ in range(31):
-        responses.append(
-            session.post(f"{BASE_URL}/game/buy-plot", headers=JSON)
-        )
-    success_count = sum(1 for r in responses[:30] if r.status_code != 429)
-    assert success_count >= 1, "expected at least one successful request"
-    assert responses[-1].status_code == 429, f"expected 429 on 31st request, got {responses[-1].status_code}"
-    assert "Rate limit exceeded" in responses[-1].json().get("detail", "")
-    # Verify the rate limit log stored entries for the test user
-    from devplacepy.database import get_table
-    user = get_table("users").find_one(username=name)
-    table = get_table("rate_limit_log")
-    entries = list(table.find(user_uid=user["uid"]))
-    assert len(entries) >= 2, f"expected rate log entries, got {len(entries)}"

tests/api/game/mutations.py

@@ -212,28 +212,3 @@ def test_steal_cooldown_blocks_second_raid(app_server, seeded_db):
         f"{BASE_URL}/game/farm/{owner}/steal", data={"slot": 0}, headers=JSON
     )
     assert second.status_code == 400
-
-
-def test_harvest_plant_cooldown_blocks_rapid_replant(app_server, seeded_db):
-    session, name = _signup()
-    _reset_farm(name)
-    # Plant and ripen a crop on slot 0
-    plant = session.post(
-        f"{BASE_URL}/game/plant", data={"slot": 0, "crop": "shell"}, headers=JSON
-    )
-    assert plant.status_code == 200
-    _ripen_owner_plot(name)
-    # Harvest it — this sets a 5-second cooldown on the plot
-    harvest = session.post(f"{BASE_URL}/game/harvest", data={"slot": 0}, headers=JSON)
-    assert harvest.status_code == 200
-    # Immediately replant on the same slot — must fail
-    replant = session.post(
-        f"{BASE_URL}/game/plant", data={"slot": 0, "crop": "shell"}, headers=JSON
-    )
-    assert replant.status_code == 400
-    assert "cooldown" in replant.text.lower()
-    # A different slot should still work
-    other = session.post(
-        f"{BASE_URL}/game/plant", data={"slot": 1, "crop": "shell"}, headers=JSON
-    )
-    assert other.status_code == 200

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/unit/services/devii/actions/catalog.py

@@ -119,23 +119,3 @@ def test_game_actions_registered_with_correct_auth():
 def test_game_read_actions_are_read_only():
     for name in ("game_state", "game_leaderboard", "game_view_farm"):
         assert BY_NAME[name].is_read_only is True
-
-
-def test_all_game_post_actions_require_confirm():
-    mutating_game_actions = {
-        "game_plant",
-        "game_harvest",
-        "game_buy_plot",
-        "game_upgrade_ci",
-        "game_water",
-        "game_steal",
-        "game_fertilize",
-        "game_daily",
-        "game_upgrade_perk",
-        "game_claim_quest",
-        "game_prestige",
-        "game_upgrade_legacy",
-    }
-    for name in mutating_game_actions:
-        assert name in BY_NAME, f"{name} missing from catalog"
-        assert name in CONFIRM_REQUIRED, f"{name} missing from CONFIRM_REQUIRED"