Skip to content

Open-source manufacturing ERP, MES and QMS. Quoting, MRP, inventory, shop floor, quality and lot/serial traceability on one Postgres schema, with a REST API and MCP server. Self-host or use Carbon Cloud.

fix(auth): the per-account sign-in lockout follows RATE_LIMIT

Sidwebworksba2446d3426c
diff --git a/apps/erp/app/routes/_public+/login.tsx b/apps/erp/app/routes/_public+/login.tsx
index c9fb1c7c3f..5442b8c548 100644
--- a/apps/erp/app/routes/_public+/login.tsx
+++ b/apps/erp/app/routes/_public+/login.tsx
@@ -39,7 +39,12 @@ import { getUserByEmail } from "@carbon/auth/users.server";
import { sendVerificationCode } from "@carbon/auth/verification.server";
import { isSsoEnabled, isSsoRequiredForEmail } from "@carbon/ee/sso.server";
import { Hidden, Input, Submit, ValidatedForm, validator } from "@carbon/form";
-import { AccountLockout, Ratelimit, redis } from "@carbon/kv";
+import {
+ AccountLockout,
+ maxAttemptsForRateLimit,
+ Ratelimit,
+ redis
+} from "@carbon/kv";
import { getLogger } from "@carbon/logger";
import {
Alert,
@@ -141,7 +146,10 @@ export async function action({ request }: ActionFunctionArgs) {
// hammering one account to spam magic links / probe existence, is bounded per
// account. The reply is deliberately GENERIC (never reveals whether the
// account exists) to avoid user enumeration.
- const lockout = new AccountLockout({ redis });
+ const lockout = new AccountLockout({
+ redis,
+ maxAttempts: maxAttemptsForRateLimit(RATE_LIMIT)
+ });
const LOCKED_MESSAGE =
"For your security, sign-in for this account is temporarily paused. Please try again later.";
diff --git a/apps/mes/app/routes/_public+/login.tsx b/apps/mes/app/routes/_public+/login.tsx
index d3eadeaa47..03699149f2 100644
--- a/apps/mes/app/routes/_public+/login.tsx
+++ b/apps/mes/app/routes/_public+/login.tsx
@@ -33,7 +33,12 @@ import {
import { getUserByEmail } from "@carbon/auth/users.server";
import { isSsoEnabled, isSsoRequiredForEmail } from "@carbon/ee/sso.server";
import { Hidden, Input, Submit, ValidatedForm, validator } from "@carbon/form";
-import { AccountLockout, Ratelimit, redis } from "@carbon/kv";
+import {
+ AccountLockout,
+ maxAttemptsForRateLimit,
+ Ratelimit,
+ redis
+} from "@carbon/kv";
import { getLogger } from "@carbon/logger";
import {
Alert,
@@ -144,7 +149,10 @@ export async function action({ request }: ActionFunctionArgs) {
// Per-account lockout (NIST 800-171 3.1.8) — layered ON TOP of the IP limit
// above, keyed by the normalized email. Rejects with a GENERIC message that
// never reveals whether the account exists (avoids user enumeration).
- const lockout = new AccountLockout({ redis });
+ const lockout = new AccountLockout({
+ redis,
+ maxAttempts: maxAttemptsForRateLimit(RATE_LIMIT)
+ });
const LOCKED_MESSAGE =
"For your security, sign-in for this account is temporarily paused. Please try again later.";
diff --git a/packages/kv/src/index.ts b/packages/kv/src/index.ts
index 7d0811e986..2c702b7bd9 100644
--- a/packages/kv/src/index.ts
+++ b/packages/kv/src/index.ts
@@ -20,6 +20,7 @@ export {
DEFAULT_WINDOW,
evaluateLockFromPttl,
lockDurationSeconds,
+ maxAttemptsForRateLimit,
normalizeLoginIdentifier
} from "./lockout";
export type {
diff --git a/packages/kv/src/lockout/index.ts b/packages/kv/src/lockout/index.ts
index 509887dba3..f6b9982795 100644
--- a/packages/kv/src/lockout/index.ts
+++ b/packages/kv/src/lockout/index.ts
@@ -16,5 +16,6 @@ export {
DEFAULT_WINDOW,
evaluateLockFromPttl,
lockDurationSeconds,
+ maxAttemptsForRateLimit,
normalizeLoginIdentifier
} from "./lockout";
diff --git a/packages/kv/src/lockout/lockout.test.ts b/packages/kv/src/lockout/lockout.test.ts
index d693244c48..143b6ae1ef 100644
--- a/packages/kv/src/lockout/lockout.test.ts
+++ b/packages/kv/src/lockout/lockout.test.ts
@@ -7,9 +7,11 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
import {
AccountLockout,
DEFAULT_BASE_LOCK_SECONDS,
+ DEFAULT_MAX_ATTEMPTS,
DEFAULT_MAX_LOCK_SECONDS,
evaluateLockFromPttl,
lockDurationSeconds,
+ maxAttemptsForRateLimit,
normalizeLoginIdentifier
} from "./lockout";
@@ -271,3 +273,12 @@ describe("AccountLockout", () => {
});
});
});
+
+describe("maxAttemptsForRateLimit", () => {
+ it("is a quarter of the hourly RATE_LIMIT, never below the default", () => {
+ expect(maxAttemptsForRateLimit(5)).toBe(DEFAULT_MAX_ATTEMPTS);
+ expect(maxAttemptsForRateLimit(1000)).toBe(250);
+ expect(maxAttemptsForRateLimit(30)).toBe(8);
+ expect(maxAttemptsForRateLimit(Number.NaN)).toBe(DEFAULT_MAX_ATTEMPTS);
+ });
+});
diff --git a/packages/kv/src/lockout/lockout.ts b/packages/kv/src/lockout/lockout.ts
index c3cba16637..3b6612d15b 100644
--- a/packages/kv/src/lockout/lockout.ts
+++ b/packages/kv/src/lockout/lockout.ts
@@ -31,6 +31,20 @@ export const DEFAULT_MAX_LOCK_SECONDS = 60 * 60; // cap: 1 hour
/** How long a lock "level" survives so repeat offenders keep escalating. */
export const DEFAULT_LEVEL_TTL_SECONDS = 24 * 60 * 60; // 1 day
+/**
+ * The per-account allowance for a login route, from its per-IP hourly
+ * RATE_LIMIT: a quarter of the hour's budget per 15-minute window, never
+ * fewer than DEFAULT_MAX_ATTEMPTS. At the default RATE_LIMIT of 5 that is
+ * the default; a deployment that raises RATE_LIMIT raises this with it,
+ * one knob for both.
+ */
+export function maxAttemptsForRateLimit(ratePerHour: number): number {
+ if (!Number.isFinite(ratePerHour) || ratePerHour <= 0) {
+ return DEFAULT_MAX_ATTEMPTS;
+ }
+ return Math.max(DEFAULT_MAX_ATTEMPTS, Math.ceil(ratePerHour / 4));
+}
+
const DEFAULT_PREFIX = "@carbon/lockout";
/**