@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,151 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __values = (this && this.__values) || function(o) {
|
|
3
|
+
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
4
|
+
if (m) return m.call(o);
|
|
5
|
+
if (o && typeof o.length === "number") return {
|
|
6
|
+
next: function () {
|
|
7
|
+
if (o && i >= o.length) o = void 0;
|
|
8
|
+
return { value: o && o[i++], done: !o };
|
|
9
|
+
}
|
|
10
|
+
};
|
|
11
|
+
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
12
|
+
};
|
|
13
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
|
+
exports.rateLimitKey = exports.classifyRateLimitPolicy = exports.shouldSkipRateLimit = exports.isJwtCredentialExchangePath = exports.requestPath = exports.normalizeRequestPath = void 0;
|
|
15
|
+
var DEFAULT_BETTER_AUTH_BASE_PATH = "/api/auth";
|
|
16
|
+
var stripQueryAndFragment = function (url) {
|
|
17
|
+
var hash = url.indexOf("#");
|
|
18
|
+
var withoutHash = hash === -1 ? url : url.slice(0, hash);
|
|
19
|
+
var q = withoutHash.indexOf("?");
|
|
20
|
+
return q === -1 ? withoutHash : withoutHash.slice(0, q);
|
|
21
|
+
};
|
|
22
|
+
/** Strip query, fragment, and a trailing slash so `/auth/login/` matches `/auth/login`. */
|
|
23
|
+
var normalizeRequestPath = function (url) {
|
|
24
|
+
var withoutQuery = stripQueryAndFragment(url);
|
|
25
|
+
var withoutSlash = withoutQuery.length > 1 && withoutQuery.endsWith("/")
|
|
26
|
+
? withoutQuery.slice(0, -1)
|
|
27
|
+
: withoutQuery;
|
|
28
|
+
return withoutSlash.toLowerCase();
|
|
29
|
+
};
|
|
30
|
+
exports.normalizeRequestPath = normalizeRequestPath;
|
|
31
|
+
/** Prefer Express `req.path` (routing) over the raw request-target. */
|
|
32
|
+
var requestPath = function (req) {
|
|
33
|
+
var raw = req.path || req.url || req.originalUrl || "";
|
|
34
|
+
return (0, exports.normalizeRequestPath)(raw);
|
|
35
|
+
};
|
|
36
|
+
exports.requestPath = requestPath;
|
|
37
|
+
var JWT_CREDENTIAL_EXCHANGE_EXACT = new Set([
|
|
38
|
+
"/auth/login",
|
|
39
|
+
"/auth/signup",
|
|
40
|
+
"/auth/refresh_token",
|
|
41
|
+
"/auth/forgotpassword",
|
|
42
|
+
"/auth/resetpassword",
|
|
43
|
+
"/resetpassword",
|
|
44
|
+
"/auth/verifyemail",
|
|
45
|
+
]);
|
|
46
|
+
/**
|
|
47
|
+
* JWT login, signup, and refresh must not 401 on a stale access token.
|
|
48
|
+
* `setupAuth` runs before those routes so the client can still exchange credentials.
|
|
49
|
+
*/
|
|
50
|
+
var isJwtCredentialExchangePath = function (req) {
|
|
51
|
+
return JWT_CREDENTIAL_EXCHANGE_EXACT.has((0, exports.requestPath)(req));
|
|
52
|
+
};
|
|
53
|
+
exports.isJwtCredentialExchangePath = isJwtCredentialExchangePath;
|
|
54
|
+
var shouldSkipRateLimit = function (req, extraSkip) {
|
|
55
|
+
var path = (0, exports.requestPath)(req);
|
|
56
|
+
if (req.method === "GET" && (path === "/health" || path === "/healthz")) {
|
|
57
|
+
return true;
|
|
58
|
+
}
|
|
59
|
+
if (path === "/openapi.json" || path.startsWith("/openapi.json")) {
|
|
60
|
+
return true;
|
|
61
|
+
}
|
|
62
|
+
if (path === "/swagger" || path.startsWith("/swagger/")) {
|
|
63
|
+
return true;
|
|
64
|
+
}
|
|
65
|
+
if (extraSkip === null || extraSkip === void 0 ? void 0 : extraSkip(req)) {
|
|
66
|
+
return true;
|
|
67
|
+
}
|
|
68
|
+
return false;
|
|
69
|
+
};
|
|
70
|
+
exports.shouldSkipRateLimit = shouldSkipRateLimit;
|
|
71
|
+
// `requestPath` lowercases, so camelCase routes live here as lowercase.
|
|
72
|
+
var AUTH_EXACT = new Set([
|
|
73
|
+
"/auth/login",
|
|
74
|
+
"/auth/signup",
|
|
75
|
+
"/auth/refresh_token",
|
|
76
|
+
"/auth/forgotpassword",
|
|
77
|
+
"/auth/resetpassword",
|
|
78
|
+
"/resetpassword",
|
|
79
|
+
"/auth/sendverification",
|
|
80
|
+
"/auth/verifyemail",
|
|
81
|
+
"/auth/github",
|
|
82
|
+
"/auth/github/callback",
|
|
83
|
+
"/auth/github/failure",
|
|
84
|
+
]);
|
|
85
|
+
var AUTH_PREFIXES = ["/auth/github/"];
|
|
86
|
+
var betterAuthAuthPrefixes = function (basePath) {
|
|
87
|
+
var trimmed = basePath.endsWith("/") ? basePath.slice(0, -1) : basePath;
|
|
88
|
+
var base = trimmed.toLowerCase();
|
|
89
|
+
return [
|
|
90
|
+
"".concat(base, "/sign-in"),
|
|
91
|
+
"".concat(base, "/sign-up"),
|
|
92
|
+
"".concat(base, "/forget-password"),
|
|
93
|
+
"".concat(base, "/request-password-reset"),
|
|
94
|
+
"".concat(base, "/reset-password"),
|
|
95
|
+
"".concat(base, "/send-verification-email"),
|
|
96
|
+
"".concat(base, "/verify-email"),
|
|
97
|
+
"".concat(base, "/callback"),
|
|
98
|
+
];
|
|
99
|
+
};
|
|
100
|
+
var classifyRateLimitPolicy = function (req, betterAuthBasePath) {
|
|
101
|
+
var e_1, _a, e_2, _b;
|
|
102
|
+
if (betterAuthBasePath === void 0) { betterAuthBasePath = DEFAULT_BETTER_AUTH_BASE_PATH; }
|
|
103
|
+
var path = (0, exports.requestPath)(req);
|
|
104
|
+
if (AUTH_EXACT.has(path)) {
|
|
105
|
+
return "auth";
|
|
106
|
+
}
|
|
107
|
+
try {
|
|
108
|
+
for (var AUTH_PREFIXES_1 = __values(AUTH_PREFIXES), AUTH_PREFIXES_1_1 = AUTH_PREFIXES_1.next(); !AUTH_PREFIXES_1_1.done; AUTH_PREFIXES_1_1 = AUTH_PREFIXES_1.next()) {
|
|
109
|
+
var prefix = AUTH_PREFIXES_1_1.value;
|
|
110
|
+
if (path.startsWith(prefix)) {
|
|
111
|
+
return "auth";
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
116
|
+
finally {
|
|
117
|
+
try {
|
|
118
|
+
if (AUTH_PREFIXES_1_1 && !AUTH_PREFIXES_1_1.done && (_a = AUTH_PREFIXES_1.return)) _a.call(AUTH_PREFIXES_1);
|
|
119
|
+
}
|
|
120
|
+
finally { if (e_1) throw e_1.error; }
|
|
121
|
+
}
|
|
122
|
+
try {
|
|
123
|
+
for (var _c = __values(betterAuthAuthPrefixes(betterAuthBasePath)), _d = _c.next(); !_d.done; _d = _c.next()) {
|
|
124
|
+
var prefix = _d.value;
|
|
125
|
+
if (path === prefix || path.startsWith("".concat(prefix, "/"))) {
|
|
126
|
+
return "auth";
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
131
|
+
finally {
|
|
132
|
+
try {
|
|
133
|
+
if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
|
|
134
|
+
}
|
|
135
|
+
finally { if (e_2) throw e_2.error; }
|
|
136
|
+
}
|
|
137
|
+
return "api";
|
|
138
|
+
};
|
|
139
|
+
exports.classifyRateLimitPolicy = classifyRateLimitPolicy;
|
|
140
|
+
var rateLimitKey = function (req, policy) {
|
|
141
|
+
var _a, _b;
|
|
142
|
+
if (policy !== "auth") {
|
|
143
|
+
var user = req.user;
|
|
144
|
+
var userId = (_a = user === null || user === void 0 ? void 0 : user.id) !== null && _a !== void 0 ? _a : ((user === null || user === void 0 ? void 0 : user._id) != null ? String(user._id) : undefined);
|
|
145
|
+
if (userId) {
|
|
146
|
+
return "user:".concat(userId);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
return "ip:".concat(req.ip || ((_b = req.socket) === null || _b === void 0 ? void 0 : _b.remoteAddress) || "unknown");
|
|
150
|
+
};
|
|
151
|
+
exports.rateLimitKey = rateLimitKey;
|
|
@@ -0,0 +1,155 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
36
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
37
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
38
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
39
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
40
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
41
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
42
|
+
});
|
|
43
|
+
};
|
|
44
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
45
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
46
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
47
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
48
|
+
function step(op) {
|
|
49
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
50
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
51
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
52
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
53
|
+
switch (op[0]) {
|
|
54
|
+
case 0: case 1: t = op; break;
|
|
55
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
56
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
57
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
58
|
+
default:
|
|
59
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
60
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
61
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
62
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
63
|
+
if (t[2]) _.ops.pop();
|
|
64
|
+
_.trys.pop(); continue;
|
|
65
|
+
}
|
|
66
|
+
op = body.call(thisArg, _);
|
|
67
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
68
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
72
|
+
exports.createRedisRateLimitStore = exports.redisUrlFromEnv = void 0;
|
|
73
|
+
var errors_1 = require("../errors");
|
|
74
|
+
var redisUrlFromEnv = function () {
|
|
75
|
+
return process.env.VALKEY_URL || process.env.REDIS_URL;
|
|
76
|
+
};
|
|
77
|
+
exports.redisUrlFromEnv = redisUrlFromEnv;
|
|
78
|
+
var connectIoredis = function (url) { return __awaiter(void 0, void 0, void 0, function () {
|
|
79
|
+
var loaded, Redis, client;
|
|
80
|
+
return __generator(this, function (_a) {
|
|
81
|
+
switch (_a.label) {
|
|
82
|
+
case 0: return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require("ioredis")); }).catch(function () { return null; })];
|
|
83
|
+
case 1:
|
|
84
|
+
loaded = (_a.sent());
|
|
85
|
+
if (!(loaded === null || loaded === void 0 ? void 0 : loaded.default)) {
|
|
86
|
+
throw new errors_1.APIError({
|
|
87
|
+
status: 500,
|
|
88
|
+
title: "Redis rate limit store requires the ioredis package",
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
Redis = loaded.default;
|
|
92
|
+
client = new Redis(url);
|
|
93
|
+
return [2 /*return*/, {
|
|
94
|
+
incr: function (key) { return client.incr(key); },
|
|
95
|
+
pExpire: function (key, milliseconds) { return client.pexpire(key, milliseconds); },
|
|
96
|
+
pTTL: function (key) { return client.pttl(key); },
|
|
97
|
+
}];
|
|
98
|
+
}
|
|
99
|
+
});
|
|
100
|
+
}); };
|
|
101
|
+
var createRedisRateLimitStore = function (options) {
|
|
102
|
+
if (options === void 0) { options = {}; }
|
|
103
|
+
var url = (0, exports.redisUrlFromEnv)();
|
|
104
|
+
if (!options.redisClient && !url) {
|
|
105
|
+
throw new errors_1.APIError({
|
|
106
|
+
status: 500,
|
|
107
|
+
title: "Redis rate limit store requires VALKEY_URL or REDIS_URL",
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
var clientPromise;
|
|
111
|
+
var getClient = function () {
|
|
112
|
+
if (options.redisClient) {
|
|
113
|
+
return Promise.resolve(options.redisClient);
|
|
114
|
+
}
|
|
115
|
+
if (!clientPromise) {
|
|
116
|
+
clientPromise = connectIoredis(url);
|
|
117
|
+
}
|
|
118
|
+
return clientPromise;
|
|
119
|
+
};
|
|
120
|
+
var consume = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
121
|
+
var client, redisKey, count, ttl, resetAt, allowed;
|
|
122
|
+
var key = _b.key, max = _b.max, windowMs = _b.windowMs, now = _b.now;
|
|
123
|
+
return __generator(this, function (_c) {
|
|
124
|
+
switch (_c.label) {
|
|
125
|
+
case 0: return [4 /*yield*/, getClient()];
|
|
126
|
+
case 1:
|
|
127
|
+
client = _c.sent();
|
|
128
|
+
redisKey = "terreno:rate-limit:".concat(key);
|
|
129
|
+
return [4 /*yield*/, client.incr(redisKey)];
|
|
130
|
+
case 2:
|
|
131
|
+
count = _c.sent();
|
|
132
|
+
if (!(count === 1)) return [3 /*break*/, 4];
|
|
133
|
+
return [4 /*yield*/, client.pExpire(redisKey, windowMs)];
|
|
134
|
+
case 3:
|
|
135
|
+
_c.sent();
|
|
136
|
+
_c.label = 4;
|
|
137
|
+
case 4: return [4 /*yield*/, client.pTTL(redisKey)];
|
|
138
|
+
case 5:
|
|
139
|
+
ttl = _c.sent();
|
|
140
|
+
if (!(ttl < 0)) return [3 /*break*/, 7];
|
|
141
|
+
return [4 /*yield*/, client.pExpire(redisKey, windowMs)];
|
|
142
|
+
case 6:
|
|
143
|
+
_c.sent();
|
|
144
|
+
ttl = windowMs;
|
|
145
|
+
_c.label = 7;
|
|
146
|
+
case 7:
|
|
147
|
+
resetAt = now + ttl;
|
|
148
|
+
allowed = count <= max;
|
|
149
|
+
return [2 /*return*/, { allowed: allowed, remaining: Math.max(0, max - count), resetAt: resetAt }];
|
|
150
|
+
}
|
|
151
|
+
});
|
|
152
|
+
}); };
|
|
153
|
+
return { consume: consume };
|
|
154
|
+
};
|
|
155
|
+
exports.createRedisRateLimitStore = createRedisRateLimitStore;
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import type { Request } from "express";
|
|
2
|
+
/** Default fixed window: 15 minutes. */
|
|
3
|
+
export declare const DEFAULT_WINDOW_MS: number;
|
|
4
|
+
/** Stricter bucket for login, signup, refresh, OTP, GitHub OAuth, Better Auth sign-in. */
|
|
5
|
+
export declare const DEFAULT_AUTH_MAX = 20;
|
|
6
|
+
/** Looser bucket for modelRouter and other framework HTTP. */
|
|
7
|
+
export declare const DEFAULT_API_MAX = 600;
|
|
8
|
+
export interface RateLimitLimits {
|
|
9
|
+
windowMs?: number;
|
|
10
|
+
authMax?: number;
|
|
11
|
+
apiMax?: number;
|
|
12
|
+
}
|
|
13
|
+
export interface RateLimitOptions {
|
|
14
|
+
store?: "memory" | "redis" | "mongo";
|
|
15
|
+
limits?: RateLimitLimits;
|
|
16
|
+
trustProxy?: boolean | number | string | string[];
|
|
17
|
+
skip?: (req: Request) => boolean;
|
|
18
|
+
/**
|
|
19
|
+
* Better Auth `basePath` (default `/api/auth`). Used to classify sign-in,
|
|
20
|
+
* sign-up, password reset, and OAuth callback routes as the auth bucket.
|
|
21
|
+
* When omitted, TerrenoApp copies `BetterAuthApp` config.basePath if that plugin is registered.
|
|
22
|
+
*/
|
|
23
|
+
betterAuthBasePath?: string;
|
|
24
|
+
/** Test-only clock. */
|
|
25
|
+
now?: () => number;
|
|
26
|
+
/**
|
|
27
|
+
* Test-only store override. Production uses `store`.
|
|
28
|
+
*/
|
|
29
|
+
storeImpl?: RateLimitStore;
|
|
30
|
+
/**
|
|
31
|
+
* Test-only Redis client. Production Redis store builds a client from VALKEY_URL / REDIS_URL.
|
|
32
|
+
*/
|
|
33
|
+
redisClient?: RateLimitRedisClient;
|
|
34
|
+
}
|
|
35
|
+
export interface RateLimitConsumeArgs {
|
|
36
|
+
key: string;
|
|
37
|
+
max: number;
|
|
38
|
+
windowMs: number;
|
|
39
|
+
now: number;
|
|
40
|
+
}
|
|
41
|
+
export interface RateLimitConsumeResult {
|
|
42
|
+
allowed: boolean;
|
|
43
|
+
remaining: number;
|
|
44
|
+
resetAt: number;
|
|
45
|
+
}
|
|
46
|
+
export interface RateLimitStore {
|
|
47
|
+
consume: (args: RateLimitConsumeArgs) => Promise<RateLimitConsumeResult>;
|
|
48
|
+
}
|
|
49
|
+
export interface RateLimitRedisClient {
|
|
50
|
+
incr: (key: string) => Promise<number>;
|
|
51
|
+
pExpire: (key: string, milliseconds: number) => Promise<unknown>;
|
|
52
|
+
pTTL: (key: string) => Promise<number>;
|
|
53
|
+
}
|
|
54
|
+
export type RateLimitPolicyName = "auth" | "api";
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DEFAULT_API_MAX = exports.DEFAULT_AUTH_MAX = exports.DEFAULT_WINDOW_MS = void 0;
|
|
4
|
+
/** Default fixed window: 15 minutes. */
|
|
5
|
+
exports.DEFAULT_WINDOW_MS = 15 * 60 * 1000;
|
|
6
|
+
/** Stricter bucket for login, signup, refresh, OTP, GitHub OAuth, Better Auth sign-in. */
|
|
7
|
+
exports.DEFAULT_AUTH_MAX = 20;
|
|
8
|
+
/** Looser bucket for modelRouter and other framework HTTP. */
|
|
9
|
+
exports.DEFAULT_API_MAX = 600;
|
package/dist/rbac/access.js
CHANGED
|
@@ -64,6 +64,7 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
64
64
|
};
|
|
65
65
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
66
66
|
exports.createAccess = void 0;
|
|
67
|
+
var errors_1 = require("../errors");
|
|
67
68
|
var auditModel_1 = require("./auditModel");
|
|
68
69
|
var middleware_1 = require("./middleware");
|
|
69
70
|
var resolve_1 = require("./resolve");
|
|
@@ -84,7 +85,10 @@ var createAccess = function (options) {
|
|
|
84
85
|
var persistAudit = options.persistAudit !== false;
|
|
85
86
|
var auditSinks = (0, auditModel_1.normalizeRbacAuditSinks)(options.auditSink);
|
|
86
87
|
if (!persistAudit && auditSinks.length === 0) {
|
|
87
|
-
throw new
|
|
88
|
+
throw new errors_1.APIError({
|
|
89
|
+
status: 500,
|
|
90
|
+
title: "RBAC audit requires persistAudit or at least one auditSink",
|
|
91
|
+
});
|
|
88
92
|
}
|
|
89
93
|
var mergedStatements = (0, statements_1.mergeStatements)(options.statements);
|
|
90
94
|
var rbacRoleModel = (0, roleModel_1.createRbacRoleModel)(options.connection);
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { ModelRouterOptions, RESTMethod } from "../api";
|
|
2
|
+
import type { User } from "../auth";
|
|
3
|
+
export interface AssertAllowedArgs<T> {
|
|
4
|
+
method: RESTMethod;
|
|
5
|
+
options: Pick<ModelRouterOptions<T>, "access" | "accessControl" | "permissions">;
|
|
6
|
+
user?: User;
|
|
7
|
+
doc?: T;
|
|
8
|
+
}
|
|
9
|
+
export declare const assertAllowed: <T>({ method, options, user, doc, }: AssertAllowedArgs<T>) => Promise<void>;
|
|
@@ -0,0 +1,182 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
13
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
exports.assertAllowed = void 0;
|
|
40
|
+
var errors_1 = require("../errors");
|
|
41
|
+
var permissions_1 = require("../permissions");
|
|
42
|
+
var modelRouterAccess_1 = require("./modelRouterAccess");
|
|
43
|
+
var throwAccessDenied = function (_a) {
|
|
44
|
+
var status = _a.status, title = _a.title, detail = _a.detail;
|
|
45
|
+
throw new errors_1.APIError({
|
|
46
|
+
detail: detail,
|
|
47
|
+
status: status,
|
|
48
|
+
title: title,
|
|
49
|
+
});
|
|
50
|
+
};
|
|
51
|
+
var assertAllowedViaAccess = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
52
|
+
var statements, action, result, scopeResult, extra, also, alsoAllowed;
|
|
53
|
+
var _c;
|
|
54
|
+
var _d, _e, _f;
|
|
55
|
+
var method = _b.method, access = _b.access, accessControl = _b.accessControl, user = _b.user, doc = _b.doc;
|
|
56
|
+
return __generator(this, function (_g) {
|
|
57
|
+
switch (_g.label) {
|
|
58
|
+
case 0:
|
|
59
|
+
statements = accessControl.statements;
|
|
60
|
+
action = (0, modelRouterAccess_1.resolveActionForMethod)(method, access, statements);
|
|
61
|
+
if (action === null) {
|
|
62
|
+
throw new errors_1.APIError({ status: 405, title: "Method not allowed" });
|
|
63
|
+
}
|
|
64
|
+
return [4 /*yield*/, accessControl.can({
|
|
65
|
+
doc: doc,
|
|
66
|
+
permissions: (_c = {}, _c[access.resource] = [action], _c),
|
|
67
|
+
user: user,
|
|
68
|
+
})];
|
|
69
|
+
case 1:
|
|
70
|
+
result = _g.sent();
|
|
71
|
+
if (!result.allowed) {
|
|
72
|
+
throwAccessDenied({
|
|
73
|
+
detail: result.reason,
|
|
74
|
+
status: 403,
|
|
75
|
+
title: "Access denied",
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
if (!((_d = access.scope) === null || _d === void 0 ? void 0 : _d.check)) return [3 /*break*/, 4];
|
|
79
|
+
if (user === undefined) {
|
|
80
|
+
throw new errors_1.APIError({ status: 403, title: "Access denied" });
|
|
81
|
+
}
|
|
82
|
+
return [4 /*yield*/, access.scope.check({
|
|
83
|
+
action: action,
|
|
84
|
+
doc: doc,
|
|
85
|
+
user: user,
|
|
86
|
+
})];
|
|
87
|
+
case 2:
|
|
88
|
+
scopeResult = _g.sent();
|
|
89
|
+
if (scopeResult === false) {
|
|
90
|
+
throwAccessDenied({ status: 403, title: "Access denied" });
|
|
91
|
+
}
|
|
92
|
+
if (!(scopeResult && typeof scopeResult === "object")) return [3 /*break*/, 4];
|
|
93
|
+
return [4 /*yield*/, accessControl.can({
|
|
94
|
+
doc: doc,
|
|
95
|
+
permissions: scopeResult,
|
|
96
|
+
user: user,
|
|
97
|
+
})];
|
|
98
|
+
case 3:
|
|
99
|
+
extra = _g.sent();
|
|
100
|
+
if (!extra.allowed) {
|
|
101
|
+
throwAccessDenied({
|
|
102
|
+
detail: extra.reason,
|
|
103
|
+
status: 403,
|
|
104
|
+
title: "Access denied",
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
_g.label = 4;
|
|
108
|
+
case 4:
|
|
109
|
+
also = (_f = (_e = access.also) === null || _e === void 0 ? void 0 : _e[method]) !== null && _f !== void 0 ? _f : [];
|
|
110
|
+
if (!(also.length > 0)) return [3 /*break*/, 6];
|
|
111
|
+
return [4 /*yield*/, (0, permissions_1.checkPermissions)(method, also, user, doc)];
|
|
112
|
+
case 5:
|
|
113
|
+
alsoAllowed = _g.sent();
|
|
114
|
+
if (!alsoAllowed) {
|
|
115
|
+
throwAccessDenied({
|
|
116
|
+
status: doc ? 403 : 405,
|
|
117
|
+
title: doc ? "Access denied" : "Method not allowed",
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
_g.label = 6;
|
|
121
|
+
case 6: return [2 /*return*/];
|
|
122
|
+
}
|
|
123
|
+
});
|
|
124
|
+
}); };
|
|
125
|
+
var assertAllowedViaPermissions = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
126
|
+
var allowed;
|
|
127
|
+
var method = _b.method, permissions = _b.permissions, user = _b.user, doc = _b.doc;
|
|
128
|
+
return __generator(this, function (_c) {
|
|
129
|
+
switch (_c.label) {
|
|
130
|
+
case 0:
|
|
131
|
+
if (permissions.length === 0) {
|
|
132
|
+
throwAccessDenied({ status: 405, title: "Method not allowed" });
|
|
133
|
+
}
|
|
134
|
+
return [4 /*yield*/, (0, permissions_1.checkPermissions)(method, permissions, user, doc)];
|
|
135
|
+
case 1:
|
|
136
|
+
allowed = _c.sent();
|
|
137
|
+
if (!allowed) {
|
|
138
|
+
throwAccessDenied({
|
|
139
|
+
status: doc ? 403 : 405,
|
|
140
|
+
title: doc ? "Access denied" : "Method not allowed",
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
return [2 /*return*/];
|
|
144
|
+
}
|
|
145
|
+
});
|
|
146
|
+
}); };
|
|
147
|
+
var assertAllowed = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
148
|
+
var method = _b.method, options = _b.options, user = _b.user, doc = _b.doc;
|
|
149
|
+
return __generator(this, function (_c) {
|
|
150
|
+
switch (_c.label) {
|
|
151
|
+
case 0:
|
|
152
|
+
if (!(options.access && options.accessControl)) return [3 /*break*/, 2];
|
|
153
|
+
return [4 /*yield*/, assertAllowedViaAccess({
|
|
154
|
+
access: options.access,
|
|
155
|
+
accessControl: options.accessControl,
|
|
156
|
+
doc: doc,
|
|
157
|
+
method: method,
|
|
158
|
+
user: user,
|
|
159
|
+
})];
|
|
160
|
+
case 1:
|
|
161
|
+
_c.sent();
|
|
162
|
+
return [2 /*return*/];
|
|
163
|
+
case 2:
|
|
164
|
+
if (!options.permissions) {
|
|
165
|
+
throw new errors_1.APIError({
|
|
166
|
+
status: 500,
|
|
167
|
+
title: "modelRouter requires permissions or access with accessControl",
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
return [4 /*yield*/, assertAllowedViaPermissions({
|
|
171
|
+
doc: doc,
|
|
172
|
+
method: method,
|
|
173
|
+
permissions: options.permissions[method],
|
|
174
|
+
user: user,
|
|
175
|
+
})];
|
|
176
|
+
case 3:
|
|
177
|
+
_c.sent();
|
|
178
|
+
return [2 /*return*/];
|
|
179
|
+
}
|
|
180
|
+
});
|
|
181
|
+
}); };
|
|
182
|
+
exports.assertAllowed = assertAllowed;
|
|
@@ -3,6 +3,7 @@ import type { RESTMethod } from "../api";
|
|
|
3
3
|
import type { User } from "../auth";
|
|
4
4
|
import type { RESTPermissions } from "../permissions";
|
|
5
5
|
import type { AnyTerrenoAccess, ModelRouterAccessOptions, ResourceScope } from "./types";
|
|
6
|
+
export declare const resolveActionForMethod: (method: RESTMethod, access: ModelRouterAccessOptions, statements: Record<string, readonly string[]>) => string | null;
|
|
6
7
|
export declare const buildAccessPermissions: <T>(accessControl: AnyTerrenoAccess, access: ModelRouterAccessOptions) => RESTPermissions<T>;
|
|
7
8
|
export declare const buildAccessQueryFilter: <_T>(accessControl: AnyTerrenoAccess, access: ModelRouterAccessOptions, existing?: (user?: express.Request["user"], query?: Record<string, unknown>) => Record<string, unknown> | null | Promise<Record<string, unknown> | null>) => (user?: express.Request["user"], query?: Record<string, unknown>) => Promise<Record<string, unknown> | null>;
|
|
8
9
|
export declare const wrapAccessResponseHandler: <T>(accessControl: AnyTerrenoAccess, access: ModelRouterAccessOptions, baseHandler: (value: T | T[], method: RESTMethod, request: express.Request, options: {
|
|
@@ -83,7 +83,7 @@ var __values = (this && this.__values) || function(o) {
|
|
|
83
83
|
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
84
84
|
};
|
|
85
85
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
86
|
-
exports.resolveModelRouterAccess = exports.validateAccessWritePayload = exports.validateAccessWriteBody = exports.wrapAccessResponseHandler = exports.buildAccessQueryFilter = exports.buildAccessPermissions = void 0;
|
|
86
|
+
exports.resolveModelRouterAccess = exports.validateAccessWritePayload = exports.validateAccessWriteBody = exports.wrapAccessResponseHandler = exports.buildAccessQueryFilter = exports.buildAccessPermissions = exports.resolveActionForMethod = void 0;
|
|
87
87
|
var errors_1 = require("../errors");
|
|
88
88
|
var transformers_1 = require("../transformers");
|
|
89
89
|
var fieldViews_1 = require("./fieldViews");
|
|
@@ -128,6 +128,7 @@ var resolveActionForMethod = function (method, access, statements) {
|
|
|
128
128
|
}
|
|
129
129
|
return DEFAULT_METHOD_ACTIONS[method];
|
|
130
130
|
};
|
|
131
|
+
exports.resolveActionForMethod = resolveActionForMethod;
|
|
131
132
|
var buildPermissionRequest = function (resource, action) {
|
|
132
133
|
var _a;
|
|
133
134
|
return (_a = {},
|
|
@@ -139,7 +140,7 @@ var buildAccessPermissions = function (accessControl, access) {
|
|
|
139
140
|
var statements = accessControl.statements;
|
|
140
141
|
var buildMethodPermissions = function (method) {
|
|
141
142
|
var _a, _b, _c;
|
|
142
|
-
var action = resolveActionForMethod(method, access, statements);
|
|
143
|
+
var action = (0, exports.resolveActionForMethod)(method, access, statements);
|
|
143
144
|
if (!action) {
|
|
144
145
|
return [];
|
|
145
146
|
}
|
|
@@ -210,7 +211,7 @@ var buildAccessQueryFilter = function (accessControl, access, existing) {
|
|
|
210
211
|
_b.label = 2;
|
|
211
212
|
case 2:
|
|
212
213
|
statements = accessControl.statements;
|
|
213
|
-
listAction = resolveActionForMethod("list", access, statements);
|
|
214
|
+
listAction = (0, exports.resolveActionForMethod)("list", access, statements);
|
|
214
215
|
if (!listAction) {
|
|
215
216
|
return [2 /*return*/, merged];
|
|
216
217
|
}
|
|
@@ -368,7 +369,10 @@ var resolveModelRouterAccess = function (options) {
|
|
|
368
369
|
var _a, _b;
|
|
369
370
|
if (!options.access || !options.accessControl) {
|
|
370
371
|
if (!options.permissions) {
|
|
371
|
-
throw new
|
|
372
|
+
throw new errors_1.APIError({
|
|
373
|
+
status: 500,
|
|
374
|
+
title: "modelRouter requires permissions or access with accessControl",
|
|
375
|
+
});
|
|
372
376
|
}
|
|
373
377
|
return {
|
|
374
378
|
permissions: options.permissions,
|
|
@@ -37,6 +37,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.validatePermissionSet = exports.diffPermissionSets = exports.isPermissionSubset = exports.unionPermissionSets = void 0;
|
|
40
|
+
var errors_1 = require("../errors");
|
|
40
41
|
var unionPermissionSets = function () {
|
|
41
42
|
var e_1, _a, e_2, _b, e_3, _c, e_4, _d;
|
|
42
43
|
var sets = [];
|
|
@@ -179,13 +180,13 @@ var validatePermissionSet = function (permissions, statements) {
|
|
|
179
180
|
var _e = __read(_d.value, 2), resource = _e[0], actions = _e[1];
|
|
180
181
|
var allowedActions = statements[resource];
|
|
181
182
|
if (!allowedActions) {
|
|
182
|
-
throw new
|
|
183
|
+
throw new errors_1.APIError({ status: 500, title: "Unknown resource: ".concat(resource) });
|
|
183
184
|
}
|
|
184
185
|
try {
|
|
185
186
|
for (var actions_3 = (e_9 = void 0, __values(actions)), actions_3_1 = actions_3.next(); !actions_3_1.done; actions_3_1 = actions_3.next()) {
|
|
186
187
|
var action = actions_3_1.value;
|
|
187
188
|
if (!allowedActions.includes(action)) {
|
|
188
|
-
throw new
|
|
189
|
+
throw new errors_1.APIError({ status: 500, title: "Unknown permission: ".concat(resource, ":").concat(action) });
|
|
189
190
|
}
|
|
190
191
|
}
|
|
191
192
|
}
|