Compare commits

..
Author SHA1 Message Date
Typosaurus 9691b8a938 ticket #105 attempt 1 2026-07-19 21:21:24 +00:00
13 changed files with 60 additions and 108 deletions
File diff suppressed because one or more lines are too long
+17
View File
@@ -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
+17
View File
@@ -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")
-42
View File
@@ -8,11 +8,6 @@ export class CommentManager {
this.initCommentReply();
this.initCommentEdit();
this.initCommentDelete();
document.addEventListener("paste", (event) => {
const textarea = event.target.closest("form textarea[name='body'], form textarea[name='content']");
if (!textarea) return;
this._onPaste(event, textarea);
});
}
initCommentDelete() {
@@ -213,41 +208,4 @@ export class CommentManager {
if (btn) btn.disabled = true;
});
}
_onPaste(event, textarea) {
const items = event.clipboardData?.items;
if (!items) return;
for (const item of items) {
if (item.kind === "file" && item.type.startsWith("image/")) {
event.preventDefault();
const file = item.getAsFile();
const namedFile = new File([file], file.name || "clipboard.png", { type: file.type });
this._uploadImage(namedFile, textarea);
break;
}
}
}
async _uploadImage(file, textarea) {
const formData = new FormData();
formData.append("file", file, file.name);
try {
const response = await fetch("/uploads/upload", {
method: "POST",
headers: {
"Accept": "application/json",
"X-Requested-With": "fetch",
},
body: formData,
});
if (!response.ok) {
const data = await response.json().catch(() => ({}));
throw new Error(data.error || `Upload failed (${response.status})`);
}
const result = await response.json();
window.TextInput.insertAtCursor(textarea, `![](${result.url})`);
} catch (err) {
Http.notifyError(err.message);
}
}
}
-42
View File
@@ -12,48 +12,6 @@ export class IssueReporter {
event.preventDefault();
this.submit(form);
});
document.addEventListener("paste", (event) => {
const textarea = event.target.closest("form[data-issue-create] [name='description']");
if (!textarea) return;
this._onPaste(event, textarea);
});
}
_onPaste(event, textarea) {
const items = event.clipboardData?.items;
if (!items) return;
for (const item of items) {
if (item.kind === "file" && item.type.startsWith("image/")) {
event.preventDefault();
const file = item.getAsFile();
const namedFile = new File([file], file.name || "clipboard.png", { type: file.type });
this._uploadImage(namedFile, textarea);
break;
}
}
}
async _uploadImage(file, textarea) {
const formData = new FormData();
formData.append("file", file, file.name);
try {
const response = await fetch("/uploads/upload", {
method: "POST",
headers: {
"Accept": "application/json",
"X-Requested-With": "fetch",
},
body: formData,
});
if (!response.ok) {
const data = await response.json().catch(() => ({}));
throw new Error(data.error || `Upload failed (${response.status})`);
}
const result = await response.json();
window.TextInput.insertAtCursor(textarea, `![](${result.url})`);
} catch (err) {
Http.notifyError(err.message);
}
}
async submit(form) {
+24
View File
@@ -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
-14
View File
@@ -240,17 +240,3 @@ def test_delete_own_allowed_other_user_forbidden(app_server):
bob = _session_uploads()
assert bob.delete(f"{BASE_URL}/uploads/delete/{uid}").status_code == 403
assert alice.delete(f"{BASE_URL}/uploads/delete/{uid}").status_code == 200
def test_paste_image_upload_returns_url(app_server):
s = _session_uploads()
r = s.post(
f"{BASE_URL}/uploads/upload",
files={"file": ("clipboard.png", _png_bytes_uploads(), "image/png")},
)
assert r.status_code == 201, r.text
data = r.json()
assert "url" in data
assert data["url"].startswith("/static/uploads/attachments/")
assert data["uid"]
assert data["is_image"] is True
+1
View File
@@ -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"
-1
View File
@@ -1 +0,0 @@
python3
-1
View File
@@ -1 +0,0 @@
/usr/bin/python3
-1
View File
@@ -1 +0,0 @@
python3
-1
View File
@@ -1 +0,0 @@
lib
-5
View File
@@ -1,5 +0,0 @@
home = /usr/bin
include-system-site-packages = false
version = 3.11.2
executable = /usr/bin/python3.11
command = /usr/bin/python3 -m venv /workspace/repo/venv