Private
Public Access
S4: the throttle keyed on the first X-Forwarded-For entry, which a client or a proxy that appends can choose, and disabled itself entirely when Redis was down. EVECTION_TRUSTED_PROXIES (IPs/CIDRs of your reverse proxy) makes it strict: X-Forwarded-For is only believed when the TCP peer is a trusted proxy, and the rightmost entry that isn't itself a trusted proxy — the address the proxy actually saw — is used instead of the spoofable first one. Unset keeps the previous behavior so existing installs don't suddenly share one bucket behind a proxy, and `manage.py check --deploy` warns (evection.W001) until it's set. During a Redis outage the throttle now falls back to a bounded in-process limiter instead of switching off. C5: /health/ready/ reuses its queue/feed aggregates for 15s (EVECTION_HEALTH_CACHE_SECONDS) so a fast-polling monitor can't create steady load; the database, Redis and poller probes stay live. Docs cover both settings, restricting the endpoint at the proxy, and the tombstone/purge behavior from the previous changes. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
aacb41d1d3
commit
ac5e951749
12 files changed
+386
-53
No files matched your search
+7
-38
@@ -4,13 +4,13 @@ from django.contrib import messages
|
||||
from django.contrib.auth import login
|
||||
from django.contrib.auth.decorators import user_passes_test
|
||||
from django.contrib.auth.views import LoginView as DjangoLoginView
|
||||
from django.core.cache import cache
|
||||
from django.db import IntegrityError, transaction
|
||||
from django.shortcuts import redirect, render
|
||||
|
||||
from .forms import CreateUserForm, SetupForm
|
||||
from .middleware import SetupWizardMiddleware
|
||||
from .models import SetupLock, User
|
||||
from .throttle import LoginThrottle, client_address
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -27,44 +27,13 @@ LOGIN_RATE_LIMIT_MAX_ATTEMPTS_PER_ADDRESS = 15
|
||||
LOGIN_RATE_LIMIT_MAX_ATTEMPTS_PER_USERNAME = 8
|
||||
|
||||
|
||||
def _client_address(request) -> str:
|
||||
# gunicorn is always run behind a reverse proxy in every deployment
|
||||
# (see docs/install.md) and its bind address is never meant to be
|
||||
# reachable from outside that proxy — the same trust boundary
|
||||
# config.settings.prod already relies on for X-Forwarded-Proto. A
|
||||
# direct request (e.g. local dev) has no X-Forwarded-For and falls
|
||||
# back to REMOTE_ADDR.
|
||||
forwarded_for = request.META.get("HTTP_X_FORWARDED_FOR", "")
|
||||
if forwarded_for:
|
||||
return forwarded_for.split(",")[0].strip()
|
||||
return request.META.get("REMOTE_ADDR", "unknown")
|
||||
login_throttle = LoginThrottle(LOGIN_RATE_LIMIT_WINDOW_SECONDS)
|
||||
|
||||
|
||||
def _attempts_key(kind: str, value: str) -> str:
|
||||
return f"login-attempts:{kind}:{value}"
|
||||
|
||||
|
||||
def _too_many_attempts(key: str, limit: int) -> bool:
|
||||
# Fails open if the cache (Redis) is unreachable: logging in must keep
|
||||
# working through a cache outage, at the cost of no throttling until
|
||||
# it's back — an outage shouldn't lock every user out of the app.
|
||||
try:
|
||||
return cache.get(key, 0) >= limit
|
||||
except Exception:
|
||||
logger.warning("Login throttle cache unavailable; not rate limiting", exc_info=True)
|
||||
return False
|
||||
|
||||
|
||||
def _record_failed_attempt(key: str) -> None:
|
||||
try:
|
||||
try:
|
||||
cache.incr(key)
|
||||
except ValueError:
|
||||
cache.set(key, 1, LOGIN_RATE_LIMIT_WINDOW_SECONDS)
|
||||
except Exception:
|
||||
logger.warning("Login throttle cache unavailable; attempt not recorded", exc_info=True)
|
||||
|
||||
|
||||
class LoginView(DjangoLoginView):
|
||||
"""Wraps Django's own LoginView with the throttle above — everything
|
||||
else (form, template, redirect behavior) is unchanged."""
|
||||
@@ -72,11 +41,11 @@ class LoginView(DjangoLoginView):
|
||||
template_name = "accounts/login.html"
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
address_key = _attempts_key("addr", _client_address(request))
|
||||
address_key = _attempts_key("addr", client_address(request))
|
||||
username_key = _attempts_key("user", request.POST.get("username", "")[:150])
|
||||
if _too_many_attempts(
|
||||
if login_throttle.is_blocked(
|
||||
address_key, LOGIN_RATE_LIMIT_MAX_ATTEMPTS_PER_ADDRESS
|
||||
) or _too_many_attempts(username_key, LOGIN_RATE_LIMIT_MAX_ATTEMPTS_PER_USERNAME):
|
||||
) or login_throttle.is_blocked(username_key, LOGIN_RATE_LIMIT_MAX_ATTEMPTS_PER_USERNAME):
|
||||
messages.error(
|
||||
request, "Too many login attempts. Please wait a few minutes and try again."
|
||||
)
|
||||
@@ -84,8 +53,8 @@ class LoginView(DjangoLoginView):
|
||||
return super().post(request, *args, **kwargs)
|
||||
|
||||
def form_invalid(self, form):
|
||||
_record_failed_attempt(_attempts_key("addr", _client_address(self.request)))
|
||||
_record_failed_attempt(_attempts_key("user", self.request.POST.get("username", "")[:150]))
|
||||
login_throttle.record(_attempts_key("addr", client_address(self.request)))
|
||||
login_throttle.record(_attempts_key("user", self.request.POST.get("username", "")[:150]))
|
||||
return super().form_invalid(form)
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user