forked from retoor/devplacepy
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
131f988bea | ||
|
|
1c31c1d6a5 |
File diff suppressed because one or more lines are too long
@@ -128,9 +128,6 @@ 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 = {}
|
||||
@@ -170,20 +167,6 @@ 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
|
||||
|
||||
|
||||
|
||||
@@ -20,7 +20,6 @@ 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()
|
||||
@@ -73,22 +72,6 @@ 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")
|
||||
|
||||
@@ -115,7 +115,6 @@ devii-terminal.devii-state-fullscreen .devii-window {
|
||||
}
|
||||
|
||||
devii-terminal.devii-state-normal .devii-window {
|
||||
resize: both;
|
||||
}
|
||||
devii-terminal.devii-state-normal .devii-titlebar {
|
||||
cursor: move;
|
||||
|
||||
@@ -86,6 +86,7 @@ export class DeviiTerminal {
|
||||
}
|
||||
|
||||
_canOpenOnGesture() {
|
||||
if (this.element && this.element.state !== "closed") return false;
|
||||
if (document.querySelector(".modal-overlay.visible")) return false;
|
||||
if (document.querySelector(".dialog-overlay.visible")) return false;
|
||||
if (document.querySelector(".context-menu.visible")) return false;
|
||||
|
||||
@@ -297,8 +297,8 @@ export default class FloatingWindow extends Component {
|
||||
if (!this.geometry) return;
|
||||
const g = this.geometry;
|
||||
const safeHeight = this._safeViewport.height;
|
||||
g.width = Math.min(g.width, window.innerWidth - 16);
|
||||
g.height = Math.min(g.height, safeHeight - 16);
|
||||
g.width = Math.max(320, Math.min(g.width, window.innerWidth - 16));
|
||||
g.height = Math.max(220, Math.min(g.height, safeHeight - 16));
|
||||
g.left = Math.max(8, Math.min(g.left, window.innerWidth - g.width - 8));
|
||||
g.top = Math.max(8, Math.min(g.top, safeHeight - g.height - 8));
|
||||
}
|
||||
@@ -409,8 +409,8 @@ export default class FloatingWindow extends Component {
|
||||
this._ro = new ResizeObserver(() => {
|
||||
if (this.state === "normal" && this.geometry && !this._drag) {
|
||||
const rect = this.win.getBoundingClientRect();
|
||||
this.geometry.width = Math.round(rect.width);
|
||||
this.geometry.height = Math.round(rect.height);
|
||||
this.geometry.width = Math.max(320, Math.round(rect.width));
|
||||
this.geometry.height = Math.max(220, Math.round(rect.height));
|
||||
this._persistGeometry();
|
||||
}
|
||||
this._syncControls();
|
||||
|
||||
@@ -181,27 +181,3 @@ 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
|
||||
|
||||
@@ -23,7 +23,6 @@ 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"
|
||||
|
||||
Reference in New Issue
Block a user