@terreno/api 57.2.0 → 57.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +17 -7
- package/dist/actions.js +19 -7
- package/dist/api.d.ts +4 -0
- package/dist/api.js +12 -24
- package/dist/auth.d.ts +23 -10
- package/dist/auth.js +97 -32
- package/dist/authRecovery.d.ts +5 -0
- package/dist/authRecovery.js +350 -0
- package/dist/authTokens.d.ts +8 -0
- package/dist/authTokens.js +162 -0
- package/dist/betterAuth.d.ts +33 -0
- package/dist/betterAuthApp.d.ts +4 -0
- package/dist/betterAuthApp.js +26 -8
- package/dist/betterAuthSetup.d.ts +44 -2
- package/dist/betterAuthSetup.js +288 -18
- package/dist/collectionRegistry.d.ts +38 -0
- package/dist/collectionRegistry.js +72 -0
- package/dist/configurationApp.d.ts +11 -2
- package/dist/configurationApp.js +2 -4
- package/dist/docLoader.js +35 -6
- package/dist/expressServer.d.ts +26 -3
- package/dist/expressServer.js +79 -11
- package/dist/index.d.ts +16 -0
- package/dist/index.js +38 -2
- package/dist/mcp/auth.d.ts +1 -0
- package/dist/mcp/auth.js +47 -25
- package/dist/mcp/handlers.d.ts +1 -1
- package/dist/mcp/handlers.js +67 -233
- package/dist/mcp/query.d.ts +2 -2
- package/dist/mcp/registry.d.ts +1 -5
- package/dist/mcp/registry.js +31 -20
- package/dist/mcp/schemaGenerator.d.ts +2 -7
- package/dist/mcp/schemaGenerator.js +41 -116
- package/dist/mcp/server.d.ts +1 -0
- package/dist/mcp/server.js +1 -0
- package/dist/mcp/serviceTokens.d.ts +16 -0
- package/dist/mcp/serviceTokens.js +345 -0
- package/dist/mcp/types.d.ts +2 -2
- package/dist/models/mcpServiceToken.d.ts +3 -0
- package/dist/models/mcpServiceToken.js +208 -0
- package/dist/openApiBuilder.d.ts +5 -4
- package/dist/openApiBuilder.js +61 -8
- package/dist/openApiCompat.js +1 -1
- package/dist/openApiValidator.js +0 -2
- package/dist/plugins.d.ts +14 -1
- package/dist/plugins.js +17 -6
- package/dist/populate.d.ts +2 -2
- package/dist/populate.js +47 -42
- package/dist/rateLimit/applyTrustProxy.d.ts +3 -0
- package/dist/rateLimit/applyTrustProxy.js +17 -0
- package/dist/rateLimit/createStore.d.ts +2 -0
- package/dist/rateLimit/createStore.js +28 -0
- package/dist/rateLimit/memoryStore.d.ts +2 -0
- package/dist/rateLimit/memoryStore.js +108 -0
- package/dist/rateLimit/middleware.d.ts +11 -0
- package/dist/rateLimit/middleware.js +110 -0
- package/dist/rateLimit/mongoStore.d.ts +3 -0
- package/dist/rateLimit/mongoStore.js +122 -0
- package/dist/rateLimit/policies.d.ts +14 -0
- package/dist/rateLimit/policies.js +151 -0
- package/dist/rateLimit/redisStore.d.ts +3 -0
- package/dist/rateLimit/redisStore.js +155 -0
- package/dist/rateLimit/types.d.ts +54 -0
- package/dist/rateLimit/types.js +9 -0
- package/dist/rbac/access.js +5 -1
- package/dist/rbac/assertAllowed.d.ts +9 -0
- package/dist/rbac/assertAllowed.js +182 -0
- package/dist/rbac/modelRouterAccess.d.ts +1 -0
- package/dist/rbac/modelRouterAccess.js +8 -4
- package/dist/rbac/permissionUtils.js +3 -2
- package/dist/rbac/resolve.js +5 -4
- package/dist/rbac/routes.js +15 -6
- package/dist/realtime/deprecation.d.ts +12 -0
- package/dist/realtime/deprecation.js +32 -0
- package/dist/realtime/realtimeApp.d.ts +1 -1
- package/dist/realtime/realtimeApp.js +10 -11
- package/dist/realtime/registry.d.ts +0 -31
- package/dist/realtime/registry.js +44 -31
- package/dist/realtime/socketAuth.d.ts +5 -5
- package/dist/realtime/socketAuth.js +11 -1
- package/dist/realtime/socketUser.d.ts +5 -1
- package/dist/realtime/types.d.ts +14 -4
- package/dist/schemaMetadata.d.ts +56 -0
- package/dist/schemaMetadata.js +513 -0
- package/dist/seedRunner.d.ts +88 -0
- package/dist/seedRunner.js +627 -0
- package/dist/sync/executors.d.ts +12 -2
- package/dist/sync/executors.js +8 -10
- package/dist/sync/loadHarness.js +28 -19
- package/dist/sync/models.js +26 -24
- package/dist/sync/mutationHandler.d.ts +9 -0
- package/dist/sync/mutationHandler.js +11 -6
- package/dist/sync/registrationSideEffects.d.ts +35 -0
- package/dist/sync/registrationSideEffects.js +151 -0
- package/dist/sync/registry.d.ts +2 -52
- package/dist/sync/registry.js +38 -187
- package/dist/sync/routes.js +3 -2
- package/dist/sync/scripts/compactTombstones.js +0 -2
- package/dist/sync/syncApp.d.ts +3 -3
- package/dist/sync/syncApp.js +4 -4
- package/dist/sync/syncBatch.js +3 -2
- package/dist/sync/syncSeqPlugin.d.ts +1 -1
- package/dist/sync/syncSeqPlugin.js +20 -16
- package/dist/terrenoApp.d.ts +19 -5
- package/dist/terrenoApp.js +66 -18
- package/dist/tests/models.d.ts +2 -0
- package/dist/tests/models.js +6 -0
- package/dist/types/authToken.d.ts +33 -0
- package/dist/types/authToken.js +2 -0
- package/dist/types/mcpServiceToken.d.ts +41 -0
- package/dist/types/mcpServiceToken.js +2 -0
- package/dist/webhooks/headerValue.d.ts +2 -0
- package/dist/webhooks/headerValue.js +14 -0
- package/dist/webhooks/idempotency/memoryStore.d.ts +10 -0
- package/dist/webhooks/idempotency/memoryStore.js +65 -0
- package/dist/webhooks/idempotency/mongoStore.d.ts +4 -0
- package/dist/webhooks/idempotency/mongoStore.js +150 -0
- package/dist/webhooks/idempotency/webhookReceipt.d.ts +62 -0
- package/dist/webhooks/idempotency/webhookReceipt.js +39 -0
- package/dist/webhooks/rawBody.d.ts +14 -0
- package/dist/webhooks/rawBody.js +22 -0
- package/dist/webhooks/timingSafeEqual.d.ts +4 -0
- package/dist/webhooks/timingSafeEqual.js +17 -0
- package/dist/webhooks/verifiers/hmac.d.ts +15 -0
- package/dist/webhooks/verifiers/hmac.js +49 -0
- package/dist/webhooks/verifiers/sendgrid.d.ts +10 -0
- package/dist/webhooks/verifiers/sendgrid.js +56 -0
- package/dist/webhooks/verifiers/stripe.d.ts +9 -0
- package/dist/webhooks/verifiers/stripe.js +99 -0
- package/dist/webhooks/verifiers/twilio.d.ts +9 -0
- package/dist/webhooks/verifiers/twilio.js +112 -0
- package/dist/webhooks/webhooksApp.d.ts +33 -0
- package/dist/webhooks/webhooksApp.js +195 -0
- package/package.json +4 -5
- package/src/__snapshots__/openApi.test.ts.snap +270 -0
- package/src/__snapshots__/openApiBuilder.test.ts.snap +30 -12
- package/src/__snapshots__/schemaMetadata.test.ts.snap +197 -0
- package/src/actions.ts +20 -13
- package/src/adminModelRouter.test.ts +133 -0
- package/src/api.arrayOperations.test.ts +43 -31
- package/src/api.hooks.test.ts +38 -29
- package/src/api.query.test.ts +31 -31
- package/src/api.test.ts +95 -96
- package/src/api.ts +16 -27
- package/src/auth.test.ts +107 -51
- package/src/auth.ts +98 -29
- package/src/authRecovery.test.ts +281 -0
- package/src/authRecovery.ts +279 -0
- package/src/authTokens.test.ts +94 -0
- package/src/authTokens.ts +118 -0
- package/src/authVerification.test.ts +293 -0
- package/src/betterAuth.ts +24 -0
- package/src/betterAuthApp.test.ts +1 -0
- package/src/betterAuthApp.ts +27 -9
- package/src/betterAuthSetup.test.ts +568 -38
- package/src/betterAuthSetup.ts +260 -5
- package/src/collectionRegistry.test.ts +165 -0
- package/src/collectionRegistry.ts +115 -0
- package/src/configurationApp.ts +13 -7
- package/src/docLoader.test.ts +45 -1
- package/src/docLoader.ts +37 -6
- package/src/express.d.ts +1 -0
- package/src/expressServer.test.ts +130 -66
- package/src/expressServer.ts +75 -19
- package/src/githubAuth.test.ts +60 -55
- package/src/index.ts +58 -0
- package/src/mcp/auth.test.ts +47 -0
- package/src/mcp/auth.ts +32 -11
- package/src/mcp/handlers.ts +45 -172
- package/src/mcp/integration.test.ts +59 -9
- package/src/mcp/query.ts +2 -4
- package/src/mcp/registry.ts +29 -20
- package/src/mcp/schemaGenerator.test.ts +8 -0
- package/src/mcp/schemaGenerator.ts +49 -131
- package/src/mcp/server.ts +2 -0
- package/src/mcp/serviceTokens.test.ts +330 -0
- package/src/mcp/serviceTokens.ts +307 -0
- package/src/mcp/toolGenerator.test.ts +1 -1
- package/src/mcp/types.ts +2 -6
- package/src/models/mcpServiceToken.test.ts +129 -0
- package/src/models/mcpServiceToken.ts +158 -0
- package/src/openApi.test.ts +80 -64
- package/src/openApiBuilder.test.ts +95 -7
- package/src/openApiBuilder.ts +46 -9
- package/src/openApiCompat.ts +1 -1
- package/src/openApiValidator.test.ts +49 -54
- package/src/openApiValidator.ts +1 -3
- package/src/plugins.test.ts +14 -0
- package/src/plugins.ts +34 -9
- package/src/populate.test.ts +34 -0
- package/src/populate.ts +40 -29
- package/src/rateLimit/applyTrustProxy.ts +17 -0
- package/src/rateLimit/createStore.ts +25 -0
- package/src/rateLimit/memoryStore.ts +40 -0
- package/src/rateLimit/middleware.ts +79 -0
- package/src/rateLimit/mongoStore.test.ts +80 -0
- package/src/rateLimit/mongoStore.ts +76 -0
- package/src/rateLimit/policies.ts +130 -0
- package/src/rateLimit/rateLimit.test.ts +328 -0
- package/src/rateLimit/redisStore.ioredis.test.ts +29 -0
- package/src/rateLimit/redisStore.test.ts +114 -0
- package/src/rateLimit/redisStore.ts +85 -0
- package/src/rateLimit/types.ts +64 -0
- package/src/rbac/access.ts +5 -1
- package/src/rbac/assertAllowed.test.ts +325 -0
- package/src/rbac/assertAllowed.ts +157 -0
- package/src/rbac/backfillAdmins.test.ts +124 -0
- package/src/rbac/fieldViews.test.ts +89 -0
- package/src/rbac/modelRouterAccess.test.ts +126 -0
- package/src/rbac/modelRouterAccess.ts +5 -2
- package/src/rbac/permissionUtils.ts +3 -2
- package/src/rbac/realtimeAccess.test.ts +109 -1
- package/src/rbac/resolve.ts +5 -4
- package/src/rbac/roleManager.test.ts +169 -0
- package/src/rbac/routes.test.ts +233 -0
- package/src/rbac/routes.ts +16 -6
- package/src/realtime/deprecation.test.ts +60 -0
- package/src/realtime/deprecation.ts +32 -0
- package/src/realtime/realtime.test.ts +8 -4
- package/src/realtime/realtimeApp.ts +10 -11
- package/src/realtime/realtimeAppSetup.test.ts +32 -5
- package/src/realtime/registry.ts +48 -42
- package/src/realtime/sessionRevalidation.test.ts +57 -44
- package/src/realtime/socketAuth.test.ts +75 -23
- package/src/realtime/socketAuth.ts +17 -6
- package/src/realtime/socketUser.ts +5 -3
- package/src/realtime/types.ts +14 -4
- package/src/schemaMetadata.test.ts +405 -0
- package/src/schemaMetadata.ts +593 -0
- package/src/scrubAdminFields.test.ts +105 -0
- package/src/seedRunner.test.ts +591 -0
- package/src/seedRunner.ts +464 -0
- package/src/sync/docMatchesMutationData.test.ts +16 -0
- package/src/sync/ensureSyncIndexes.test.ts +54 -15
- package/src/sync/executors.test.ts +40 -0
- package/src/sync/executors.ts +24 -12
- package/src/sync/integration.test.ts +15 -7
- package/src/sync/loadHarness.ts +28 -19
- package/src/sync/models.ts +32 -18
- package/src/sync/mutationHandler.test.ts +16 -16
- package/src/sync/mutationHandler.ts +9 -7
- package/src/sync/registrationSideEffects.test.ts +126 -0
- package/src/sync/registrationSideEffects.ts +131 -0
- package/src/sync/registry.ts +45 -171
- package/src/sync/routes.ts +3 -2
- package/src/sync/scripts/compactTombstones.ts +0 -2
- package/src/sync/sessionRevalidationIntegration.test.ts +12 -11
- package/src/sync/sync.test.ts +25 -23
- package/src/sync/syncApp.ts +4 -4
- package/src/sync/syncBatch.ts +3 -2
- package/src/sync/syncFrontier.test.ts +17 -15
- package/src/sync/syncPhaseC.test.ts +54 -43
- package/src/sync/syncRoutes.test.ts +51 -36
- package/src/sync/syncSeqPlugin.ts +66 -44
- package/src/sync/syncSocket.test.ts +112 -81
- package/src/terrenoApp.mcpServiceTokens.test.ts +173 -0
- package/src/terrenoApp.ts +87 -15
- package/src/tests/models.ts +14 -1
- package/src/types/authToken.ts +43 -0
- package/src/types/mcpServiceToken.ts +54 -0
- package/src/webhooks/headerValue.test.ts +22 -0
- package/src/webhooks/headerValue.ts +12 -0
- package/src/webhooks/idempotency/memoryStore.ts +34 -0
- package/src/webhooks/idempotency/mongoStore.test.ts +274 -0
- package/src/webhooks/idempotency/mongoStore.ts +83 -0
- package/src/webhooks/idempotency/webhookReceipt.ts +70 -0
- package/src/webhooks/rawBody.test.ts +74 -0
- package/src/webhooks/rawBody.ts +23 -0
- package/src/webhooks/timingSafeEqual.ts +16 -0
- package/src/webhooks/verifiers/hmac.test.ts +110 -0
- package/src/webhooks/verifiers/hmac.ts +54 -0
- package/src/webhooks/verifiers/providerVerifiers.test.ts +388 -0
- package/src/webhooks/verifiers/sendgrid.ts +59 -0
- package/src/webhooks/verifiers/stripe.ts +67 -0
- package/src/webhooks/verifiers/twilio.ts +69 -0
- package/src/webhooks/webhooksApp.test.ts +221 -0
- package/src/webhooks/webhooksApp.ts +144 -0
|
@@ -0,0 +1,328 @@
|
|
|
1
|
+
import {beforeEach, describe, it} from "bun:test";
|
|
2
|
+
import {assert} from "chai";
|
|
3
|
+
import type {Application} from "express";
|
|
4
|
+
import express from "express";
|
|
5
|
+
import jwt from "jsonwebtoken";
|
|
6
|
+
import {DateTime} from "luxon";
|
|
7
|
+
import supertest from "supertest";
|
|
8
|
+
|
|
9
|
+
import {modelRouter} from "../api";
|
|
10
|
+
import type {UserModel as AuthUserModel} from "../auth";
|
|
11
|
+
import {Permissions} from "../permissions";
|
|
12
|
+
import {TerrenoApp} from "../terrenoApp";
|
|
13
|
+
import {FoodModel, setupTestData, UserModel} from "../tests";
|
|
14
|
+
import {applyRateLimitTrustProxy} from "./applyTrustProxy";
|
|
15
|
+
import {createRateLimitStore} from "./createStore";
|
|
16
|
+
import {createMemoryRateLimitStore} from "./memoryStore";
|
|
17
|
+
import {classifyRateLimitPolicy, rateLimitKey, shouldSkipRateLimit} from "./policies";
|
|
18
|
+
import {DEFAULT_API_MAX, DEFAULT_AUTH_MAX, type RateLimitOptions} from "./types";
|
|
19
|
+
|
|
20
|
+
const foodRouter = modelRouter("/food", FoodModel, {
|
|
21
|
+
allowAnonymous: true,
|
|
22
|
+
permissions: {
|
|
23
|
+
create: [Permissions.IsAuthenticated],
|
|
24
|
+
delete: [],
|
|
25
|
+
list: [Permissions.IsAny],
|
|
26
|
+
read: [Permissions.IsAny],
|
|
27
|
+
update: [],
|
|
28
|
+
},
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
const buildApp = (rateLimit?: RateLimitOptions): Application => {
|
|
32
|
+
return new TerrenoApp({
|
|
33
|
+
configureApp: (app) => {
|
|
34
|
+
app.get("/health", (_req, res) => {
|
|
35
|
+
res.json({ok: true});
|
|
36
|
+
});
|
|
37
|
+
},
|
|
38
|
+
logRequests: false,
|
|
39
|
+
rateLimit,
|
|
40
|
+
skipListen: true,
|
|
41
|
+
userModel: UserModel as unknown as AuthUserModel,
|
|
42
|
+
})
|
|
43
|
+
.register(foodRouter)
|
|
44
|
+
.start();
|
|
45
|
+
};
|
|
46
|
+
|
|
47
|
+
describe("HTTP rate limiting", () => {
|
|
48
|
+
beforeEach(async () => {
|
|
49
|
+
await setupTestData();
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
it("does not 429 burst logins when rateLimit is omitted", async () => {
|
|
53
|
+
const app = buildApp();
|
|
54
|
+
for (let i = 0; i < 25; i++) {
|
|
55
|
+
const res = await supertest(app)
|
|
56
|
+
.post("/auth/login")
|
|
57
|
+
.send({email: "notAdmin@example.com", password: "password"});
|
|
58
|
+
assert.equal(res.status, 200, `login ${i} should succeed without a limiter`);
|
|
59
|
+
}
|
|
60
|
+
}, 30_000);
|
|
61
|
+
|
|
62
|
+
it("returns 429 on the 21st POST /auth/login with default auth max", async () => {
|
|
63
|
+
const app = buildApp({});
|
|
64
|
+
for (let i = 0; i < DEFAULT_AUTH_MAX; i++) {
|
|
65
|
+
const res = await supertest(app)
|
|
66
|
+
.post("/auth/login")
|
|
67
|
+
.send({email: "notAdmin@example.com", password: "password"});
|
|
68
|
+
assert.equal(res.status, 200, `login ${i} should be under the auth cap`);
|
|
69
|
+
}
|
|
70
|
+
const limited = await supertest(app)
|
|
71
|
+
.post("/auth/login")
|
|
72
|
+
.send({email: "notAdmin@example.com", password: "password"});
|
|
73
|
+
assert.equal(limited.status, 429);
|
|
74
|
+
assert.equal(limited.body.code, "rate-limit-exceeded");
|
|
75
|
+
assert.equal(limited.body.title, "Too many requests");
|
|
76
|
+
assert.equal(limited.body.status, 429);
|
|
77
|
+
assert.isString(limited.headers["retry-after"]);
|
|
78
|
+
assert.include(limited.headers.ratelimit, "limit=20");
|
|
79
|
+
assert.include(limited.headers["ratelimit-policy"], "20;w=");
|
|
80
|
+
|
|
81
|
+
const list = await supertest(app).get("/food");
|
|
82
|
+
assert.equal(list.status, 200, "api bucket still has remaining after auth cap");
|
|
83
|
+
}, 30_000);
|
|
84
|
+
|
|
85
|
+
it("returns 429 on the request after apiMax on modelRouter list", async () => {
|
|
86
|
+
const app = buildApp({limits: {apiMax: 3, authMax: 20}});
|
|
87
|
+
for (let i = 0; i < 3; i++) {
|
|
88
|
+
const res = await supertest(app).get("/food");
|
|
89
|
+
assert.equal(res.status, 200, `list ${i} should be under apiMax`);
|
|
90
|
+
}
|
|
91
|
+
const limited = await supertest(app).get("/food");
|
|
92
|
+
assert.equal(limited.status, 429);
|
|
93
|
+
assert.include(limited.headers.ratelimit, "limit=3");
|
|
94
|
+
});
|
|
95
|
+
|
|
96
|
+
it("never rate-limits GET /health", async () => {
|
|
97
|
+
const app = buildApp({limits: {apiMax: 1, authMax: 1}});
|
|
98
|
+
const first = await supertest(app).get("/health");
|
|
99
|
+
assert.equal(first.status, 200);
|
|
100
|
+
const second = await supertest(app).get("/health");
|
|
101
|
+
assert.equal(second.status, 200);
|
|
102
|
+
});
|
|
103
|
+
|
|
104
|
+
it("defaults api max to 600 and denies the 601st consume", async () => {
|
|
105
|
+
const store = createMemoryRateLimitStore();
|
|
106
|
+
const now = 5_000_000;
|
|
107
|
+
for (let i = 0; i < DEFAULT_API_MAX; i++) {
|
|
108
|
+
const result = await store.consume({
|
|
109
|
+
key: "api:ip:1",
|
|
110
|
+
max: DEFAULT_API_MAX,
|
|
111
|
+
now,
|
|
112
|
+
windowMs: 60_000,
|
|
113
|
+
});
|
|
114
|
+
assert.isTrue(result.allowed);
|
|
115
|
+
}
|
|
116
|
+
const over = await store.consume({
|
|
117
|
+
key: "api:ip:1",
|
|
118
|
+
max: DEFAULT_API_MAX,
|
|
119
|
+
now: now + 1,
|
|
120
|
+
windowMs: 60_000,
|
|
121
|
+
});
|
|
122
|
+
assert.isFalse(over.allowed);
|
|
123
|
+
});
|
|
124
|
+
|
|
125
|
+
it("classifies login as auth and /auth/me as api", () => {
|
|
126
|
+
const authPaths = [
|
|
127
|
+
"/auth/login",
|
|
128
|
+
"/auth/login/",
|
|
129
|
+
"/Auth/login",
|
|
130
|
+
"/auth/signup",
|
|
131
|
+
"/auth/refresh_token",
|
|
132
|
+
"/auth/forgotPassword",
|
|
133
|
+
"/auth/resetPassword",
|
|
134
|
+
"/resetPassword",
|
|
135
|
+
"/auth/sendVerification",
|
|
136
|
+
"/auth/verifyEmail",
|
|
137
|
+
"/auth/github",
|
|
138
|
+
"/auth/github/callback",
|
|
139
|
+
"/auth/github/failure",
|
|
140
|
+
"/api/auth/sign-in/email",
|
|
141
|
+
"/api/auth/sign-up/email",
|
|
142
|
+
"/api/auth/forget-password",
|
|
143
|
+
"/api/auth/request-password-reset",
|
|
144
|
+
"/api/auth/reset-password",
|
|
145
|
+
"/api/auth/send-verification-email",
|
|
146
|
+
"/api/auth/verify-email?token=secret",
|
|
147
|
+
"/api/auth/callback/github",
|
|
148
|
+
];
|
|
149
|
+
for (const originalUrl of authPaths) {
|
|
150
|
+
assert.equal(
|
|
151
|
+
classifyRateLimitPolicy({method: "POST", originalUrl} as never),
|
|
152
|
+
"auth",
|
|
153
|
+
originalUrl
|
|
154
|
+
);
|
|
155
|
+
}
|
|
156
|
+
assert.equal(classifyRateLimitPolicy({method: "GET", originalUrl: "/auth/me"} as never), "api");
|
|
157
|
+
assert.equal(
|
|
158
|
+
classifyRateLimitPolicy({method: "PATCH", originalUrl: "/auth/me"} as never),
|
|
159
|
+
"api"
|
|
160
|
+
);
|
|
161
|
+
assert.equal(
|
|
162
|
+
classifyRateLimitPolicy({method: "POST", originalUrl: "/sync/mutate"} as never),
|
|
163
|
+
"api"
|
|
164
|
+
);
|
|
165
|
+
assert.equal(
|
|
166
|
+
classifyRateLimitPolicy({
|
|
167
|
+
method: "POST",
|
|
168
|
+
originalUrl: "/auth/login#x",
|
|
169
|
+
path: "/auth/login",
|
|
170
|
+
} as never),
|
|
171
|
+
"auth"
|
|
172
|
+
);
|
|
173
|
+
assert.equal(
|
|
174
|
+
classifyRateLimitPolicy({
|
|
175
|
+
method: "POST",
|
|
176
|
+
originalUrl: "http://host/auth/login",
|
|
177
|
+
path: "/auth/login",
|
|
178
|
+
} as never),
|
|
179
|
+
"auth"
|
|
180
|
+
);
|
|
181
|
+
assert.equal(
|
|
182
|
+
classifyRateLimitPolicy(
|
|
183
|
+
{method: "POST", originalUrl: "/custom/auth/sign-in"} as never,
|
|
184
|
+
"/custom/auth"
|
|
185
|
+
),
|
|
186
|
+
"auth"
|
|
187
|
+
);
|
|
188
|
+
assert.equal(
|
|
189
|
+
rateLimitKey({ip: "203.0.113.10", user: {id: "session-user"}} as never, "auth"),
|
|
190
|
+
"ip:203.0.113.10"
|
|
191
|
+
);
|
|
192
|
+
assert.equal(
|
|
193
|
+
rateLimitKey({ip: "203.0.113.10", user: {id: "session-user"}} as never, "api"),
|
|
194
|
+
"user:session-user"
|
|
195
|
+
);
|
|
196
|
+
assert.isTrue(shouldSkipRateLimit({method: "GET", originalUrl: "/openapi.json"} as never));
|
|
197
|
+
assert.isTrue(shouldSkipRateLimit({method: "GET", originalUrl: "/swagger"} as never));
|
|
198
|
+
assert.isTrue(
|
|
199
|
+
shouldSkipRateLimit({method: "GET", originalUrl: "/food"} as never, (req) =>
|
|
200
|
+
req.originalUrl.startsWith("/food")
|
|
201
|
+
)
|
|
202
|
+
);
|
|
203
|
+
});
|
|
204
|
+
|
|
205
|
+
it("honors rateLimit.skip for extra paths", async () => {
|
|
206
|
+
const app = buildApp({
|
|
207
|
+
limits: {apiMax: 1, authMax: 1},
|
|
208
|
+
skip: (req) => req.path === "/food" || req.originalUrl.startsWith("/food"),
|
|
209
|
+
});
|
|
210
|
+
const first = await supertest(app).get("/food");
|
|
211
|
+
assert.equal(first.status, 200);
|
|
212
|
+
const second = await supertest(app).get("/food");
|
|
213
|
+
assert.equal(second.status, 200);
|
|
214
|
+
});
|
|
215
|
+
|
|
216
|
+
it("keys unauthenticated traffic by X-Forwarded-For when trustProxy is 1", async () => {
|
|
217
|
+
const app = buildApp({limits: {apiMax: 1, authMax: 20}, trustProxy: 1});
|
|
218
|
+
const first = await supertest(app).get("/food").set("X-Forwarded-For", "203.0.113.10");
|
|
219
|
+
assert.equal(first.status, 200);
|
|
220
|
+
const sameClient = await supertest(app).get("/food").set("X-Forwarded-For", "203.0.113.10");
|
|
221
|
+
assert.equal(sameClient.status, 429);
|
|
222
|
+
const otherClient = await supertest(app).get("/food").set("X-Forwarded-For", "198.51.100.20");
|
|
223
|
+
assert.equal(otherClient.status, 200);
|
|
224
|
+
});
|
|
225
|
+
|
|
226
|
+
it("ignores spoofed X-Forwarded-For when trustProxy is omitted", async () => {
|
|
227
|
+
const app = buildApp({limits: {apiMax: 1, authMax: 20}});
|
|
228
|
+
const first = await supertest(app).get("/food").set("X-Forwarded-For", "203.0.113.10");
|
|
229
|
+
assert.equal(first.status, 200);
|
|
230
|
+
const spoofed = await supertest(app).get("/food").set("X-Forwarded-For", "198.51.100.20");
|
|
231
|
+
assert.equal(spoofed.status, 429);
|
|
232
|
+
});
|
|
233
|
+
|
|
234
|
+
it("logs in and refreshes when the access JWT is expired", async () => {
|
|
235
|
+
const app = buildApp({});
|
|
236
|
+
const secret = process.env.TOKEN_SECRET;
|
|
237
|
+
assert.ok(secret);
|
|
238
|
+
const expired = jwt.sign(
|
|
239
|
+
{
|
|
240
|
+
exp: Math.floor(DateTime.now().minus({hours: 1}).toSeconds()),
|
|
241
|
+
id: "stale",
|
|
242
|
+
},
|
|
243
|
+
secret,
|
|
244
|
+
{issuer: process.env.TOKEN_ISSUER}
|
|
245
|
+
);
|
|
246
|
+
const login = await supertest(app)
|
|
247
|
+
.post("/auth/login")
|
|
248
|
+
.set("Authorization", `Bearer ${expired}`)
|
|
249
|
+
.send({email: "notAdmin@example.com", password: "password"});
|
|
250
|
+
assert.equal(login.status, 200);
|
|
251
|
+
assert.isString(login.body.data.refreshToken);
|
|
252
|
+
const refresh = await supertest(app)
|
|
253
|
+
.post("/auth/refresh_token")
|
|
254
|
+
.set("Authorization", `Bearer ${expired}`)
|
|
255
|
+
.send({refreshToken: login.body.data.refreshToken});
|
|
256
|
+
assert.equal(refresh.status, 200);
|
|
257
|
+
const me = await supertest(app).get("/auth/me").set("Authorization", `Bearer ${expired}`);
|
|
258
|
+
assert.equal(me.status, 401);
|
|
259
|
+
});
|
|
260
|
+
|
|
261
|
+
it("keys authenticated JWT traffic by user, not shared IP", async () => {
|
|
262
|
+
const app = buildApp({limits: {apiMax: 1, authMax: 20}});
|
|
263
|
+
const userLogin = await supertest(app)
|
|
264
|
+
.post("/auth/login")
|
|
265
|
+
.send({email: "notAdmin@example.com", password: "password"});
|
|
266
|
+
assert.equal(userLogin.status, 200);
|
|
267
|
+
const adminLogin = await supertest(app)
|
|
268
|
+
.post("/auth/login")
|
|
269
|
+
.send({email: "admin@example.com", password: "securePassword"});
|
|
270
|
+
assert.equal(adminLogin.status, 200);
|
|
271
|
+
const userList = await supertest(app)
|
|
272
|
+
.get("/food")
|
|
273
|
+
.set("Authorization", `Bearer ${userLogin.body.data.token}`);
|
|
274
|
+
assert.equal(userList.status, 200);
|
|
275
|
+
const adminList = await supertest(app)
|
|
276
|
+
.get("/food")
|
|
277
|
+
.set("Authorization", `Bearer ${adminLogin.body.data.token}`);
|
|
278
|
+
assert.equal(adminList.status, 200, "second user should have a separate api bucket");
|
|
279
|
+
});
|
|
280
|
+
|
|
281
|
+
it("rejects an unknown store name at create time", () => {
|
|
282
|
+
try {
|
|
283
|
+
createRateLimitStore({store: "disk" as never});
|
|
284
|
+
assert.fail("expected unknown store to throw");
|
|
285
|
+
} catch (error) {
|
|
286
|
+
assert.include(String(error), "Unknown rate limit store");
|
|
287
|
+
}
|
|
288
|
+
});
|
|
289
|
+
});
|
|
290
|
+
|
|
291
|
+
describe("memory rate limit store", () => {
|
|
292
|
+
it("isolates keys and resets after the window", async () => {
|
|
293
|
+
const store = createMemoryRateLimitStore();
|
|
294
|
+
const t0 = 1_000_000;
|
|
295
|
+
const a1 = await store.consume({key: "a", max: 2, now: t0, windowMs: 1000});
|
|
296
|
+
const a2 = await store.consume({key: "a", max: 2, now: t0 + 10, windowMs: 1000});
|
|
297
|
+
const a3 = await store.consume({key: "a", max: 2, now: t0 + 20, windowMs: 1000});
|
|
298
|
+
const b1 = await store.consume({key: "b", max: 2, now: t0, windowMs: 1000});
|
|
299
|
+
assert.isTrue(a1.allowed);
|
|
300
|
+
assert.isTrue(a2.allowed);
|
|
301
|
+
assert.isFalse(a3.allowed);
|
|
302
|
+
assert.isTrue(b1.allowed);
|
|
303
|
+
const after = await store.consume({key: "a", max: 2, now: t0 + 1001, windowMs: 1000});
|
|
304
|
+
assert.isTrue(after.allowed);
|
|
305
|
+
});
|
|
306
|
+
|
|
307
|
+
it("prunes expired windows when the map grows past 10_000 keys", async () => {
|
|
308
|
+
const store = createMemoryRateLimitStore();
|
|
309
|
+
const now = 1_000;
|
|
310
|
+
for (let i = 0; i < 10_001; i++) {
|
|
311
|
+
await store.consume({key: `k${i}`, max: 1, now, windowMs: 1});
|
|
312
|
+
}
|
|
313
|
+
const next = await store.consume({key: "fresh", max: 1, now: now + 10, windowMs: 1000});
|
|
314
|
+
assert.isTrue(next.allowed);
|
|
315
|
+
});
|
|
316
|
+
});
|
|
317
|
+
|
|
318
|
+
describe("applyRateLimitTrustProxy", () => {
|
|
319
|
+
it("defaults to false and honors hop count", () => {
|
|
320
|
+
const app = express();
|
|
321
|
+
applyRateLimitTrustProxy(app, {});
|
|
322
|
+
assert.equal(app.get("trust proxy"), false);
|
|
323
|
+
applyRateLimitTrustProxy(app, {trustProxy: false});
|
|
324
|
+
assert.equal(app.get("trust proxy"), false);
|
|
325
|
+
applyRateLimitTrustProxy(app, {trustProxy: 2});
|
|
326
|
+
assert.equal(app.get("trust proxy"), 2);
|
|
327
|
+
});
|
|
328
|
+
});
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import {beforeAll, describe, it, mock} from "bun:test";
|
|
2
|
+
import {assert} from "chai";
|
|
3
|
+
|
|
4
|
+
mock.module("ioredis", () => {
|
|
5
|
+
class Redis {
|
|
6
|
+
incr = async (_key: string): Promise<number> => 1;
|
|
7
|
+
pexpire = async (_key: string, _milliseconds: number): Promise<number> => 1;
|
|
8
|
+
pttl = async (_key: string): Promise<number> => 5_000;
|
|
9
|
+
}
|
|
10
|
+
return {default: Redis};
|
|
11
|
+
});
|
|
12
|
+
|
|
13
|
+
const {createRedisRateLimitStore} = await import("./redisStore");
|
|
14
|
+
|
|
15
|
+
describe("redis rate limit store ioredis loader", () => {
|
|
16
|
+
beforeAll(() => {
|
|
17
|
+
process.env.REDIS_URL = "redis://127.0.0.1:6379";
|
|
18
|
+
Reflect.deleteProperty(process.env, "VALKEY_URL");
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
it("consumes using a dynamically imported ioredis client", async () => {
|
|
22
|
+
const store = createRedisRateLimitStore();
|
|
23
|
+
const first = await store.consume({key: "dyn", max: 5, now: 1, windowMs: 15_000});
|
|
24
|
+
const second = await store.consume({key: "dyn", max: 5, now: 2, windowMs: 15_000});
|
|
25
|
+
assert.isTrue(first.allowed);
|
|
26
|
+
assert.isTrue(second.allowed);
|
|
27
|
+
assert.equal(first.resetAt, 1 + 5_000);
|
|
28
|
+
});
|
|
29
|
+
});
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
import {describe, it} from "bun:test";
|
|
2
|
+
import {assert} from "chai";
|
|
3
|
+
|
|
4
|
+
import {APIError} from "../errors";
|
|
5
|
+
import {createRateLimitStore} from "./createStore";
|
|
6
|
+
import {createRedisRateLimitStore, redisUrlFromEnv} from "./redisStore";
|
|
7
|
+
import type {RateLimitRedisClient} from "./types";
|
|
8
|
+
|
|
9
|
+
const createFakeRedis = (): RateLimitRedisClient & {reset: () => void} => {
|
|
10
|
+
const counts = new Map<string, number>();
|
|
11
|
+
const expiresAt = new Map<string, number>();
|
|
12
|
+
const now = (): number => Date.now();
|
|
13
|
+
|
|
14
|
+
const isExpired = (key: string): boolean => {
|
|
15
|
+
const exp = expiresAt.get(key);
|
|
16
|
+
return exp !== undefined && exp <= now();
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
const client: RateLimitRedisClient & {reset: () => void} = {
|
|
20
|
+
incr: async (key: string): Promise<number> => {
|
|
21
|
+
if (isExpired(key)) {
|
|
22
|
+
counts.delete(key);
|
|
23
|
+
expiresAt.delete(key);
|
|
24
|
+
}
|
|
25
|
+
const next = (counts.get(key) ?? 0) + 1;
|
|
26
|
+
counts.set(key, next);
|
|
27
|
+
return next;
|
|
28
|
+
},
|
|
29
|
+
pExpire: async (key: string, milliseconds: number): Promise<unknown> => {
|
|
30
|
+
expiresAt.set(key, now() + milliseconds);
|
|
31
|
+
return 1;
|
|
32
|
+
},
|
|
33
|
+
pTTL: async (key: string): Promise<number> => {
|
|
34
|
+
if (!counts.has(key) || isExpired(key)) {
|
|
35
|
+
return -2;
|
|
36
|
+
}
|
|
37
|
+
const exp = expiresAt.get(key);
|
|
38
|
+
if (exp === undefined) {
|
|
39
|
+
return -1;
|
|
40
|
+
}
|
|
41
|
+
return Math.max(0, exp - now());
|
|
42
|
+
},
|
|
43
|
+
reset: (): void => {
|
|
44
|
+
counts.clear();
|
|
45
|
+
expiresAt.clear();
|
|
46
|
+
},
|
|
47
|
+
};
|
|
48
|
+
return client;
|
|
49
|
+
};
|
|
50
|
+
|
|
51
|
+
describe("redis rate limit store", () => {
|
|
52
|
+
it("throws APIError when store is redis and no URL or client is set", () => {
|
|
53
|
+
Reflect.deleteProperty(process.env, "VALKEY_URL");
|
|
54
|
+
Reflect.deleteProperty(process.env, "REDIS_URL");
|
|
55
|
+
try {
|
|
56
|
+
createRedisRateLimitStore();
|
|
57
|
+
assert.fail("expected missing Redis URL to throw");
|
|
58
|
+
} catch (error) {
|
|
59
|
+
assert.instanceOf(error, APIError);
|
|
60
|
+
assert.include(String(error), "VALKEY_URL or REDIS_URL");
|
|
61
|
+
}
|
|
62
|
+
try {
|
|
63
|
+
createRateLimitStore({store: "redis"});
|
|
64
|
+
assert.fail("expected createRateLimitStore redis without URL to throw");
|
|
65
|
+
} catch (error) {
|
|
66
|
+
assert.include(String(error), "VALKEY_URL or REDIS_URL");
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
it("prefers VALKEY_URL over REDIS_URL", () => {
|
|
71
|
+
process.env.REDIS_URL = "redis://redis-only";
|
|
72
|
+
process.env.VALKEY_URL = "redis://valkey-wins";
|
|
73
|
+
assert.equal(redisUrlFromEnv(), "redis://valkey-wins");
|
|
74
|
+
Reflect.deleteProperty(process.env, "VALKEY_URL");
|
|
75
|
+
assert.equal(redisUrlFromEnv(), "redis://redis-only");
|
|
76
|
+
Reflect.deleteProperty(process.env, "REDIS_URL");
|
|
77
|
+
});
|
|
78
|
+
|
|
79
|
+
it("matches the memory consume contract with an injected client", async () => {
|
|
80
|
+
Reflect.deleteProperty(process.env, "VALKEY_URL");
|
|
81
|
+
Reflect.deleteProperty(process.env, "REDIS_URL");
|
|
82
|
+
const redisClient = createFakeRedis();
|
|
83
|
+
const store = createRateLimitStore({redisClient, store: "redis"});
|
|
84
|
+
const t0 = 2_000_000;
|
|
85
|
+
const a1 = await store.consume({key: "a", max: 2, now: t0, windowMs: 60_000});
|
|
86
|
+
const a2 = await store.consume({key: "a", max: 2, now: t0 + 10, windowMs: 60_000});
|
|
87
|
+
const a3 = await store.consume({key: "a", max: 2, now: t0 + 20, windowMs: 60_000});
|
|
88
|
+
const b1 = await store.consume({key: "b", max: 2, now: t0, windowMs: 60_000});
|
|
89
|
+
assert.isTrue(a1.allowed);
|
|
90
|
+
assert.isTrue(a2.allowed);
|
|
91
|
+
assert.isFalse(a3.allowed);
|
|
92
|
+
assert.isTrue(b1.allowed);
|
|
93
|
+
assert.equal(a3.remaining, 0);
|
|
94
|
+
});
|
|
95
|
+
|
|
96
|
+
it("re-sets expiry when Redis reports no TTL", async () => {
|
|
97
|
+
Reflect.deleteProperty(process.env, "VALKEY_URL");
|
|
98
|
+
Reflect.deleteProperty(process.env, "REDIS_URL");
|
|
99
|
+
const redisClient: RateLimitRedisClient = {
|
|
100
|
+
incr: async () => 2,
|
|
101
|
+
pExpire: async () => 1,
|
|
102
|
+
pTTL: async () => -1,
|
|
103
|
+
};
|
|
104
|
+
const store = createRedisRateLimitStore({redisClient});
|
|
105
|
+
const result = await store.consume({
|
|
106
|
+
key: "a",
|
|
107
|
+
max: 5,
|
|
108
|
+
now: 1_000,
|
|
109
|
+
windowMs: 15_000,
|
|
110
|
+
});
|
|
111
|
+
assert.isTrue(result.allowed);
|
|
112
|
+
assert.equal(result.resetAt, 1_000 + 15_000);
|
|
113
|
+
});
|
|
114
|
+
});
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
import {APIError} from "../errors";
|
|
2
|
+
import type {
|
|
3
|
+
RateLimitConsumeArgs,
|
|
4
|
+
RateLimitConsumeResult,
|
|
5
|
+
RateLimitOptions,
|
|
6
|
+
RateLimitRedisClient,
|
|
7
|
+
RateLimitStore,
|
|
8
|
+
} from "./types";
|
|
9
|
+
|
|
10
|
+
export const redisUrlFromEnv = (): string | undefined => {
|
|
11
|
+
return process.env.VALKEY_URL || process.env.REDIS_URL;
|
|
12
|
+
};
|
|
13
|
+
|
|
14
|
+
interface IoredisClient {
|
|
15
|
+
incr: (key: string) => Promise<number>;
|
|
16
|
+
pexpire: (key: string, milliseconds: number) => Promise<number>;
|
|
17
|
+
pttl: (key: string) => Promise<number>;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
interface IoredisModule {
|
|
21
|
+
default: new (url: string) => IoredisClient;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
const connectIoredis = async (url: string): Promise<RateLimitRedisClient> => {
|
|
25
|
+
const loaded = (await import("ioredis").catch(() => null)) as IoredisModule | null;
|
|
26
|
+
if (!loaded?.default) {
|
|
27
|
+
throw new APIError({
|
|
28
|
+
status: 500,
|
|
29
|
+
title: "Redis rate limit store requires the ioredis package",
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
const Redis = loaded.default;
|
|
33
|
+
const client = new Redis(url);
|
|
34
|
+
return {
|
|
35
|
+
incr: (key: string) => client.incr(key),
|
|
36
|
+
pExpire: (key: string, milliseconds: number) => client.pexpire(key, milliseconds),
|
|
37
|
+
pTTL: (key: string) => client.pttl(key),
|
|
38
|
+
};
|
|
39
|
+
};
|
|
40
|
+
|
|
41
|
+
export const createRedisRateLimitStore = (options: RateLimitOptions = {}): RateLimitStore => {
|
|
42
|
+
const url = redisUrlFromEnv();
|
|
43
|
+
if (!options.redisClient && !url) {
|
|
44
|
+
throw new APIError({
|
|
45
|
+
status: 500,
|
|
46
|
+
title: "Redis rate limit store requires VALKEY_URL or REDIS_URL",
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
let clientPromise: Promise<RateLimitRedisClient> | undefined;
|
|
51
|
+
|
|
52
|
+
const getClient = (): Promise<RateLimitRedisClient> => {
|
|
53
|
+
if (options.redisClient) {
|
|
54
|
+
return Promise.resolve(options.redisClient);
|
|
55
|
+
}
|
|
56
|
+
if (!clientPromise) {
|
|
57
|
+
clientPromise = connectIoredis(url as string);
|
|
58
|
+
}
|
|
59
|
+
return clientPromise;
|
|
60
|
+
};
|
|
61
|
+
|
|
62
|
+
const consume = async ({
|
|
63
|
+
key,
|
|
64
|
+
max,
|
|
65
|
+
windowMs,
|
|
66
|
+
now,
|
|
67
|
+
}: RateLimitConsumeArgs): Promise<RateLimitConsumeResult> => {
|
|
68
|
+
const client = await getClient();
|
|
69
|
+
const redisKey = `terreno:rate-limit:${key}`;
|
|
70
|
+
const count = await client.incr(redisKey);
|
|
71
|
+
if (count === 1) {
|
|
72
|
+
await client.pExpire(redisKey, windowMs);
|
|
73
|
+
}
|
|
74
|
+
let ttl = await client.pTTL(redisKey);
|
|
75
|
+
if (ttl < 0) {
|
|
76
|
+
await client.pExpire(redisKey, windowMs);
|
|
77
|
+
ttl = windowMs;
|
|
78
|
+
}
|
|
79
|
+
const resetAt = now + ttl;
|
|
80
|
+
const allowed = count <= max;
|
|
81
|
+
return {allowed, remaining: Math.max(0, max - count), resetAt};
|
|
82
|
+
};
|
|
83
|
+
|
|
84
|
+
return {consume};
|
|
85
|
+
};
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import type {Request} from "express";
|
|
2
|
+
|
|
3
|
+
/** Default fixed window: 15 minutes. */
|
|
4
|
+
export const DEFAULT_WINDOW_MS = 15 * 60 * 1000;
|
|
5
|
+
|
|
6
|
+
/** Stricter bucket for login, signup, refresh, OTP, GitHub OAuth, Better Auth sign-in. */
|
|
7
|
+
export const DEFAULT_AUTH_MAX = 20;
|
|
8
|
+
|
|
9
|
+
/** Looser bucket for modelRouter and other framework HTTP. */
|
|
10
|
+
export const DEFAULT_API_MAX = 600;
|
|
11
|
+
|
|
12
|
+
export interface RateLimitLimits {
|
|
13
|
+
windowMs?: number;
|
|
14
|
+
authMax?: number;
|
|
15
|
+
apiMax?: number;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export interface RateLimitOptions {
|
|
19
|
+
store?: "memory" | "redis" | "mongo";
|
|
20
|
+
limits?: RateLimitLimits;
|
|
21
|
+
trustProxy?: boolean | number | string | string[];
|
|
22
|
+
skip?: (req: Request) => boolean;
|
|
23
|
+
/**
|
|
24
|
+
* Better Auth `basePath` (default `/api/auth`). Used to classify sign-in,
|
|
25
|
+
* sign-up, password reset, and OAuth callback routes as the auth bucket.
|
|
26
|
+
* When omitted, TerrenoApp copies `BetterAuthApp` config.basePath if that plugin is registered.
|
|
27
|
+
*/
|
|
28
|
+
betterAuthBasePath?: string;
|
|
29
|
+
/** Test-only clock. */
|
|
30
|
+
now?: () => number;
|
|
31
|
+
/**
|
|
32
|
+
* Test-only store override. Production uses `store`.
|
|
33
|
+
*/
|
|
34
|
+
storeImpl?: RateLimitStore;
|
|
35
|
+
/**
|
|
36
|
+
* Test-only Redis client. Production Redis store builds a client from VALKEY_URL / REDIS_URL.
|
|
37
|
+
*/
|
|
38
|
+
redisClient?: RateLimitRedisClient;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
export interface RateLimitConsumeArgs {
|
|
42
|
+
key: string;
|
|
43
|
+
max: number;
|
|
44
|
+
windowMs: number;
|
|
45
|
+
now: number;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
export interface RateLimitConsumeResult {
|
|
49
|
+
allowed: boolean;
|
|
50
|
+
remaining: number;
|
|
51
|
+
resetAt: number;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
export interface RateLimitStore {
|
|
55
|
+
consume: (args: RateLimitConsumeArgs) => Promise<RateLimitConsumeResult>;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
export interface RateLimitRedisClient {
|
|
59
|
+
incr: (key: string) => Promise<number>;
|
|
60
|
+
pExpire: (key: string, milliseconds: number) => Promise<unknown>;
|
|
61
|
+
pTTL: (key: string) => Promise<number>;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export type RateLimitPolicyName = "auth" | "api";
|
package/src/rbac/access.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type {User} from "../auth";
|
|
2
|
+
import {APIError} from "../errors";
|
|
2
3
|
import {normalizeRbacAuditSinks} from "./auditModel";
|
|
3
4
|
import {createIsPermitted, createRequireAccess} from "./middleware";
|
|
4
5
|
import {createPermissionResolver} from "./resolve";
|
|
@@ -30,7 +31,10 @@ export const createAccess = <S extends Statements>(options: AccessOptions<S>): T
|
|
|
30
31
|
const persistAudit = options.persistAudit !== false;
|
|
31
32
|
const auditSinks = normalizeRbacAuditSinks(options.auditSink);
|
|
32
33
|
if (!persistAudit && auditSinks.length === 0) {
|
|
33
|
-
throw new
|
|
34
|
+
throw new APIError({
|
|
35
|
+
status: 500,
|
|
36
|
+
title: "RBAC audit requires persistAudit or at least one auditSink",
|
|
37
|
+
});
|
|
34
38
|
}
|
|
35
39
|
|
|
36
40
|
const mergedStatements = mergeStatements(options.statements) as S;
|