@open-mercato/shared 0.10.1-develop.8035.1.60d8986ed0 → 0.10.1-develop.8036.1.c97bc8de3c
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/dist/lib/api/scoped.js
CHANGED
|
@@ -24,6 +24,7 @@ function withScopedPayload(payload, ctx, translate, options = {}) {
|
|
|
24
24
|
const msg = resolveMessage(options.messages, "tenantRequired");
|
|
25
25
|
throw new CrudHttpError(400, { error: translate(msg.key, msg.fallback) });
|
|
26
26
|
}
|
|
27
|
+
enforceActorTenant(tenantId, ctx, translate, options);
|
|
27
28
|
const resolvedOrg = source?.organizationId ?? ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null;
|
|
28
29
|
if (requireOrganization && !resolvedOrg) {
|
|
29
30
|
const msg = resolveMessage(options.messages, "organizationRequired");
|
|
@@ -43,20 +44,6 @@ function parseScopedCommandInput(schema, payload, ctx, translate, options = {})
|
|
|
43
44
|
translate,
|
|
44
45
|
options
|
|
45
46
|
);
|
|
46
|
-
const actorTenantId = normalizeTenant(ctx.auth?.tenantId);
|
|
47
|
-
const requestedTenantId = normalizeTenant(scoped.tenantId);
|
|
48
|
-
const isSuperAdmin = authIsSuperAdmin(ctx.auth);
|
|
49
|
-
if (!isSuperAdmin) {
|
|
50
|
-
if (actorTenantId) {
|
|
51
|
-
if (!requestedTenantId || requestedTenantId !== actorTenantId) {
|
|
52
|
-
const msg = resolveMessage(options.messages, "tenantForbidden");
|
|
53
|
-
throw new CrudHttpError(403, { error: translate(msg.key, msg.fallback) });
|
|
54
|
-
}
|
|
55
|
-
} else if (requestedTenantId) {
|
|
56
|
-
const msg = resolveMessage(options.messages, "tenantForbidden");
|
|
57
|
-
throw new CrudHttpError(403, { error: translate(msg.key, msg.fallback) });
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
47
|
const { base, custom } = splitCustomFieldPayload(scoped);
|
|
61
48
|
const hasCustomFields = custom && Object.keys(custom).length > 0;
|
|
62
49
|
const candidates = hasCustomFields ? [base, { ...base, customFields: custom }] : [base];
|
|
@@ -77,6 +64,16 @@ function parseScopedCommandInput(schema, payload, ctx, translate, options = {})
|
|
|
77
64
|
const parsedWithCustom = hasCustomFields ? Object.assign({}, parsed, { customFields: custom }) : parsed;
|
|
78
65
|
return parsedWithCustom;
|
|
79
66
|
}
|
|
67
|
+
function enforceActorTenant(tenantId, ctx, translate, options) {
|
|
68
|
+
if (authIsSuperAdmin(ctx.auth)) return;
|
|
69
|
+
const actorTenantId = normalizeTenant(ctx.auth?.tenantId);
|
|
70
|
+
const requestedTenantId = normalizeTenant(tenantId);
|
|
71
|
+
const mismatched = actorTenantId ? !requestedTenantId || requestedTenantId !== actorTenantId : Boolean(requestedTenantId);
|
|
72
|
+
if (mismatched) {
|
|
73
|
+
const msg = resolveMessage(options.messages, "tenantForbidden");
|
|
74
|
+
throw new CrudHttpError(403, { error: translate(msg.key, msg.fallback) });
|
|
75
|
+
}
|
|
76
|
+
}
|
|
80
77
|
function normalizeTenant(candidate) {
|
|
81
78
|
if (typeof candidate === "string" && candidate.trim().length > 0) return candidate.trim();
|
|
82
79
|
return null;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/lib/api/scoped.ts"],
|
|
4
|
-
"sourcesContent": ["import type { CrudCtx } from '@open-mercato/shared/lib/crud/factory'\nimport { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport { splitCustomFieldPayload } from '@open-mercato/shared/lib/crud/custom-fields'\nimport type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'\nimport type { z } from 'zod'\n\nexport type ScopedContext = (CommandRuntimeContext | CrudCtx) & {\n auth: { tenantId?: string | null; orgId?: string | null } | null\n selectedOrganizationId?: string | null\n}\n\nexport type TranslateFn = (key: string, fallback?: string) => string\n\nexport type ScopedMessage = {\n key: string\n fallback: string\n}\n\nexport type ScopedPayloadMessages = {\n tenantRequired?: ScopedMessage\n organizationRequired?: ScopedMessage\n idRequired?: ScopedMessage\n tenantForbidden?: ScopedMessage\n}\n\nexport type ScopedPayloadOptions = {\n requireOrganization?: boolean\n messages?: ScopedPayloadMessages\n}\n\nconst DEFAULT_MESSAGES: Required<ScopedPayloadMessages> = {\n tenantRequired: { key: 'errors.tenant_required', fallback: 'Tenant context is required.' },\n organizationRequired: { key: 'errors.organization_required', fallback: 'Organization context is required.' },\n idRequired: { key: 'errors.id_required', fallback: 'Record identifier is required.' },\n tenantForbidden: { key: 'errors.tenant_forbidden', fallback: 'You are not allowed to target this tenant.' },\n}\n\nfunction resolveMessage(messages: ScopedPayloadMessages | undefined, key: keyof ScopedPayloadMessages): ScopedMessage {\n const override = messages?.[key]\n if (override && typeof override.key === 'string' && override.key.length > 0) {\n return {\n key: override.key,\n fallback: override.fallback ?? DEFAULT_MESSAGES[key]!.fallback,\n }\n }\n return DEFAULT_MESSAGES[key]!\n}\n\nexport function withScopedPayload<T extends Record<string, unknown>>(\n payload: T | null | undefined,\n ctx: ScopedContext,\n translate: TranslateFn,\n options: ScopedPayloadOptions = {}\n): T & { tenantId: string; organizationId?: string } {\n const requireOrganization = options.requireOrganization !== false\n const source = payload ? { ...payload } : {}\n const tenantId = (source as { tenantId?: string })?.tenantId ?? ctx.auth?.tenantId ?? null\n if (!tenantId) {\n const msg = resolveMessage(options.messages, 'tenantRequired')\n throw new CrudHttpError(400, { error: translate(msg.key, msg.fallback) })\n }\n\n const resolvedOrg =\n (source as { organizationId?: string })?.organizationId ??\n ctx.selectedOrganizationId ??\n ctx.auth?.orgId ??\n null\n\n if (requireOrganization && !resolvedOrg) {\n const msg = resolveMessage(options.messages, 'organizationRequired')\n throw new CrudHttpError(400, { error: translate(msg.key, msg.fallback) })\n }\n\n const scoped = {\n ...source,\n tenantId,\n } as T & { tenantId: string; organizationId?: string }\n\n if (resolvedOrg) scoped.organizationId = resolvedOrg\n\n return scoped\n}\n\nexport function parseScopedCommandInput<TSchema extends z.ZodTypeAny>(\n schema: TSchema,\n payload: unknown,\n ctx: ScopedContext,\n translate: TranslateFn,\n options: ScopedPayloadOptions = {}\n): z.infer<TSchema> & { customFields?: Record<string, unknown> } {\n const scoped = withScopedPayload(\n (payload && typeof payload === 'object' ? payload : {}) as Record<string, unknown>,\n ctx,\n translate,\n options\n )\n const
|
|
5
|
-
"mappings": "AACA,SAAS,qBAAqB;AAC9B,SAAS,+BAA+B;AA4BxC,MAAM,mBAAoD;AAAA,EACxD,gBAAgB,EAAE,KAAK,0BAA0B,UAAU,8BAA8B;AAAA,EACzF,sBAAsB,EAAE,KAAK,gCAAgC,UAAU,oCAAoC;AAAA,EAC3G,YAAY,EAAE,KAAK,sBAAsB,UAAU,iCAAiC;AAAA,EACpF,iBAAiB,EAAE,KAAK,2BAA2B,UAAU,6CAA6C;AAC5G;AAEA,SAAS,eAAe,UAA6C,KAAiD;AACpH,QAAM,WAAW,WAAW,GAAG;AAC/B,MAAI,YAAY,OAAO,SAAS,QAAQ,YAAY,SAAS,IAAI,SAAS,GAAG;AAC3E,WAAO;AAAA,MACL,KAAK,SAAS;AAAA,MACd,UAAU,SAAS,YAAY,iBAAiB,GAAG,EAAG;AAAA,IACxD;AAAA,EACF;AACA,SAAO,iBAAiB,GAAG;AAC7B;AAEO,SAAS,kBACd,SACA,KACA,WACA,UAAgC,CAAC,GACkB;AACnD,QAAM,sBAAsB,QAAQ,wBAAwB;AAC5D,QAAM,SAAS,UAAU,EAAE,GAAG,QAAQ,IAAI,CAAC;AAC3C,QAAM,WAAY,QAAkC,YAAY,IAAI,MAAM,YAAY;AACtF,MAAI,CAAC,UAAU;AACb,UAAM,MAAM,eAAe,QAAQ,UAAU,gBAAgB;AAC7D,UAAM,IAAI,cAAc,KAAK,EAAE,OAAO,UAAU,IAAI,KAAK,IAAI,QAAQ,EAAE,CAAC;AAAA,EAC1E;
|
|
4
|
+
"sourcesContent": ["import type { CrudCtx } from '@open-mercato/shared/lib/crud/factory'\nimport { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport { splitCustomFieldPayload } from '@open-mercato/shared/lib/crud/custom-fields'\nimport type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'\nimport type { z } from 'zod'\n\nexport type ScopedContext = (CommandRuntimeContext | CrudCtx) & {\n auth: { tenantId?: string | null; orgId?: string | null } | null\n selectedOrganizationId?: string | null\n}\n\nexport type TranslateFn = (key: string, fallback?: string) => string\n\nexport type ScopedMessage = {\n key: string\n fallback: string\n}\n\nexport type ScopedPayloadMessages = {\n tenantRequired?: ScopedMessage\n organizationRequired?: ScopedMessage\n idRequired?: ScopedMessage\n tenantForbidden?: ScopedMessage\n}\n\nexport type ScopedPayloadOptions = {\n requireOrganization?: boolean\n messages?: ScopedPayloadMessages\n}\n\nconst DEFAULT_MESSAGES: Required<ScopedPayloadMessages> = {\n tenantRequired: { key: 'errors.tenant_required', fallback: 'Tenant context is required.' },\n organizationRequired: { key: 'errors.organization_required', fallback: 'Organization context is required.' },\n idRequired: { key: 'errors.id_required', fallback: 'Record identifier is required.' },\n tenantForbidden: { key: 'errors.tenant_forbidden', fallback: 'You are not allowed to target this tenant.' },\n}\n\nfunction resolveMessage(messages: ScopedPayloadMessages | undefined, key: keyof ScopedPayloadMessages): ScopedMessage {\n const override = messages?.[key]\n if (override && typeof override.key === 'string' && override.key.length > 0) {\n return {\n key: override.key,\n fallback: override.fallback ?? DEFAULT_MESSAGES[key]!.fallback,\n }\n }\n return DEFAULT_MESSAGES[key]!\n}\n\nexport function withScopedPayload<T extends Record<string, unknown>>(\n payload: T | null | undefined,\n ctx: ScopedContext,\n translate: TranslateFn,\n options: ScopedPayloadOptions = {}\n): T & { tenantId: string; organizationId?: string } {\n const requireOrganization = options.requireOrganization !== false\n const source = payload ? { ...payload } : {}\n const tenantId = (source as { tenantId?: string })?.tenantId ?? ctx.auth?.tenantId ?? null\n if (!tenantId) {\n const msg = resolveMessage(options.messages, 'tenantRequired')\n throw new CrudHttpError(400, { error: translate(msg.key, msg.fallback) })\n }\n // A payload-supplied `tenantId` must still belong to the actor (issue #7877): the central API\n // dispatcher only validates a body-supplied `tenantId` up to a small byte budget, so a non-superadmin\n // can bypass that gate with an oversized body. This is the one place every caller of this helper\n // converges on, so the check holds regardless of body size or dispatcher-level route flags.\n enforceActorTenant(tenantId, ctx, translate, options)\n\n const resolvedOrg =\n (source as { organizationId?: string })?.organizationId ??\n ctx.selectedOrganizationId ??\n ctx.auth?.orgId ??\n null\n\n if (requireOrganization && !resolvedOrg) {\n const msg = resolveMessage(options.messages, 'organizationRequired')\n throw new CrudHttpError(400, { error: translate(msg.key, msg.fallback) })\n }\n\n const scoped = {\n ...source,\n tenantId,\n } as T & { tenantId: string; organizationId?: string }\n\n if (resolvedOrg) scoped.organizationId = resolvedOrg\n\n return scoped\n}\n\nexport function parseScopedCommandInput<TSchema extends z.ZodTypeAny>(\n schema: TSchema,\n payload: unknown,\n ctx: ScopedContext,\n translate: TranslateFn,\n options: ScopedPayloadOptions = {}\n): z.infer<TSchema> & { customFields?: Record<string, unknown> } {\n const scoped = withScopedPayload(\n (payload && typeof payload === 'object' ? payload : {}) as Record<string, unknown>,\n ctx,\n translate,\n options\n )\n const { base, custom } = splitCustomFieldPayload(scoped)\n const hasCustomFields = custom && Object.keys(custom).length > 0\n const candidates: Array<Record<string, unknown>> = hasCustomFields\n ? [base, { ...base, customFields: custom }]\n : [base]\n\n let parsed: z.infer<TSchema> | undefined\n let lastError: unknown\n for (const candidate of candidates) {\n try {\n parsed = schema.parse(candidate) as z.infer<TSchema>\n break\n } catch (err) {\n lastError = err\n }\n }\n if (!parsed) {\n if (lastError instanceof Error) throw lastError\n throw new CrudHttpError(400, { error: translate('errors.invalid_input', 'Invalid input') })\n }\n\n const parsedWithCustom = hasCustomFields\n ? Object.assign({}, parsed, { customFields: custom })\n : parsed\n\n return parsedWithCustom as z.infer<TSchema> & { customFields?: Record<string, unknown> }\n}\n\nfunction enforceActorTenant(\n tenantId: string,\n ctx: ScopedContext,\n translate: TranslateFn,\n options: ScopedPayloadOptions\n): void {\n if (authIsSuperAdmin(ctx.auth)) return\n const actorTenantId = normalizeTenant(ctx.auth?.tenantId)\n const requestedTenantId = normalizeTenant(tenantId)\n const mismatched = actorTenantId\n ? !requestedTenantId || requestedTenantId !== actorTenantId\n : Boolean(requestedTenantId)\n if (mismatched) {\n const msg = resolveMessage(options.messages, 'tenantForbidden')\n throw new CrudHttpError(403, { error: translate(msg.key, msg.fallback) })\n }\n}\n\nfunction normalizeTenant(candidate: unknown): string | null {\n if (typeof candidate === 'string' && candidate.trim().length > 0) return candidate.trim()\n return null\n}\n\nfunction authIsSuperAdmin(auth: ScopedContext['auth']): boolean {\n if (!auth) return false\n return (auth as Record<string, unknown>).isSuperAdmin === true\n}\n\nexport function requireRecordId(\n candidate: unknown,\n ctx: ScopedContext,\n translate: TranslateFn,\n options: ScopedPayloadOptions = {}\n): string {\n const fieldName = 'id'\n const id =\n typeof candidate === 'string'\n ? candidate.trim()\n : candidate && typeof candidate === 'object'\n ? typeof (candidate as Record<string, unknown>)[fieldName] === 'string'\n ? String((candidate as Record<string, unknown>)[fieldName])\n : null\n : null\n if (id && id.length > 0) return id\n const msg = resolveMessage(options.messages, 'idRequired')\n throw new CrudHttpError(400, { error: translate(msg.key, msg.fallback) })\n}\n\nexport function resolveCrudRecordId(\n parsed: unknown,\n ctx: ScopedContext,\n translate: TranslateFn,\n options: ScopedPayloadOptions & { fieldName?: string; queryParam?: string } = {}\n): string {\n const fieldName = options.fieldName ?? 'id'\n const queryParam = options.queryParam ?? fieldName\n\n const tryRequire = (value: unknown): string | null => {\n try {\n return requireRecordId(value, ctx, translate, options)\n } catch {\n return null\n }\n }\n\n if (parsed && typeof parsed === 'object') {\n const body = (parsed as Record<string, unknown>).body\n const fromBody = body && typeof body === 'object' ? tryRequire(body) : null\n if (fromBody) return fromBody\n\n const fallback = tryRequire(parsed)\n if (fallback) return fallback\n\n const query = (parsed as Record<string, unknown>).query\n if (query && typeof query === 'object') {\n const candidate = (query as Record<string, unknown>)[queryParam]\n if (typeof candidate === 'string' && candidate.trim().length > 0) return candidate.trim()\n }\n }\n\n if (ctx.request instanceof Request) {\n const value = new URL(ctx.request.url).searchParams.get(queryParam)\n if (value && value.trim().length > 0) return value.trim()\n }\n\n const msg = resolveMessage(options.messages, 'idRequired')\n throw new CrudHttpError(400, { error: translate(msg.key, msg.fallback) })\n}\n\nexport function createScopedApiHelpers(baseOptions?: ScopedPayloadOptions) {\n return {\n withScopedPayload: <T extends Record<string, unknown>>(\n payload: T | null | undefined,\n ctx: ScopedContext,\n translate: TranslateFn,\n options: ScopedPayloadOptions = {}\n ) => withScopedPayload(payload, ctx, translate, { ...baseOptions, ...options }),\n parseScopedCommandInput: <TSchema extends z.ZodTypeAny>(\n schema: TSchema,\n payload: unknown,\n ctx: ScopedContext,\n translate: TranslateFn,\n options: ScopedPayloadOptions = {}\n ) => parseScopedCommandInput(schema, payload, ctx, translate, { ...baseOptions, ...options }),\n requireRecordId: (\n candidate: unknown,\n ctx: ScopedContext,\n translate: TranslateFn,\n options: ScopedPayloadOptions = {}\n ) => requireRecordId(candidate, ctx, translate, { ...baseOptions, ...options }),\n resolveCrudRecordId: (\n parsed: unknown,\n ctx: ScopedContext,\n translate: TranslateFn,\n options: ScopedPayloadOptions & { fieldName?: string; queryParam?: string } = {}\n ) => resolveCrudRecordId(parsed, ctx, translate, { ...baseOptions, ...options }),\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/lib/version.js
CHANGED
package/dist/lib/version.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/lib/version.ts"],
|
|
4
|
-
"sourcesContent": ["// Build-time generated version\nexport const APP_VERSION = '0.10.1-develop.
|
|
4
|
+
"sourcesContent": ["// Build-time generated version\nexport const APP_VERSION = '0.10.1-develop.8036.1.c97bc8de3c';\nexport const appVersion = APP_VERSION;\n"],
|
|
5
5
|
"mappings": "AACO,MAAM,cAAc;AACpB,MAAM,aAAa;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@open-mercato/shared",
|
|
3
|
-
"version": "0.10.1-develop.
|
|
3
|
+
"version": "0.10.1-develop.8036.1.c97bc8de3c",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -130,7 +130,7 @@
|
|
|
130
130
|
"@mikro-orm/core": "^7.1.14",
|
|
131
131
|
"@mikro-orm/decorators": "^7.1.14",
|
|
132
132
|
"@mikro-orm/postgresql": "^7.1.14",
|
|
133
|
-
"@open-mercato/cache": "0.10.1-develop.
|
|
133
|
+
"@open-mercato/cache": "0.10.1-develop.8036.1.c97bc8de3c",
|
|
134
134
|
"@types/html-to-text": "^9.0.4",
|
|
135
135
|
"@types/sanitize-html": "^2.16.1",
|
|
136
136
|
"dotenv": "^17.4.2",
|
|
@@ -35,6 +35,27 @@ describe('parseScopedCommandInput', () => {
|
|
|
35
35
|
customFields: { foo: 'bar', extra: '123' },
|
|
36
36
|
})
|
|
37
37
|
})
|
|
38
|
+
|
|
39
|
+
it('rejects a payload tenantId that does not match the actor tenant (issue #7877)', () => {
|
|
40
|
+
const schema = z.object({
|
|
41
|
+
tenantId: z.string(),
|
|
42
|
+
organizationId: z.string().optional(),
|
|
43
|
+
name: z.string(),
|
|
44
|
+
})
|
|
45
|
+
const ctx = {
|
|
46
|
+
auth: { tenantId: 'tenant-1', orgId: 'org-1' },
|
|
47
|
+
selectedOrganizationId: 'org-1',
|
|
48
|
+
} as any
|
|
49
|
+
|
|
50
|
+
expect(() =>
|
|
51
|
+
parseScopedCommandInput(
|
|
52
|
+
schema,
|
|
53
|
+
{ tenantId: 'tenant-evil', organizationId: 'org-1', name: 'Test Product' },
|
|
54
|
+
ctx,
|
|
55
|
+
translate
|
|
56
|
+
)
|
|
57
|
+
).toThrow()
|
|
58
|
+
})
|
|
38
59
|
})
|
|
39
60
|
|
|
40
61
|
describe('withScopedPayload', () => {
|
|
@@ -78,4 +99,53 @@ describe('withScopedPayload', () => {
|
|
|
78
99
|
const result = withScopedPayload({}, ctx as any, translate)
|
|
79
100
|
expect(result.organizationId).toBe('org-2')
|
|
80
101
|
})
|
|
102
|
+
|
|
103
|
+
it('rejects a non-superadmin payload tenantId that does not match the actor tenant (issue #7877)', () => {
|
|
104
|
+
const ctx = {
|
|
105
|
+
auth: { tenantId: 'tenant-1', orgId: 'org-1' },
|
|
106
|
+
selectedOrganizationId: 'org-1',
|
|
107
|
+
}
|
|
108
|
+
expect(() =>
|
|
109
|
+
withScopedPayload({ tenantId: 'tenant-evil' }, ctx as any, translate)
|
|
110
|
+
).toThrow(CrudHttpError)
|
|
111
|
+
try {
|
|
112
|
+
withScopedPayload({ tenantId: 'tenant-evil' }, ctx as any, translate)
|
|
113
|
+
} catch (error: any) {
|
|
114
|
+
expect(error).toBeInstanceOf(CrudHttpError)
|
|
115
|
+
expect(error.status).toBe(403)
|
|
116
|
+
expect(error.body).toEqual({ error: 'You are not allowed to target this tenant.' })
|
|
117
|
+
}
|
|
118
|
+
})
|
|
119
|
+
|
|
120
|
+
it('rejects a non-superadmin payload tenantId when the actor has no tenant of their own', () => {
|
|
121
|
+
const ctx = {
|
|
122
|
+
auth: { tenantId: null, orgId: null },
|
|
123
|
+
selectedOrganizationId: 'org-1',
|
|
124
|
+
}
|
|
125
|
+
expect(() =>
|
|
126
|
+
withScopedPayload({ tenantId: 'tenant-evil', organizationId: 'org-1' }, ctx as any, translate)
|
|
127
|
+
).toThrow(CrudHttpError)
|
|
128
|
+
})
|
|
129
|
+
|
|
130
|
+
it('allows a superadmin to target a different tenantId via the payload', () => {
|
|
131
|
+
const ctx = {
|
|
132
|
+
auth: { tenantId: 'tenant-1', orgId: 'org-1', isSuperAdmin: true },
|
|
133
|
+
selectedOrganizationId: 'org-1',
|
|
134
|
+
}
|
|
135
|
+
const result = withScopedPayload(
|
|
136
|
+
{ tenantId: 'tenant-other', organizationId: 'org-1' },
|
|
137
|
+
ctx as any,
|
|
138
|
+
translate
|
|
139
|
+
)
|
|
140
|
+
expect(result.tenantId).toBe('tenant-other')
|
|
141
|
+
})
|
|
142
|
+
|
|
143
|
+
it('succeeds when the payload tenantId matches the actor tenant explicitly', () => {
|
|
144
|
+
const ctx = {
|
|
145
|
+
auth: { tenantId: 'tenant-1', orgId: 'org-1' },
|
|
146
|
+
selectedOrganizationId: 'org-1',
|
|
147
|
+
}
|
|
148
|
+
const result = withScopedPayload({ tenantId: 'tenant-1' }, ctx as any, translate)
|
|
149
|
+
expect(result.tenantId).toBe('tenant-1')
|
|
150
|
+
})
|
|
81
151
|
})
|
package/src/lib/api/scoped.ts
CHANGED
|
@@ -59,6 +59,11 @@ export function withScopedPayload<T extends Record<string, unknown>>(
|
|
|
59
59
|
const msg = resolveMessage(options.messages, 'tenantRequired')
|
|
60
60
|
throw new CrudHttpError(400, { error: translate(msg.key, msg.fallback) })
|
|
61
61
|
}
|
|
62
|
+
// A payload-supplied `tenantId` must still belong to the actor (issue #7877): the central API
|
|
63
|
+
// dispatcher only validates a body-supplied `tenantId` up to a small byte budget, so a non-superadmin
|
|
64
|
+
// can bypass that gate with an oversized body. This is the one place every caller of this helper
|
|
65
|
+
// converges on, so the check holds regardless of body size or dispatcher-level route flags.
|
|
66
|
+
enforceActorTenant(tenantId, ctx, translate, options)
|
|
62
67
|
|
|
63
68
|
const resolvedOrg =
|
|
64
69
|
(source as { organizationId?: string })?.organizationId ??
|
|
@@ -94,20 +99,6 @@ export function parseScopedCommandInput<TSchema extends z.ZodTypeAny>(
|
|
|
94
99
|
translate,
|
|
95
100
|
options
|
|
96
101
|
)
|
|
97
|
-
const actorTenantId = normalizeTenant(ctx.auth?.tenantId)
|
|
98
|
-
const requestedTenantId = normalizeTenant(scoped.tenantId)
|
|
99
|
-
const isSuperAdmin = authIsSuperAdmin(ctx.auth)
|
|
100
|
-
if (!isSuperAdmin) {
|
|
101
|
-
if (actorTenantId) {
|
|
102
|
-
if (!requestedTenantId || requestedTenantId !== actorTenantId) {
|
|
103
|
-
const msg = resolveMessage(options.messages, 'tenantForbidden')
|
|
104
|
-
throw new CrudHttpError(403, { error: translate(msg.key, msg.fallback) })
|
|
105
|
-
}
|
|
106
|
-
} else if (requestedTenantId) {
|
|
107
|
-
const msg = resolveMessage(options.messages, 'tenantForbidden')
|
|
108
|
-
throw new CrudHttpError(403, { error: translate(msg.key, msg.fallback) })
|
|
109
|
-
}
|
|
110
|
-
}
|
|
111
102
|
const { base, custom } = splitCustomFieldPayload(scoped)
|
|
112
103
|
const hasCustomFields = custom && Object.keys(custom).length > 0
|
|
113
104
|
const candidates: Array<Record<string, unknown>> = hasCustomFields
|
|
@@ -136,6 +127,24 @@ export function parseScopedCommandInput<TSchema extends z.ZodTypeAny>(
|
|
|
136
127
|
return parsedWithCustom as z.infer<TSchema> & { customFields?: Record<string, unknown> }
|
|
137
128
|
}
|
|
138
129
|
|
|
130
|
+
function enforceActorTenant(
|
|
131
|
+
tenantId: string,
|
|
132
|
+
ctx: ScopedContext,
|
|
133
|
+
translate: TranslateFn,
|
|
134
|
+
options: ScopedPayloadOptions
|
|
135
|
+
): void {
|
|
136
|
+
if (authIsSuperAdmin(ctx.auth)) return
|
|
137
|
+
const actorTenantId = normalizeTenant(ctx.auth?.tenantId)
|
|
138
|
+
const requestedTenantId = normalizeTenant(tenantId)
|
|
139
|
+
const mismatched = actorTenantId
|
|
140
|
+
? !requestedTenantId || requestedTenantId !== actorTenantId
|
|
141
|
+
: Boolean(requestedTenantId)
|
|
142
|
+
if (mismatched) {
|
|
143
|
+
const msg = resolveMessage(options.messages, 'tenantForbidden')
|
|
144
|
+
throw new CrudHttpError(403, { error: translate(msg.key, msg.fallback) })
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
|
|
139
148
|
function normalizeTenant(candidate: unknown): string | null {
|
|
140
149
|
if (typeof candidate === 'string' && candidate.trim().length > 0) return candidate.trim()
|
|
141
150
|
return null
|