@terreno/api 57.3.0 → 57.6.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/.ai/skills/mongoose-schema-safety/SKILL.md +23 -10
- package/README.md +11 -5
- package/bunfig.toml +1 -1
- package/dist/actions.js +197 -368
- package/dist/adminModelRouter.js +88 -173
- package/dist/adminTypes.d.ts +7 -0
- package/dist/adminTypes.js +6 -1
- package/dist/api.d.ts +10 -0
- package/dist/api.js +601 -792
- package/dist/audit/auditApp.d.ts +30 -0
- package/dist/audit/auditApp.js +114 -0
- package/dist/audit/auditEventModel.d.ts +29 -0
- package/dist/audit/auditEventModel.js +101 -0
- package/dist/audit/cloudTasksEnqueue.d.ts +32 -0
- package/dist/audit/cloudTasksEnqueue.js +69 -0
- package/dist/audit/diff.d.ts +10 -0
- package/dist/audit/diff.js +140 -0
- package/dist/audit/processQueue.d.ts +6 -0
- package/dist/audit/processQueue.js +56 -0
- package/dist/audit/rbacSink.d.ts +2 -0
- package/dist/audit/rbacSink.js +41 -0
- package/dist/audit/record.d.ts +56 -0
- package/dist/audit/record.js +251 -0
- package/dist/auth.js +432 -681
- package/dist/authRecovery.js +155 -269
- package/dist/authTokens.js +43 -118
- package/dist/betterAuth.d.ts +6 -0
- package/dist/betterAuthApp.js +25 -26
- package/dist/betterAuthSetup.js +258 -413
- package/dist/browserLogsRoute.d.ts +6 -0
- package/dist/browserLogsRoute.js +97 -0
- package/dist/collectionRegistry.d.ts +3 -1
- package/dist/collectionRegistry.js +43 -33
- package/dist/config.js +53 -122
- package/dist/configurationApp.js +180 -361
- package/dist/configurationPlugin.js +130 -302
- package/dist/consentApp.js +276 -421
- package/dist/docLoader.js +78 -126
- package/dist/envConfigurationPlugin.js +25 -147
- package/dist/errors.js +151 -247
- package/dist/example.js +28 -34
- package/dist/expressServer.d.ts +10 -0
- package/dist/expressServer.js +109 -255
- package/dist/frameworkModelNames.d.ts +24 -0
- package/dist/frameworkModelNames.js +31 -0
- package/dist/githubAuth.js +152 -216
- package/dist/httpClient.js +176 -264
- package/dist/index.d.ts +28 -1
- package/dist/index.js +53 -2
- package/dist/logger.js +145 -278
- package/dist/mcp/auth.js +76 -128
- package/dist/mcp/createMCPRequest.js +4 -5
- package/dist/mcp/handlers.js +268 -480
- package/dist/mcp/query.d.ts +0 -13
- package/dist/mcp/query.js +57 -151
- package/dist/mcp/registry.js +17 -30
- package/dist/mcp/schemaGenerator.js +95 -181
- package/dist/mcp/server.js +28 -100
- package/dist/mcp/serviceTokens.js +102 -191
- package/dist/mcp/toolGenerator.js +78 -191
- package/dist/middleware.js +15 -27
- package/dist/migrations/fixtures/all-down/20260910120000-one.d.ts +4 -0
- package/dist/migrations/fixtures/all-down/20260910120000-one.js +9 -0
- package/dist/migrations/fixtures/all-down/20260910120001-two.d.ts +4 -0
- package/dist/migrations/fixtures/all-down/20260910120001-two.js +9 -0
- package/dist/migrations/fixtures/bad-id/20260910120000-mismatch.d.ts +3 -0
- package/dist/migrations/fixtures/bad-id/20260910120000-mismatch.js +7 -0
- package/dist/migrations/fixtures/bad-name/not-a-migration.d.ts +3 -0
- package/dist/migrations/fixtures/bad-name/not-a-migration.js +7 -0
- package/dist/migrations/fixtures/missing-up/20260910120000-noup.d.ts +2 -0
- package/dist/migrations/fixtures/missing-up/20260910120000-noup.js +5 -0
- package/dist/migrations/fixtures/valid/20260910120000-alpha.d.ts +3 -0
- package/dist/migrations/fixtures/valid/20260910120000-alpha.js +7 -0
- package/dist/migrations/fixtures/valid/20260910120001-beta.d.ts +4 -0
- package/dist/migrations/fixtures/valid/20260910120001-beta.js +9 -0
- package/dist/migrations/generate.d.ts +17 -0
- package/dist/migrations/generate.js +155 -0
- package/dist/migrations/load.d.ts +20 -0
- package/dist/migrations/load.js +110 -0
- package/dist/migrations/lock.d.ts +13 -0
- package/dist/migrations/lock.js +73 -0
- package/dist/migrations/runner.d.ts +42 -0
- package/dist/migrations/runner.js +249 -0
- package/dist/migrations/schemaCatalog.d.ts +44 -0
- package/dist/migrations/schemaCatalog.js +185 -0
- package/dist/migrations/types.d.ts +87 -0
- package/dist/migrations/types.js +7 -0
- package/dist/models/consentForm.js +6 -6
- package/dist/models/consentResponse.js +5 -5
- package/dist/models/mcpServiceToken.js +66 -156
- package/dist/models/notification.d.ts +2 -0
- package/dist/models/notification.js +62 -0
- package/dist/models/notificationPreference.d.ts +2 -0
- package/dist/models/notificationPreference.js +49 -0
- package/dist/models/versionConfig.js +5 -5
- package/dist/notifications/notificationService.d.ts +40 -0
- package/dist/notifications/notificationService.js +183 -0
- package/dist/notifications/notificationsApp.d.ts +18 -0
- package/dist/notifications/notificationsApp.js +156 -0
- package/dist/notifications/notificationsBeforeSend.d.ts +14 -0
- package/dist/notifications/notificationsBeforeSend.js +32 -0
- package/dist/notifiers/googleChatNotifier.js +36 -117
- package/dist/notifiers/slackNotifier.d.ts +31 -2
- package/dist/notifiers/slackNotifier.js +170 -119
- package/dist/notifiers/zoomNotifier.js +60 -111
- package/dist/openApi.d.ts +1 -7
- package/dist/openApi.js +113 -127
- package/dist/openApiBuilder.d.ts +14 -3
- package/dist/openApiBuilder.js +117 -159
- package/dist/openApiCompat.js +81 -148
- package/dist/openApiEtag.js +7 -7
- package/dist/openApiValidator.d.ts +13 -1
- package/dist/openApiValidator.js +301 -246
- package/dist/orgs/orgContext.d.ts +23 -0
- package/dist/orgs/orgContext.js +128 -0
- package/dist/orgs/orgPermissions.d.ts +4 -0
- package/dist/orgs/orgPermissions.js +38 -0
- package/dist/orgs/orgPlugin.d.ts +13 -0
- package/dist/orgs/orgPlugin.js +66 -0
- package/dist/orgs/organizationModel.d.ts +13 -0
- package/dist/orgs/organizationModel.js +200 -0
- package/dist/orgs/organizationSettings.d.ts +19 -0
- package/dist/orgs/organizationSettings.js +113 -0
- package/dist/orgs/orgsApp.d.ts +28 -0
- package/dist/orgs/orgsApp.js +416 -0
- package/dist/permissions.d.ts +7 -13
- package/dist/permissions.js +95 -211
- package/dist/plugins.js +125 -218
- package/dist/populate.js +130 -240
- package/dist/rateLimit/applyTrustProxy.js +1 -1
- package/dist/rateLimit/createStore.js +7 -8
- package/dist/rateLimit/memoryStore.js +22 -100
- package/dist/rateLimit/middleware.d.ts +0 -8
- package/dist/rateLimit/middleware.js +49 -101
- package/dist/rateLimit/mongoStore.d.ts +1 -0
- package/dist/rateLimit/mongoStore.js +55 -112
- package/dist/rateLimit/policies.d.ts +0 -4
- package/dist/rateLimit/policies.js +44 -80
- package/dist/rateLimit/redisStore.d.ts +1 -0
- package/dist/rateLimit/redisStore.js +40 -133
- package/dist/rbac/access.js +122 -253
- package/dist/rbac/assertAllowed.js +95 -171
- package/dist/rbac/auditModel.js +14 -58
- package/dist/rbac/backfillAdmins.js +24 -130
- package/dist/rbac/fieldViews.js +46 -141
- package/dist/rbac/membershipOrgAdminSource.d.ts +6 -0
- package/dist/rbac/membershipOrgAdminSource.js +51 -0
- package/dist/rbac/middleware.js +30 -96
- package/dist/rbac/modelRouterAccess.d.ts +3 -0
- package/dist/rbac/modelRouterAccess.js +133 -307
- package/dist/rbac/permissionUtils.js +40 -179
- package/dist/rbac/realtimeAccess.js +81 -147
- package/dist/rbac/resolve.d.ts +1 -1
- package/dist/rbac/resolve.js +154 -319
- package/dist/rbac/roleManager.js +318 -700
- package/dist/rbac/roleModel.d.ts +2 -5
- package/dist/rbac/roleModel.js +60 -173
- package/dist/rbac/routes.js +93 -196
- package/dist/rbac/scopes.js +39 -133
- package/dist/rbac/statements.d.ts +10 -1
- package/dist/rbac/statements.js +42 -93
- package/dist/rbac/types.d.ts +5 -0
- package/dist/rbac/userPlugin.js +3 -29
- package/dist/realtime/changeStreamWatcher.d.ts +10 -4
- package/dist/realtime/changeStreamWatcher.js +499 -764
- package/dist/realtime/deprecation.d.ts +1 -0
- package/dist/realtime/deprecation.js +9 -10
- package/dist/realtime/queryMatcher.js +110 -191
- package/dist/realtime/queryStore.js +35 -118
- package/dist/realtime/realtimeApp.d.ts +1 -0
- package/dist/realtime/realtimeApp.js +248 -401
- package/dist/realtime/registry.js +19 -30
- package/dist/realtime/sessionRevalidation.js +132 -358
- package/dist/realtime/socketAuth.js +89 -208
- package/dist/realtime/socketUser.js +10 -56
- package/dist/requestContext.js +93 -139
- package/dist/schemaMetadata.js +181 -265
- package/dist/scriptRunner.js +96 -266
- package/dist/scrubAdminFields.js +36 -108
- package/dist/secretProviders.js +130 -299
- package/dist/seedRunner.js +221 -514
- package/dist/sync/adminBroadcastScope.d.ts +40 -0
- package/dist/sync/adminBroadcastScope.js +82 -0
- package/dist/sync/adminWindowAccess.d.ts +13 -0
- package/dist/sync/adminWindowAccess.js +25 -0
- package/dist/sync/adminWindowMutation.d.ts +88 -0
- package/dist/sync/adminWindowMutation.js +176 -0
- package/dist/sync/executors.d.ts +9 -3
- package/dist/sync/executors.js +425 -598
- package/dist/sync/loadHarness.js +392 -689
- package/dist/sync/models.js +181 -341
- package/dist/sync/mutationHandler.d.ts +5 -2
- package/dist/sync/mutationHandler.js +549 -697
- package/dist/sync/registrationSideEffects.js +41 -95
- package/dist/sync/registry.js +31 -47
- package/dist/sync/routes.d.ts +13 -0
- package/dist/sync/routes.js +484 -760
- package/dist/sync/scripts/compactTombstones.js +83 -228
- package/dist/sync/serialize.js +18 -58
- package/dist/sync/socketHandlers.d.ts +8 -2
- package/dist/sync/socketHandlers.js +271 -402
- package/dist/sync/streams.d.ts +2 -0
- package/dist/sync/streams.js +54 -116
- package/dist/sync/syncApp.d.ts +2 -1
- package/dist/sync/syncApp.js +14 -16
- package/dist/sync/syncBatch.d.ts +5 -2
- package/dist/sync/syncBatch.js +63 -168
- package/dist/sync/syncSeqPlugin.js +430 -702
- package/dist/sync/types.d.ts +18 -0
- package/dist/syncConsents.js +113 -253
- package/dist/terrenoApp.d.ts +29 -0
- package/dist/terrenoApp.js +184 -257
- package/dist/tests/createTestData.d.ts +1 -3
- package/dist/tests/createTestData.js +147 -259
- package/dist/tests/models.d.ts +1 -0
- package/dist/tests/models.js +23 -56
- package/dist/tests/mongoTestSetup.js +42 -103
- package/dist/tests/testHelper.d.ts +0 -5
- package/dist/tests/testHelper.js +32 -101
- package/dist/tests.js +12 -51
- package/dist/transformers.js +61 -164
- package/dist/types/authToken.d.ts +3 -3
- package/dist/types/mcpServiceToken.d.ts +2 -2
- package/dist/types/membership.d.ts +23 -0
- package/dist/types/membership.js +2 -0
- package/dist/types/notification.d.ts +28 -0
- package/dist/types/notification.js +2 -0
- package/dist/types/notificationPreference.d.ts +20 -0
- package/dist/types/notificationPreference.js +2 -0
- package/dist/types/organization.d.ts +36 -0
- package/dist/types/organization.js +2 -0
- package/dist/utils.js +31 -93
- package/dist/vendor/wesleytodd-openapi/index.js +37 -51
- package/dist/vendor/wesleytodd-openapi/lib/generate-doc.js +32 -40
- package/dist/vendor/wesleytodd-openapi/lib/layer-schema.js +3 -3
- package/dist/vendor/wesleytodd-openapi/lib/ui.js +50 -19
- package/dist/vendor/wesleytodd-openapi/lib/validate.js +19 -47
- package/dist/versionCheckPlugin.js +52 -100
- package/dist/webhooks/headerValue.js +2 -2
- package/dist/webhooks/idempotency/memoryStore.js +16 -59
- package/dist/webhooks/idempotency/mongoStore.js +55 -130
- package/dist/webhooks/idempotency/webhookReceipt.d.ts +4 -49
- package/dist/webhooks/idempotency/webhookReceipt.js +14 -14
- package/dist/webhooks/rawBody.d.ts +1 -0
- package/dist/webhooks/rawBody.js +2 -1
- package/dist/webhooks/timingSafeEqual.js +4 -5
- package/dist/webhooks/verifiers/hmac.js +17 -18
- package/dist/webhooks/verifiers/sendgrid.js +20 -22
- package/dist/webhooks/verifiers/stripe.js +31 -65
- package/dist/webhooks/verifiers/twilio.js +23 -73
- package/dist/webhooks/webhooksApp.js +78 -177
- package/dist/zodOpenApi.js +2 -2
- package/package.json +34 -28
- package/src/__snapshots__/openApi.test.ts.snap +192 -54
- package/src/__snapshots__/openApiBuilder.test.ts.snap +0 -18
- package/src/__snapshots__/schemaMetadata.test.ts.snap +0 -1
- package/src/__tests__/browserLogsRoute.test.ts +165 -0
- package/src/adminTypes.ts +8 -0
- package/src/api.test.ts +39 -2
- package/src/api.ts +68 -0
- package/src/audit/auditApp.test.ts +243 -0
- package/src/audit/auditApp.ts +139 -0
- package/src/audit/auditEventModel.ts +160 -0
- package/src/audit/auditRouter.test.ts +456 -0
- package/src/audit/cloudTasksEnqueue.test.ts +124 -0
- package/src/audit/cloudTasksEnqueue.ts +104 -0
- package/src/audit/diff.ts +163 -0
- package/src/audit/processQueue.ts +69 -0
- package/src/audit/rbacSink.test.ts +86 -0
- package/src/audit/rbacSink.ts +42 -0
- package/src/audit/record.test.ts +402 -0
- package/src/audit/record.ts +329 -0
- package/src/auth.test.ts +1 -1
- package/src/auth.ts +1 -1
- package/src/authRecovery.test.ts +43 -0
- package/src/authRecovery.ts +16 -10
- package/src/authTokens.ts +6 -2
- package/src/authVerification.test.ts +22 -0
- package/src/betterAuth.ts +7 -0
- package/src/betterAuthSetup.test.ts +27 -0
- package/src/betterAuthSetup.ts +1 -0
- package/src/browserLogsRoute.ts +110 -0
- package/src/collectionRegistry.test.ts +8 -9
- package/src/collectionRegistry.ts +21 -1
- package/src/configurationPlugin.test.ts +1 -11
- package/src/express.d.ts +2 -0
- package/src/expressServer.test.ts +50 -2
- package/src/expressServer.ts +10 -0
- package/src/frameworkModelNames.test.ts +62 -0
- package/src/frameworkModelNames.ts +33 -0
- package/src/index.ts +76 -0
- package/src/isolated/migrateCliConnect.isolated.ts +51 -0
- package/src/mcp/auth.test.ts +34 -1
- package/src/mcp/handlers.test.ts +275 -0
- package/src/mcp/query.ts +3 -3
- package/src/mcp/toolGenerator.test.ts +81 -0
- package/src/migrations/cli.test.ts +353 -0
- package/src/migrations/cli.ts +283 -0
- package/src/migrations/fixtures/all-down/20260910120000-one.ts +6 -0
- package/src/migrations/fixtures/all-down/20260910120001-two.ts +6 -0
- package/src/migrations/fixtures/bad-id/20260910120000-mismatch.ts +4 -0
- package/src/migrations/fixtures/bad-name/not-a-migration.ts +4 -0
- package/src/migrations/fixtures/missing-up/20260910120000-noup.ts +2 -0
- package/src/migrations/fixtures/valid/20260910120000-alpha.ts +4 -0
- package/src/migrations/fixtures/valid/20260910120001-beta.ts +6 -0
- package/src/migrations/generate.test.ts +333 -0
- package/src/migrations/generate.ts +216 -0
- package/src/migrations/load.test.ts +103 -0
- package/src/migrations/load.ts +124 -0
- package/src/migrations/lock.test.ts +133 -0
- package/src/migrations/lock.ts +118 -0
- package/src/migrations/runner.test.ts +504 -0
- package/src/migrations/runner.ts +358 -0
- package/src/migrations/schemaCatalog.test.ts +159 -0
- package/src/migrations/schemaCatalog.ts +262 -0
- package/src/migrations/types.ts +94 -0
- package/src/models/mcpServiceToken.ts +4 -3
- package/src/models/notification.ts +69 -0
- package/src/models/notificationPreference.ts +62 -0
- package/src/notifications/notificationService.ts +254 -0
- package/src/notifications/notificationsApp.test.ts +528 -0
- package/src/notifications/notificationsApp.ts +200 -0
- package/src/notifications/notificationsBeforeSend.ts +51 -0
- package/src/notifiers/slackNotifier.test.ts +186 -1
- package/src/notifiers/slackNotifier.ts +167 -8
- package/src/openApi.test.ts +0 -1
- package/src/openApi.ts +2 -1
- package/src/openApiBuilder.ts +14 -3
- package/src/openApiValidator.test.ts +221 -2
- package/src/openApiValidator.ts +218 -33
- package/src/orgs/orgAccessOptIn.test.ts +87 -0
- package/src/orgs/orgContext.test.ts +259 -0
- package/src/orgs/orgContext.ts +151 -0
- package/src/orgs/orgPermissions.test.ts +105 -0
- package/src/orgs/orgPermissions.ts +40 -0
- package/src/orgs/orgPlugin.test.ts +130 -0
- package/src/orgs/orgPlugin.ts +70 -0
- package/src/orgs/orgRbac.test.ts +267 -0
- package/src/orgs/orgSecurityDefects.test.ts +415 -0
- package/src/orgs/organizationModel.test.ts +205 -0
- package/src/orgs/organizationModel.ts +262 -0
- package/src/orgs/organizationSettings.test.ts +113 -0
- package/src/orgs/organizationSettings.ts +126 -0
- package/src/orgs/orgsApp.test.ts +382 -0
- package/src/orgs/orgsApp.ts +563 -0
- package/src/permissions.test.ts +62 -36
- package/src/permissions.ts +8 -30
- package/src/plugins.test.ts +5 -0
- package/src/plugins.ts +3 -0
- package/src/rateLimit/middleware.ts +1 -1
- package/src/rateLimit/mongoStore.ts +1 -0
- package/src/rateLimit/policies.ts +2 -2
- package/src/rateLimit/redisStore.ts +1 -0
- package/src/rbac/access.ts +11 -3
- package/src/rbac/membershipOrgAdminSource.ts +59 -0
- package/src/rbac/modelRouterAccess.ts +3 -0
- package/src/rbac/permissionUtils.test.ts +26 -5
- package/src/rbac/resolve.test.ts +34 -2
- package/src/rbac/resolve.ts +26 -7
- package/src/rbac/roleModel.test.ts +34 -1
- package/src/rbac/roleModel.ts +17 -1
- package/src/rbac/statements.test.ts +19 -0
- package/src/rbac/statements.ts +19 -1
- package/src/rbac/types.ts +5 -0
- package/src/realtime/changeStreamWatcher.ts +73 -33
- package/src/realtime/deprecation.ts +1 -0
- package/src/realtime/realtime.test.ts +357 -185
- package/src/realtime/realtimeApp.ts +2 -1
- package/src/schemaMetadata.test.ts +14 -0
- package/src/schemaMetadata.ts +5 -5
- package/src/sync/adminBroadcastConfig.test.ts +96 -0
- package/src/sync/adminBroadcastScope.test.ts +155 -0
- package/src/sync/adminBroadcastScope.ts +123 -0
- package/src/sync/adminWindowAccess.test.ts +57 -0
- package/src/sync/adminWindowAccess.ts +32 -0
- package/src/sync/adminWindowMutation.test.ts +450 -0
- package/src/sync/adminWindowMutation.ts +283 -0
- package/src/sync/executors.ts +33 -6
- package/src/sync/integration.test.ts +2 -2
- package/src/sync/mutationHandler.test.ts +277 -1
- package/src/sync/mutationHandler.ts +171 -29
- package/src/sync/registry.ts +4 -0
- package/src/sync/routes.ts +52 -8
- package/src/sync/socketHandlers.ts +154 -58
- package/src/sync/streams.ts +6 -0
- package/src/sync/sync.test.ts +3 -2
- package/src/sync/syncApp.ts +2 -1
- package/src/sync/syncBatch.ts +7 -2
- package/src/sync/syncRoutes.test.ts +297 -3
- package/src/sync/syncSocket.test.ts +229 -0
- package/src/sync/types.ts +20 -0
- package/src/terrenoApp.migrations.test.ts +114 -0
- package/src/terrenoApp.test.ts +41 -0
- package/src/terrenoApp.ts +97 -31
- package/src/tests/createTestData.ts +2 -2
- package/src/tests/models.ts +10 -2
- package/src/tests/testHelper.ts +1 -7
- package/src/types/authToken.ts +2 -4
- package/src/types/mcpServiceToken.ts +1 -7
- package/src/types/membership.ts +48 -0
- package/src/types/notification.ts +34 -0
- package/src/types/notificationPreference.ts +28 -0
- package/src/types/organization.ts +49 -0
- package/src/types.d.ts +1 -0
- package/src/webhooks/idempotency/webhookReceipt.ts +8 -10
- package/src/webhooks/rawBody.test.ts +33 -0
- package/src/webhooks/rawBody.ts +1 -0
- package/tsconfig.json +13 -54
- package/tsconfig.typedoc.json +4 -1
- package/dist/vendor/wesleytodd-openapi/lib/convert-yaml.d.ts +0 -2
- package/dist/vendor/wesleytodd-openapi/lib/convert-yaml.js +0 -13
- package/src/vendor/wesleytodd-openapi/lib/convert-yaml.js +0 -13
|
@@ -0,0 +1,130 @@
|
|
|
1
|
+
import {beforeEach, describe, it} from "bun:test";
|
|
2
|
+
import {assert} from "chai";
|
|
3
|
+
import mongoose, {model, Schema} from "mongoose";
|
|
4
|
+
|
|
5
|
+
import {orgScopedPlugin} from "./orgPlugin";
|
|
6
|
+
|
|
7
|
+
interface OrgScopedWidget {
|
|
8
|
+
formerOrganizationId?: mongoose.Types.ObjectId;
|
|
9
|
+
organizationId: mongoose.Types.ObjectId;
|
|
10
|
+
title: string;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
const widgetSchema = new Schema<OrgScopedWidget>(
|
|
14
|
+
{
|
|
15
|
+
formerOrganizationId: {
|
|
16
|
+
description: "An unrelated organization reference used to test rename protection",
|
|
17
|
+
type: mongoose.Schema.Types.ObjectId,
|
|
18
|
+
},
|
|
19
|
+
title: {description: "Widget title", type: String},
|
|
20
|
+
},
|
|
21
|
+
{strict: "throw"}
|
|
22
|
+
);
|
|
23
|
+
widgetSchema.plugin(orgScopedPlugin);
|
|
24
|
+
|
|
25
|
+
const OrgScopedWidgetModel =
|
|
26
|
+
(mongoose.models.OrgScopedWidget as mongoose.Model<OrgScopedWidget> | undefined) ??
|
|
27
|
+
model<OrgScopedWidget>("OrgScopedWidget", widgetSchema);
|
|
28
|
+
|
|
29
|
+
describe("orgScopedPlugin", () => {
|
|
30
|
+
beforeEach(async () => {
|
|
31
|
+
await OrgScopedWidgetModel.deleteMany({});
|
|
32
|
+
await OrgScopedWidgetModel.syncIndexes();
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
it("rejects a save when organizationId is missing", async () => {
|
|
36
|
+
let error: unknown;
|
|
37
|
+
try {
|
|
38
|
+
await OrgScopedWidgetModel.create({title: "No org"});
|
|
39
|
+
} catch (caughtError) {
|
|
40
|
+
error = caughtError;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
assert.instanceOf(error, Error);
|
|
44
|
+
assert.match((error as Error).message, /organizationId/i);
|
|
45
|
+
});
|
|
46
|
+
|
|
47
|
+
it("indexes organizationId on the consumer collection", async () => {
|
|
48
|
+
const indexes = await OrgScopedWidgetModel.collection.indexes();
|
|
49
|
+
const orgIndex = indexes.find((index) => {
|
|
50
|
+
return index.key.organizationId === 1;
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
assert.isDefined(orgIndex);
|
|
54
|
+
|
|
55
|
+
const saved = await OrgScopedWidgetModel.create({
|
|
56
|
+
organizationId: new mongoose.Types.ObjectId(),
|
|
57
|
+
title: "Scoped",
|
|
58
|
+
});
|
|
59
|
+
assert.isDefined(saved.organizationId);
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
it("rejects changing organizationId after creation on save", async () => {
|
|
63
|
+
const orgA = new mongoose.Types.ObjectId();
|
|
64
|
+
const orgB = new mongoose.Types.ObjectId();
|
|
65
|
+
const widget = await OrgScopedWidgetModel.create({organizationId: orgA, title: "Pinned"});
|
|
66
|
+
|
|
67
|
+
widget.organizationId = orgB;
|
|
68
|
+
let error: unknown;
|
|
69
|
+
try {
|
|
70
|
+
await widget.save();
|
|
71
|
+
} catch (caughtError) {
|
|
72
|
+
error = caughtError;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
assert.isDefined(error);
|
|
76
|
+
assert.equal((error as {status?: number}).status, 400);
|
|
77
|
+
assert.equal((error as {title?: string}).title, "organizationId cannot be changed");
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
it("rejects changing organizationId through updateOne", async () => {
|
|
81
|
+
const orgA = new mongoose.Types.ObjectId();
|
|
82
|
+
const orgB = new mongoose.Types.ObjectId();
|
|
83
|
+
const widget = await OrgScopedWidgetModel.create({organizationId: orgA, title: "Pinned"});
|
|
84
|
+
|
|
85
|
+
let error: unknown;
|
|
86
|
+
try {
|
|
87
|
+
await OrgScopedWidgetModel.updateOne({_id: widget._id}, {$set: {organizationId: orgB}});
|
|
88
|
+
} catch (caughtError) {
|
|
89
|
+
error = caughtError;
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
assert.isDefined(error);
|
|
93
|
+
assert.equal((error as {status?: number}).status, 400);
|
|
94
|
+
assert.equal((error as {title?: string}).title, "organizationId cannot be changed");
|
|
95
|
+
|
|
96
|
+
const reloaded = await OrgScopedWidgetModel.findById(widget._id);
|
|
97
|
+
assert.equal(String(reloaded?.organizationId), String(orgA));
|
|
98
|
+
});
|
|
99
|
+
|
|
100
|
+
it("rejects removing or renaming organizationId through query updates", async () => {
|
|
101
|
+
const orgA = new mongoose.Types.ObjectId();
|
|
102
|
+
const orgB = new mongoose.Types.ObjectId();
|
|
103
|
+
const widget = await OrgScopedWidgetModel.create({
|
|
104
|
+
formerOrganizationId: orgB,
|
|
105
|
+
organizationId: orgA,
|
|
106
|
+
title: "Pinned",
|
|
107
|
+
});
|
|
108
|
+
|
|
109
|
+
for (const update of [
|
|
110
|
+
{$unset: {organizationId: 1}},
|
|
111
|
+
{$rename: {organizationId: "formerOrganizationId"}},
|
|
112
|
+
{$rename: {formerOrganizationId: "organizationId"}},
|
|
113
|
+
]) {
|
|
114
|
+
let error: unknown;
|
|
115
|
+
try {
|
|
116
|
+
await OrgScopedWidgetModel.updateOne({_id: widget._id}, update);
|
|
117
|
+
} catch (caughtError) {
|
|
118
|
+
error = caughtError;
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
if (error) {
|
|
122
|
+
assert.equal((error as {status?: number}).status, 400);
|
|
123
|
+
assert.equal((error as {title?: string}).title, "organizationId cannot be changed");
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
const reloaded = await OrgScopedWidgetModel.findById(widget._id);
|
|
127
|
+
assert.equal(String(reloaded?.organizationId), String(orgA));
|
|
128
|
+
}
|
|
129
|
+
});
|
|
130
|
+
});
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import mongoose, {type Schema} from "mongoose";
|
|
2
|
+
|
|
3
|
+
import {BadRequestError} from "../errors";
|
|
4
|
+
|
|
5
|
+
export interface OrgScoped {
|
|
6
|
+
organizationId: mongoose.Types.ObjectId;
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
export const ORGANIZATION_ID_IMMUTABLE_TITLE = "organizationId cannot be changed";
|
|
10
|
+
|
|
11
|
+
const updateContainsOrganizationId = (value: unknown): boolean => {
|
|
12
|
+
if (Array.isArray(value)) {
|
|
13
|
+
return value.some(updateContainsOrganizationId);
|
|
14
|
+
}
|
|
15
|
+
if (!value || typeof value !== "object") {
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
return Object.entries(value).some(([key, nestedValue]) => {
|
|
19
|
+
if (key === "organizationId" || key.startsWith("organizationId.")) {
|
|
20
|
+
return true;
|
|
21
|
+
}
|
|
22
|
+
if (key === "$rename" && nestedValue && typeof nestedValue === "object") {
|
|
23
|
+
return Object.entries(nestedValue).some(([source, target]) => {
|
|
24
|
+
return (
|
|
25
|
+
source === "organizationId" ||
|
|
26
|
+
source.startsWith("organizationId.") ||
|
|
27
|
+
target === "organizationId" ||
|
|
28
|
+
String(target).startsWith("organizationId.")
|
|
29
|
+
);
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
return updateContainsOrganizationId(nestedValue);
|
|
33
|
+
});
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
/** Rejects post-create changes to an existing `organizationId` schema path. */
|
|
37
|
+
export const organizationIdImmutabilityPlugin = (schema: Schema): void => {
|
|
38
|
+
schema.pre("save", function () {
|
|
39
|
+
if (this.isNew || !this.isModified("organizationId")) {
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
42
|
+
throw new BadRequestError(ORGANIZATION_ID_IMMUTABLE_TITLE);
|
|
43
|
+
});
|
|
44
|
+
|
|
45
|
+
schema.pre(["updateOne", "findOneAndUpdate"], function () {
|
|
46
|
+
const update = this.getUpdate();
|
|
47
|
+
if (!updateContainsOrganizationId(update)) {
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
throw new BadRequestError(ORGANIZATION_ID_IMMUTABLE_TITLE);
|
|
51
|
+
});
|
|
52
|
+
};
|
|
53
|
+
|
|
54
|
+
/**
|
|
55
|
+
* Adds a required indexed `organizationId` so tenant-scoped consumer models cannot be saved
|
|
56
|
+
* without an organization. After creation, `organizationId` is immutable for REST, admin,
|
|
57
|
+
* sync, and direct saves.
|
|
58
|
+
*/
|
|
59
|
+
export const orgScopedPlugin = (schema: Schema): void => {
|
|
60
|
+
schema.add({
|
|
61
|
+
organizationId: {
|
|
62
|
+
description: "Organization this document belongs to",
|
|
63
|
+
index: true,
|
|
64
|
+
ref: "TerrenoOrganization",
|
|
65
|
+
required: true,
|
|
66
|
+
type: mongoose.Schema.Types.ObjectId,
|
|
67
|
+
},
|
|
68
|
+
});
|
|
69
|
+
organizationIdImmutabilityPlugin(schema);
|
|
70
|
+
};
|
|
@@ -0,0 +1,267 @@
|
|
|
1
|
+
import {describe, it} from "bun:test";
|
|
2
|
+
import {assert} from "chai";
|
|
3
|
+
import mongoose from "mongoose";
|
|
4
|
+
|
|
5
|
+
import type {User} from "../auth";
|
|
6
|
+
import {createAccess} from "../rbac/access";
|
|
7
|
+
import {
|
|
8
|
+
createRbacRoleModel,
|
|
9
|
+
organizationOperatorRole,
|
|
10
|
+
terrenoDefaultRoles,
|
|
11
|
+
} from "../rbac/roleModel";
|
|
12
|
+
import {terrenoStatements} from "../rbac/statements";
|
|
13
|
+
import {setupDb} from "../tests";
|
|
14
|
+
import type {MembershipDocument} from "../types/membership";
|
|
15
|
+
import type {OrganizationDocument} from "../types/organization";
|
|
16
|
+
import {Membership, Organization} from "./organizationModel";
|
|
17
|
+
import {type ResolvedOrgContext, runWithOrgContext} from "./orgContext";
|
|
18
|
+
|
|
19
|
+
const createTestUser = (
|
|
20
|
+
overrides: Partial<User & {roles: string[]}> = {}
|
|
21
|
+
): User & {roles: string[]} => {
|
|
22
|
+
const id = new mongoose.Types.ObjectId();
|
|
23
|
+
return {
|
|
24
|
+
_id: id as unknown as User["_id"],
|
|
25
|
+
admin: false,
|
|
26
|
+
id: id.toString(),
|
|
27
|
+
roles: [],
|
|
28
|
+
...overrides,
|
|
29
|
+
};
|
|
30
|
+
};
|
|
31
|
+
|
|
32
|
+
const orgAdminContext = (): ResolvedOrgContext => ({
|
|
33
|
+
membership: {roleName: "org-admin", status: "active"} as MembershipDocument,
|
|
34
|
+
organization: {_id: new mongoose.Types.ObjectId()} as OrganizationDocument,
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
const memberContext = (): ResolvedOrgContext => ({
|
|
38
|
+
membership: {roleName: "member", status: "active"} as MembershipDocument,
|
|
39
|
+
organization: {_id: new mongoose.Types.ObjectId()} as OrganizationDocument,
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
describe("organization RBAC", () => {
|
|
43
|
+
it("adds organization actions to terreno statements", () => {
|
|
44
|
+
assert.deepEqual(terrenoStatements.organization, [
|
|
45
|
+
"create",
|
|
46
|
+
"list",
|
|
47
|
+
"read",
|
|
48
|
+
"update",
|
|
49
|
+
"delete",
|
|
50
|
+
"manageMembers",
|
|
51
|
+
"disable",
|
|
52
|
+
]);
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
it("seeds a locked operator role with platform org grants", async () => {
|
|
56
|
+
await setupDb();
|
|
57
|
+
const RbacRole = createRbacRoleModel(mongoose.connection);
|
|
58
|
+
await RbacRole.seedDefaults({
|
|
59
|
+
extraRoles: [organizationOperatorRole],
|
|
60
|
+
statements: terrenoStatements,
|
|
61
|
+
});
|
|
62
|
+
|
|
63
|
+
assert.notInclude(
|
|
64
|
+
terrenoDefaultRoles.map((role) => role.name),
|
|
65
|
+
"operator"
|
|
66
|
+
);
|
|
67
|
+
assert.equal(organizationOperatorRole.name, "operator");
|
|
68
|
+
assert.notInclude(
|
|
69
|
+
terrenoDefaultRoles.map((role) => role.name),
|
|
70
|
+
"org-admin"
|
|
71
|
+
);
|
|
72
|
+
|
|
73
|
+
const operator = await RbacRole.findExactlyOne({name: "operator"});
|
|
74
|
+
assert.isTrue(operator.isLocked);
|
|
75
|
+
assert.deepEqual(operator.permissions.organization, [...terrenoStatements.organization]);
|
|
76
|
+
assert.deepEqual(operator.permissions.admin, ["access"]);
|
|
77
|
+
assert.deepEqual(operator.permissions.user, ["list", "read", "update"]);
|
|
78
|
+
|
|
79
|
+
const orgAdminRole = await RbacRole.findOne({name: "org-admin"});
|
|
80
|
+
assert.isNull(orgAdminRole);
|
|
81
|
+
});
|
|
82
|
+
|
|
83
|
+
it("lets operator organization:list and denies it to org-admin membership", async () => {
|
|
84
|
+
await setupDb();
|
|
85
|
+
const access = createAccess({
|
|
86
|
+
connection: mongoose.connection,
|
|
87
|
+
organizations: true,
|
|
88
|
+
statements: terrenoStatements,
|
|
89
|
+
});
|
|
90
|
+
await access.roles.seedDefaults();
|
|
91
|
+
|
|
92
|
+
const operator = createTestUser({roles: ["operator"]});
|
|
93
|
+
const operatorList = await access.can({
|
|
94
|
+
permissions: {organization: ["list"]},
|
|
95
|
+
user: operator,
|
|
96
|
+
});
|
|
97
|
+
assert.isTrue(operatorList.allowed);
|
|
98
|
+
|
|
99
|
+
const orgAdmin = createTestUser();
|
|
100
|
+
const orgAdminList = await runWithOrgContext(orgAdminContext(), () =>
|
|
101
|
+
access.can({
|
|
102
|
+
permissions: {organization: ["list"]},
|
|
103
|
+
user: orgAdmin,
|
|
104
|
+
})
|
|
105
|
+
);
|
|
106
|
+
assert.isFalse(orgAdminList.allowed);
|
|
107
|
+
|
|
108
|
+
const orgAdminUpdate = await runWithOrgContext(orgAdminContext(), () =>
|
|
109
|
+
access.can({
|
|
110
|
+
permissions: {organization: ["update", "read", "manageMembers"]},
|
|
111
|
+
user: orgAdmin,
|
|
112
|
+
})
|
|
113
|
+
);
|
|
114
|
+
assert.isTrue(orgAdminUpdate.allowed);
|
|
115
|
+
});
|
|
116
|
+
|
|
117
|
+
it("does not grant org-admin from user.roles; membership in context wins", async () => {
|
|
118
|
+
await setupDb();
|
|
119
|
+
const access = createAccess({
|
|
120
|
+
connection: mongoose.connection,
|
|
121
|
+
organizations: true,
|
|
122
|
+
statements: terrenoStatements,
|
|
123
|
+
});
|
|
124
|
+
await access.roles.seedDefaults();
|
|
125
|
+
|
|
126
|
+
const spoofed = createTestUser({roles: ["org-admin"]});
|
|
127
|
+
const spoofedUpdate = await access.can({
|
|
128
|
+
permissions: {organization: ["update"]},
|
|
129
|
+
user: spoofed,
|
|
130
|
+
});
|
|
131
|
+
assert.isFalse(spoofedUpdate.allowed);
|
|
132
|
+
|
|
133
|
+
const spoofedInMemberContext = await runWithOrgContext(memberContext(), () =>
|
|
134
|
+
access.can({
|
|
135
|
+
permissions: {organization: ["update"]},
|
|
136
|
+
user: spoofed,
|
|
137
|
+
})
|
|
138
|
+
);
|
|
139
|
+
assert.isFalse(spoofedInMemberContext.allowed);
|
|
140
|
+
|
|
141
|
+
const suspendedAdmin = createTestUser();
|
|
142
|
+
const suspendedContext: ResolvedOrgContext = {
|
|
143
|
+
membership: {roleName: "org-admin", status: "suspended"} as MembershipDocument,
|
|
144
|
+
organization: {_id: new mongoose.Types.ObjectId()} as OrganizationDocument,
|
|
145
|
+
};
|
|
146
|
+
const suspendedUpdate = await runWithOrgContext(suspendedContext, () =>
|
|
147
|
+
access.can({
|
|
148
|
+
permissions: {organization: ["update"]},
|
|
149
|
+
user: suspendedAdmin,
|
|
150
|
+
})
|
|
151
|
+
);
|
|
152
|
+
assert.isFalse(suspendedUpdate.allowed);
|
|
153
|
+
|
|
154
|
+
const memberOnly = createTestUser();
|
|
155
|
+
const memberUpdate = await runWithOrgContext(memberContext(), () =>
|
|
156
|
+
access.can({
|
|
157
|
+
permissions: {organization: ["update"]},
|
|
158
|
+
user: memberOnly,
|
|
159
|
+
})
|
|
160
|
+
);
|
|
161
|
+
assert.isFalse(memberUpdate.allowed);
|
|
162
|
+
|
|
163
|
+
const admin = createTestUser({roles: ["admin"]});
|
|
164
|
+
const adminList = await access.can({
|
|
165
|
+
permissions: {organization: ["list"]},
|
|
166
|
+
user: admin,
|
|
167
|
+
});
|
|
168
|
+
assert.isFalse(adminList.allowed);
|
|
169
|
+
});
|
|
170
|
+
|
|
171
|
+
it("grants only admin:access outside org context when the user has an active org-admin membership", async () => {
|
|
172
|
+
await setupDb();
|
|
173
|
+
const access = createAccess({
|
|
174
|
+
connection: mongoose.connection,
|
|
175
|
+
organizations: true,
|
|
176
|
+
statements: terrenoStatements,
|
|
177
|
+
});
|
|
178
|
+
await access.roles.seedDefaults();
|
|
179
|
+
|
|
180
|
+
const userId = new mongoose.Types.ObjectId();
|
|
181
|
+
const user = createTestUser({_id: userId as unknown as User["_id"], id: userId.toString()});
|
|
182
|
+
const org = await Organization.create({
|
|
183
|
+
name: "Alpha Workspace",
|
|
184
|
+
ownerId: userId,
|
|
185
|
+
});
|
|
186
|
+
await Membership.create({
|
|
187
|
+
organizationId: org._id,
|
|
188
|
+
roleName: "org-admin",
|
|
189
|
+
userId,
|
|
190
|
+
});
|
|
191
|
+
|
|
192
|
+
const shellAccess = await access.can({
|
|
193
|
+
permissions: {admin: ["access"]},
|
|
194
|
+
user,
|
|
195
|
+
});
|
|
196
|
+
assert.isTrue(shellAccess.allowed);
|
|
197
|
+
|
|
198
|
+
const orgList = await access.can({
|
|
199
|
+
permissions: {organization: ["list"]},
|
|
200
|
+
user,
|
|
201
|
+
});
|
|
202
|
+
assert.isFalse(orgList.allowed);
|
|
203
|
+
|
|
204
|
+
const orgUpdate = await access.can({
|
|
205
|
+
permissions: {organization: ["update"]},
|
|
206
|
+
user,
|
|
207
|
+
});
|
|
208
|
+
assert.isFalse(orgUpdate.allowed);
|
|
209
|
+
});
|
|
210
|
+
|
|
211
|
+
it("denies admin:access outside org context when the user has only member memberships", async () => {
|
|
212
|
+
await setupDb();
|
|
213
|
+
const access = createAccess({
|
|
214
|
+
connection: mongoose.connection,
|
|
215
|
+
organizations: true,
|
|
216
|
+
statements: terrenoStatements,
|
|
217
|
+
});
|
|
218
|
+
await access.roles.seedDefaults();
|
|
219
|
+
|
|
220
|
+
const userId = new mongoose.Types.ObjectId();
|
|
221
|
+
const user = createTestUser({_id: userId as unknown as User["_id"], id: userId.toString()});
|
|
222
|
+
const org = await Organization.create({
|
|
223
|
+
name: "Member Org",
|
|
224
|
+
ownerId: userId,
|
|
225
|
+
});
|
|
226
|
+
await Membership.create({
|
|
227
|
+
organizationId: org._id,
|
|
228
|
+
roleName: "member",
|
|
229
|
+
userId,
|
|
230
|
+
});
|
|
231
|
+
|
|
232
|
+
const shellAccess = await access.can({
|
|
233
|
+
permissions: {admin: ["access"]},
|
|
234
|
+
user,
|
|
235
|
+
});
|
|
236
|
+
assert.isFalse(shellAccess.allowed);
|
|
237
|
+
});
|
|
238
|
+
|
|
239
|
+
it("does not leak org-admin grants across organization contexts via the permission cache", async () => {
|
|
240
|
+
await setupDb();
|
|
241
|
+
const access = createAccess({
|
|
242
|
+
cacheTtlMs: 60_000,
|
|
243
|
+
connection: mongoose.connection,
|
|
244
|
+
organizations: true,
|
|
245
|
+
statements: terrenoStatements,
|
|
246
|
+
});
|
|
247
|
+
await access.roles.seedDefaults();
|
|
248
|
+
|
|
249
|
+
const user = createTestUser();
|
|
250
|
+
const firstOrg = orgAdminContext();
|
|
251
|
+
const allowed = await runWithOrgContext(firstOrg, () =>
|
|
252
|
+
access.can({
|
|
253
|
+
permissions: {organization: ["update"]},
|
|
254
|
+
user,
|
|
255
|
+
})
|
|
256
|
+
);
|
|
257
|
+
assert.isTrue(allowed.allowed);
|
|
258
|
+
|
|
259
|
+
const leaked = await runWithOrgContext(memberContext(), () =>
|
|
260
|
+
access.can({
|
|
261
|
+
permissions: {organization: ["update"]},
|
|
262
|
+
user,
|
|
263
|
+
})
|
|
264
|
+
);
|
|
265
|
+
assert.isFalse(leaked.allowed);
|
|
266
|
+
});
|
|
267
|
+
});
|