The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
refactor(server): bind resolved application packages to their registration (#26077)
Paul Rastoin172dbaee1af0
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex c4f50379c4d..be4560587bc 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -4015,7 +4015,7 @@ type Mutation {createApplicationRegistrationVariable(input: CreateApplicationRegistrationVariableInput!): ApplicationRegistrationVariable!updateApplicationRegistrationVariable(input: UpdateApplicationRegistrationVariableInput!): ApplicationRegistrationVariable!deleteApplicationRegistrationVariable(id: String!): Boolean!- uploadAppTarball(file: Upload!, universalIdentifier: String): ApplicationRegistration!+ uploadAppTarball(file: Upload!, universalIdentifier: String @deprecated(reason: "Ignored: the application universalIdentifier is read from the tarball manifest.")): ApplicationRegistration!claimApplicationRegistrationOwnership(applicationRegistrationId: String!): ApplicationRegistration!transferApplicationRegistrationOwnership(applicationRegistrationId: String!, targetWorkspaceSubdomain: String!): ApplicationRegistration!installMarketplaceApp(universalIdentifier: String!, version: String): Boolean! @deprecated(reason: "Use installApplication instead")diff --git a/packages/twenty-docs/developers/extend/apps/config/application.mdx b/packages/twenty-docs/developers/extend/apps/config/application.mdxindex 3c1c8192f30..405c165bd46 100644--- a/packages/twenty-docs/developers/extend/apps/config/application.mdx+++ b/packages/twenty-docs/developers/extend/apps/config/application.mdx@@ -32,7 +32,7 @@ export default defineApplication({```Notes:-- `universalIdentifier` fields are deterministic IDs you own. Generate them once and keep them stable across syncs. The application's own `universalIdentifier` is unique across the whole instance and is bound to the workspace that owns its registration, so only that workspace can sync the app — see [Registration ownership](/developers/extend/apps/operations/publishing#registration-ownership).+- `universalIdentifier` fields are UUIDs you generate once and own. Keep them stable across syncs. The application's own `universalIdentifier` must be a valid UUID: the server rejects a manifest whose identifier is not one. It is unique across the whole instance and is bound to the workspace that owns its registration, so only that workspace can sync the app — see [Registration ownership](/developers/extend/apps/operations/publishing#registration-ownership).- `applicationVariables` accept an optional `label` — a user-friendly name displayed in the app's settings page instead of the raw variable key.- `applicationVariables` become environment variables for your functions and front components. In logic functions (server-side), they are available as `process.env.VARIABLE_NAME`. In front components, use `getApplicationVariable('VARIABLE_NAME')` from `twenty-sdk/front-component`. Variables marked with `isSecret: true` are only injected into logic functions. Front components receive only non-secret variables.- The default role is detected automatically from the role file marked with [`defineApplicationRole()`](/developers/extend/apps/config/roles) — you do not need to reference it from `defineApplication()`.diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 0cc51b8525a..6e7105964b4 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -4397,7 +4397,6 @@ export type MutationUpgradeApplicationArgs = {export type MutationUploadAppTarballArgs = {file: Scalars['Upload']['input'];- universalIdentifier?: InputMaybe<Scalars['String']['input']>;};diff --git a/packages/twenty-server/src/engine/core-modules/application/application-package/application-package-fetcher.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/application-package-fetcher.service.tsindex e2367dce6a4..8d615a71220 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-package/application-package-fetcher.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-package/application-package-fetcher.service.ts@@ -12,18 +12,20 @@ import { isDefined } from 'twenty-shared/utils';import { type PackageJson } from 'type-fest';import { IsNull, Not, Repository } from 'typeorm';import { v4 } from 'uuid';+import { z } from 'zod';+import { assertValidNpmPackageName } from 'src/engine/core-modules/application/application-package/utils/assert-valid-npm-package-name.util';+import { extractTarballSecurely } from 'src/engine/core-modules/application/application-package/utils/extract-tarball-securely.util';+import { assertValidNpmVersionSpec } from 'src/engine/core-modules/application/application-package/utils/is-valid-npm-version-spec.util';+import { readJsonFileOrThrow } from 'src/engine/core-modules/application/application-package/utils/read-json-file.util';+import { resolvePackageContentDir } from 'src/engine/core-modules/application/application-package/utils/tarball-utils';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';import {ApplicationException,ApplicationExceptionCode,} from 'src/engine/core-modules/application/application.exception';-import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';-import { assertValidNpmPackageName } from 'src/engine/core-modules/application/application-package/utils/assert-valid-npm-package-name.util';-import { extractTarballSecurely } from 'src/engine/core-modules/application/application-package/utils/extract-tarball-securely.util';-import { readJsonFileOrThrow } from 'src/engine/core-modules/application/application-package/utils/read-json-file.util';-import { resolvePackageContentDir } from 'src/engine/core-modules/application/application-package/utils/tarball-utils';import { FileStorageService } from 'src/engine/core-modules/file-storage/services/file-storage.service';import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';import { removeFileFolderFromFileEntityPath } from 'src/engine/core-modules/file/utils/remove-file-folder-from-file-entity-path.utils';@@ -41,6 +43,11 @@ export type ResolvedPackage = {packageJson: PackageJson;};+const registryVersionMetadataSchema = z.object({+ name: z.string(),+ dist: z.object({ tarball: z.string().optional() }).optional(),+});+@Injectable()export class ApplicationPackageFetcherService implements OnModuleInit {private readonly logger = new Logger(ApplicationPackageFetcherService.name);@@ -68,6 +75,34 @@ export class ApplicationPackageFetcherService implements OnModuleInit {async resolvePackage(appRegistration: ApplicationRegistrationEntity,options?: { targetVersion?: string },+ ): Promise<ResolvedPackage | null> {+ const resolvedPackage = await this.resolveFromSource(+ appRegistration,+ options,+ );++ if (!isDefined(resolvedPackage)) {+ return null;+ }++ const manifestUniversalIdentifier =+ resolvedPackage.manifest.application.universalIdentifier;++ if (manifestUniversalIdentifier !== appRegistration.universalIdentifier) {+ await this.cleanupExtractedDir(resolvedPackage.cleanupDir);++ throw new ApplicationException(+ `Resolved package declares application ${manifestUniversalIdentifier} but registration is for ${appRegistration.universalIdentifier}`,+ ApplicationExceptionCode.PACKAGE_RESOLUTION_FAILED,+ );+ }++ return resolvedPackage;+ }++ private async resolveFromSource(+ appRegistration: ApplicationRegistrationEntity,+ options?: { targetVersion?: string },): Promise<ResolvedPackage | null> {switch (appRegistration.sourceType) {case ApplicationRegistrationSourceType.NPM:@@ -99,7 +134,7 @@ export class ApplicationPackageFetcherService implements OnModuleInit {}private async resolveFromNpm(- packageName: string,+ sourcePackage: string,targetVersion?: string,): Promise<ResolvedPackage> {const workDir = join(APP_FETCHER_TMPDIR, v4());@@ -110,13 +145,15 @@ export class ApplicationPackageFetcherService implements OnModuleInit {const registryUrl = this.twentyConfigService.get('APP_REGISTRY_URL');const authToken = this.twentyConfigService.get('APP_REGISTRY_TOKEN');- assertValidNpmPackageName(packageName);+ assertValidNpmPackageName(sourcePackage);const versionSpec = targetVersion ?? 'latest';+ assertValidNpmVersionSpec(versionSpec);+const tarballUrl = await this.fetchTarballUrl(registryUrl,- packageName,+ sourcePackage,versionSpec,authToken,);@@ -126,6 +163,7 @@ export class ApplicationPackageFetcherService implements OnModuleInit {registryUrl,authToken,);+const tarballPath = join(workDir, 'package.tgz');await fs.writeFile(tarballPath, tarballBuffer);@@ -142,6 +180,13 @@ export class ApplicationPackageFetcherService implements OnModuleInit {'package.json',);+ if (packageJson.name !== sourcePackage) {+ throw new ApplicationException(+ `Downloaded package is ${packageJson.name} but ${sourcePackage} was requested`,+ ApplicationExceptionCode.PACKAGE_RESOLUTION_FAILED,+ );+ }+return {extractedDir: contentDir,cleanupDir: workDir,@@ -156,7 +201,7 @@ export class ApplicationPackageFetcherService implements OnModuleInit {}throw new ApplicationException(- `Failed to resolve npm package ${packageName}: ${error}`,+ `Failed to resolve npm package ${sourcePackage}: ${error}`,ApplicationExceptionCode.PACKAGE_RESOLUTION_FAILED,);}@@ -241,13 +286,14 @@ export class ApplicationPackageFetcherService implements OnModuleInit {private async fetchTarballUrl(registryUrl: string,- packageName: string,+ sourcePackage: string,versionSpec: string,authToken?: string,): Promise<string> {- const encodedName = encodeURIComponent(packageName);+ const encodedName = encodeURIComponent(sourcePackage);+ const encodedVersionSpec = encodeURIComponent(versionSpec);const baseUrl = registryUrl.replace(/\/$/, '');- const metadataUrl = `${baseUrl}/${encodedName}/${versionSpec}`;+ const metadataUrl = `${baseUrl}/${encodedName}/${encodedVersionSpec}`;const headers: Record<string, string> = {Accept: 'application/json',@@ -267,21 +313,39 @@ export class ApplicationPackageFetcherService implements OnModuleInit {let response;try {- response = await httpClient.get<{- dist?: { tarball?: string };- }>(metadataUrl, { headers });+ response = await httpClient.get(metadataUrl, { headers });} catch (error) {throw new ApplicationException(- `Registry returned ${isAxiosError(error) ? error.response?.status : 'unknown error'} for ${packageName}@${versionSpec}`,+ `Registry returned ${isAxiosError(error) ? error.response?.status : 'unknown error'} for ${sourcePackage}@${versionSpec}`,+ ApplicationExceptionCode.PACKAGE_RESOLUTION_FAILED,+ );+ }++ const parsedMetadata = registryVersionMetadataSchema.safeParse(+ response.data,+ );++ if (!parsedMetadata.success) {+ throw new ApplicationException(+ `Unexpected registry metadata shape for ${sourcePackage}@${versionSpec}`,+ ApplicationExceptionCode.PACKAGE_RESOLUTION_FAILED,+ );+ }++ const metadata = parsedMetadata.data;++ if (metadata.name !== sourcePackage) {+ throw new ApplicationException(+ `Registry metadata for ${sourcePackage}@${versionSpec} describes ${metadata.name}`,ApplicationExceptionCode.PACKAGE_RESOLUTION_FAILED,);}- const tarballUrl = response.data?.dist?.tarball;+ const tarballUrl = metadata.dist?.tarball;if (!tarballUrl) {throw new ApplicationException(- `No tarball URL in registry metadata for ${packageName}@${versionSpec}`,+ `No tarball URL in registry metadata for ${sourcePackage}@${versionSpec}`,ApplicationExceptionCode.PACKAGE_RESOLUTION_FAILED,);}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-package/utils/__tests__/is-valid-npm-version-spec.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/utils/__tests__/is-valid-npm-version-spec.util.spec.tsnew file mode 100644index 00000000000..7b4a82d1c6f--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-package/utils/__tests__/is-valid-npm-version-spec.util.spec.ts@@ -0,0 +1,65 @@+import { ApplicationExceptionCode } from 'src/engine/core-modules/application/application.exception';+import {+ assertValidNpmVersionSpec,+ isValidNpmVersionSpec,+} from 'src/engine/core-modules/application/application-package/utils/is-valid-npm-version-spec.util';++describe('isValidNpmVersionSpec', () => {+ it.each([+ '1.2.3',+ '0.0.1-beta.4',+ '10.20.30-rc.1',+ '1.2.3+build.5',+ '1.2.3-rc.1+build.5',+ ])('should accept the exact semver version %s', (versionSpec) => {+ expect(isValidNpmVersionSpec(versionSpec)).toBe(true);+ });++ it.each(['latest', 'next', 'beta', 'v2-latest', 'canary_2024'])(+ 'should accept the dist-tag %s',+ (versionSpec) => {+ expect(isValidNpmVersionSpec(versionSpec)).toBe(true);+ },+ );++ it.each([+ ['path traversal', '../@evil/pkg/latest'],+ ['nested traversal', 'latest/../../@evil/pkg/latest'],+ ['slash', '1.2.3/extra'],+ ['percent-encoded traversal', '%2e%2e%2f@evil%2fpkg%2flatest'],+ ['percent sign', '1%2E2%2E3'],+ ['whitespace', '1.2.3 '],+ ['newline', 'latest\n'],+ ['double dots in a tag', 'a..b'],+ ['leading dot', '.hidden'],+ ['leading dash', '-1.2.3'],+ ['semver range', '^1.2.3'],+ ['x-range', '1.x'],+ ['partial version', '1.2'],+ ['wildcard', 'x'],+ ['leading v', 'v1.2.3'],+ ['empty', ''],+ ['query string', 'latest?x=1'],+ ['hash', 'latest#frag'],+ ])('should reject %s (%s)', (_label, versionSpec) => {+ expect(isValidNpmVersionSpec(versionSpec)).toBe(false);+ });++ it('should reject an overly long spec', () => {+ expect(isValidNpmVersionSpec('a'.repeat(257))).toBe(false);+ });+});++describe('assertValidNpmVersionSpec', () => {+ it('should not throw for a valid spec', () => {+ expect(() => assertValidNpmVersionSpec('1.2.3')).not.toThrow();+ });++ it('should throw INVALID_INPUT for a traversal spec', () => {+ expect(() => assertValidNpmVersionSpec('../@evil/pkg/latest')).toThrow(+ expect.objectContaining({+ code: ApplicationExceptionCode.INVALID_INPUT,+ }),+ );+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/application/application-package/utils/is-valid-npm-version-spec.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/utils/is-valid-npm-version-spec.util.tsnew file mode 100644index 00000000000..ad2091a8b46--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-package/utils/is-valid-npm-version-spec.util.ts@@ -0,0 +1,57 @@+import semver from 'semver';+import { isDefined } from 'twenty-shared/utils';++import {+ ApplicationException,+ ApplicationExceptionCode,+} from 'src/engine/core-modules/application/application.exception';++const MAX_VERSION_SPEC_LENGTH = 256;++// npm dist-tags are single URL path segments: no slash, percent sign, or+// whitespace, so the spec can never escape the package segment of the+// registry URL.+const NPM_DIST_TAG_REGEX = /^[a-zA-Z0-9][a-zA-Z0-9._-]*$/;++export const isValidNpmVersionSpec = (versionSpec: string): boolean => {+ if (+ versionSpec.length === 0 ||+ versionSpec.length > MAX_VERSION_SPEC_LENGTH ||+ versionSpec.includes('..')+ ) {+ return false;+ }++ // Accept an exact version, build metadata included, by rebuilding the+ // canonical form from the parse; comparing to semver.valid drops build+ // metadata, and comparing to the raw input would keep a leading v or+ // surrounding whitespace.+ const parsed = semver.parse(versionSpec);++ if (isDefined(parsed)) {+ const canonicalVersion =+ parsed.build.length > 0+ ? `${parsed.version}+${parsed.build.join('.')}`+ : parsed.version;++ if (canonicalVersion === versionSpec) {+ return true;+ }+ }++ // npm refuses dist-tags that parse as a semver range, so anything the+ // registry would resolve as a range is neither an exact version nor a tag.+ return (+ NPM_DIST_TAG_REGEX.test(versionSpec) &&+ !isDefined(semver.validRange(versionSpec))+ );+};++export const assertValidNpmVersionSpec = (versionSpec: string): void => {+ if (!isValidNpmVersionSpec(versionSpec)) {+ throw new ApplicationException(+ 'Invalid npm version: expected an exact semver version or a dist-tag',+ ApplicationExceptionCode.INVALID_INPUT,+ );+ }+};diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration-claim.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration-claim.service.tsindex 221752b7c15..ce6f6add07e 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration-claim.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration-claim.service.ts@@ -15,6 +15,7 @@ import {import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';import { type AdminApplicationRegistrationClaimDTO } from 'src/engine/core-modules/application/application-registration/dtos/admin-application-registration-claim.dto';import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';+import { isValidNpmVersionSpec } from 'src/engine/core-modules/application/application-package/utils/is-valid-npm-version-spec.util';import { type ApplicationRegistrationGithubClaimStateJwtPayload } from 'src/engine/core-modules/auth/types/application-registration-github-claim-state-jwt-payload.type';import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/jwt-token-type.enum';import { JwtWrapperService } from 'src/engine/core-modules/jwt/services/jwt-wrapper.service';@@ -237,14 +238,22 @@ export class ApplicationRegistrationClaimService {params.version ??(await this.fetchLatestVersion(registryUrl, params.packageName));+ if (!isValidNpmVersionSpec(version)) {+ throw new ApplicationRegistrationException(+ `Invalid version "${version}" for ${params.packageName}`,+ ApplicationRegistrationExceptionCode.INVALID_INPUT,+ );+ }+// Scoped packages need their slash percent-encoded for the registry path.const encodedName = params.packageName.replace(/\//g, '%2F');+ const encodedVersion = encodeURIComponent(version);let data: unknown;try {const response = await axios.get(- `${registryUrl}/-/npm/v1/attestations/${encodedName}@${version}`,+ `${registryUrl}/-/npm/v1/attestations/${encodedName}@${encodedVersion}`,{headers: { 'User-Agent': 'Twenty-Marketplace' },timeout: 10_000,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.tsindex c4494c71417..3a5591f3911 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts@@ -259,8 +259,13 @@ export class ApplicationRegistrationResolver {async uploadAppTarball(@Args({ name: 'file', type: () => GraphQLUpload }){ createReadStream }: FileUpload,- @Args('universalIdentifier', { type: () => String, nullable: true })- universalIdentifier: string | undefined,+ @Args('universalIdentifier', {+ type: () => String,+ nullable: true,+ deprecationReason:+ 'Ignored: the application universalIdentifier is read from the tarball manifest.',+ })+ _universalIdentifier: string | undefined,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<ApplicationRegistrationEntity> {const maxSize = this.twentyConfigService.get(@@ -274,7 +279,6 @@ export class ApplicationRegistrationResolver {return this.applicationTarballService.uploadTarball({tarballBuffer,- universalIdentifier,ownerWorkspaceId: workspaceId,});} catch (error) {diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.tsindex 17a365e59f7..9e6b14bbf52 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.ts@@ -6,7 +6,7 @@ import { tmpdir } from 'os';import { isAbsolute, join, relative, resolve } from 'path';import { FileFolder } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, isValidUuid } from 'twenty-shared/utils';import { Repository } from 'typeorm';import { v4 } from 'uuid';@@ -47,7 +47,6 @@ export class ApplicationTarballService {async uploadTarball(params: {tarballBuffer: Buffer;- universalIdentifier?: string;ownerWorkspaceId: string;}): Promise<ApplicationRegistrationEntity> {const tempDir = join(tmpdir(), 'twenty-tarball-upload', v4());@@ -58,15 +57,7 @@ export class ApplicationTarballService {const { contentDir, manifest, packageJson } =await this.extractAndValidateTarball(tempDir, params.tarballBuffer);- const universalIdentifier =- params.universalIdentifier ?? manifest.application?.universalIdentifier;-- if (!isDefined(universalIdentifier)) {- throw new ApplicationRegistrationException(- 'universalIdentifier is required (in body or manifest)',- ApplicationRegistrationExceptionCode.INVALID_INPUT,- );- }+ const universalIdentifier = manifest.application.universalIdentifier;const existingRegistration = await this.appRegistrationRepository.findOne({@@ -156,7 +147,7 @@ export class ApplicationTarballService {tarballBuffer: Buffer,): Promise<{contentDir: string;- manifest: { application?: ApplicationManifest };+ manifest: { application: ApplicationManifest };packageJson: { version: string; engines?: { twenty?: string } } | null;}> {const tarballPath = join(tempDir, 'app.tar.gz');@@ -186,6 +177,16 @@ export class ApplicationTarballService {);}+ if (+ !isDefined(manifest.application) ||+ !isValidUuid(manifest.application.universalIdentifier)+ ) {+ throw new ApplicationRegistrationException(+ 'Tarball manifest application universalIdentifier must be a valid UUID',+ ApplicationRegistrationExceptionCode.INVALID_INPUT,+ );+ }+const versionValidation =await this.applicationVersionValidationService.validateServerCompatibility(packageJson?.engines?.twenty,@@ -200,7 +201,11 @@ export class ApplicationTarballService {);}- return { contentDir, manifest, packageJson };+ return {+ contentDir,+ manifest: { application: manifest.application },+ packageJson,+ };}private assertTarballCanReplaceRegistration({diff --git a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/npm-application-install-package-identity.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/npm-application-install-package-identity.integration-spec.ts.snapnew file mode 100644index 00000000000..e1bf76c19df--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/npm-application-install-package-identity.integration-spec.ts.snap@@ -0,0 +1,13 @@+// Jest Snapshot v1, https://goo.gl/fbAQLP++exports[`npm application install package identity (integration) rejects a path-traversal version before any registry call 1`] = `+{+ "extensions": {+ "code": "BAD_USER_INPUT",+ "subCode": "INVALID_INPUT",+ "userFriendlyMessage": "Invalid input provided.",+ },+ "message": "Invalid npm version: expected an exact semver version or a dist-tag",+ "name": "UserInputError",+}+`;diff --git a/packages/twenty-server/test/integration/metadata/suites/application/app-distribution.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/app-distribution.integration-spec.tsindex 3f48dcbe17f..38d6350d8a0 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/app-distribution.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/app-distribution.integration-spec.ts@@ -177,6 +177,42 @@ describe('App Distribution (integration)', () => {expect(rows[0].sourceType).toBe('tarball');});+ it('should reject a tarball whose manifest identifier is not a valid UUID', async () => {+ const tarball = await createTestTarball({+ 'manifest.json': createValidManifest('not-a-uuid'),+ 'package.json': JSON.stringify({ name: 'test-app', version: '1.0.0' }),+ });++ const { errors } = await uploadAppTarball({+ tarballBuffer: tarball,+ expectToFail: true,+ });++ expect(errors).toBeDefined();+ });++ it('should reject a tarball whose manifest has no application identifier', async () => {+ const tarball = await createTestTarball({+ 'manifest.json': JSON.stringify({+ application: {+ displayName: 'App Without Identifier',+ description: 'A test app',+ applicationVariables: {},+ packageJsonChecksum: null,+ yarnLockChecksum: null,+ },+ }),+ 'package.json': JSON.stringify({ name: 'test-app', version: '1.0.0' }),+ });++ const { errors } = await uploadAppTarball({+ tarballBuffer: tarball,+ expectToFail: true,+ });++ expect(errors).toBeDefined();+ });+it('should fail to update existing version', async () => {const uid = crypto.randomUUID();const manifest = createValidManifest(uid);diff --git a/packages/twenty-server/test/integration/metadata/suites/application/npm-application-install-package-identity.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/npm-application-install-package-identity.integration-spec.tsnew file mode 100644index 00000000000..523454e68d1--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/npm-application-install-package-identity.integration-spec.ts@@ -0,0 +1,184 @@+import { expectOneNotInternalServerErrorSnapshot } from 'test/integration/graphql/utils/expect-one-not-internal-server-error-snapshot.util';+import { type BaseGraphQLError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';+import { buildBaseManifest } from 'test/integration/metadata/suites/application/utils/build-base-manifest.util';+import {+ buildNpmRegistryPackage,+ type StubbedRegistryPackage,+} from 'test/integration/metadata/suites/application/utils/build-npm-registry-package.util';+import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';+import { insertCatalogApplicationRegistration } from 'test/integration/metadata/suites/application/utils/insert-catalog-application-registration.util';+import { installApplication } from 'test/integration/metadata/suites/application/utils/install-application.util';+import {+ type NpmRegistryStub,+ stubNpmRegistry,+} from 'test/integration/metadata/suites/application/utils/stub-npm-registry.util';+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';++import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';+import { type TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';++const PACKAGE_NAME = '@twenty-test/install-identity-app';+const APP_UNIVERSAL_IDENTIFIER = 'b4a1a0e2-1b6a-4b2f-9c58-0d2a5d5b6f10';+const FOREIGN_APP_IDENTIFIER = 'e7d3c8f1-5a2b-4c9d-8e6f-1a2b3c4d5e6f';+const ROLE_UNIVERSAL_IDENTIFIER = 'a1b2c3d4-5e6f-4a7b-8c9d-0e1f2a3b4c5d';+const VALID_VERSION = '1.2.3';+const TRAVERSAL_VERSION = '../@evil/pkg/latest';+const SUBSTITUTE_PACKAGE_NAME = '@evil/substitute-app';++const expectPackageResolutionFailure = (errors: BaseGraphQLError[]) => {+ expect(errors).toHaveLength(1);+ expect(errors[0].extensions.code).toBe('INTERNAL_SERVER_ERROR');+ expect(errors[0].extensions.subCode).toBe('PACKAGE_RESOLUTION_FAILED');+};++describe('npm application install package identity (integration)', () => {+ let registryBaseUrl: string;+ let activeStub: NpmRegistryStub | undefined;++ const buildRegistryPackage = ({+ manifestAppId = APP_UNIVERSAL_IDENTIFIER,+ metadataName,+ packageJsonName,+ }: {+ manifestAppId?: string;+ metadataName?: string | null;+ packageJsonName?: string;+ } = {}): Promise<StubbedRegistryPackage> =>+ buildNpmRegistryPackage({+ registryBaseUrl,+ packageName: PACKAGE_NAME,+ version: VALID_VERSION,+ manifestJson: JSON.stringify(+ buildBaseManifest({+ appId: manifestAppId,+ roleId: ROLE_UNIVERSAL_IDENTIFIER,+ }),+ ),+ metadataName,+ packageJsonName,+ });++ const expectedMetadataUrl = () =>+ `${registryBaseUrl}/${encodeURIComponent(PACKAGE_NAME)}/${VALID_VERSION}`;++ beforeAll(async () => {+ jest.useRealTimers();++ registryBaseUrl = getAppProviderByClassName<TwentyConfigService>(+ 'TwentyConfigService',+ )+ .get('APP_REGISTRY_URL')+ .replace(/\/$/, '');++ await insertCatalogApplicationRegistration({+ universalIdentifier: APP_UNIVERSAL_IDENTIFIER,+ name: 'Install identity test app',+ sourcePackage: PACKAGE_NAME,+ sourceType: ApplicationRegistrationSourceType.NPM,+ });+ });++ afterEach(() => {+ activeStub?.restore();+ activeStub = undefined;+ });++ afterAll(async () => {+ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier: APP_UNIVERSAL_IDENTIFIER,+ });+ jest.useFakeTimers();+ });++ it('rejects a path-traversal version before any registry call', async () => {+ const stub = stubNpmRegistry(await buildRegistryPackage());++ activeStub = stub;++ const { errors } = await installApplication({+ input: {+ universalIdentifier: APP_UNIVERSAL_IDENTIFIER,+ version: TRAVERSAL_VERSION,+ },+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ expect(stub.requestedUrls).toEqual([]);+ });++ it('percent-encodes the request and refuses a mismatched registry package name', async () => {+ const stub = stubNpmRegistry(+ await buildRegistryPackage({ metadataName: SUBSTITUTE_PACKAGE_NAME }),+ );++ activeStub = stub;++ const { errors } = await installApplication({+ input: {+ universalIdentifier: APP_UNIVERSAL_IDENTIFIER,+ version: VALID_VERSION,+ },+ expectToFail: true,+ });++ expectPackageResolutionFailure(errors);+ // The name check runs on the metadata response, so the tarball is never+ // requested and the version travels percent-encoded in the path.+ expect(stub.requestedUrls).toEqual([expectedMetadataUrl()]);+ });++ it('rejects a package whose package.json name differs from the registration', async () => {+ const stub = stubNpmRegistry(+ await buildRegistryPackage({ packageJsonName: SUBSTITUTE_PACKAGE_NAME }),+ );++ activeStub = stub;++ const { errors } = await installApplication({+ input: {+ universalIdentifier: APP_UNIVERSAL_IDENTIFIER,+ version: VALID_VERSION,+ },+ expectToFail: true,+ });++ expectPackageResolutionFailure(errors);+ });++ it('rejects a manifest whose application identifier differs from the registration', async () => {+ const stub = stubNpmRegistry(+ await buildRegistryPackage({ manifestAppId: FOREIGN_APP_IDENTIFIER }),+ );++ activeStub = stub;++ const { errors } = await installApplication({+ input: {+ universalIdentifier: APP_UNIVERSAL_IDENTIFIER,+ version: VALID_VERSION,+ },+ expectToFail: true,+ });++ expectPackageResolutionFailure(errors);+ });++ it('installs a package whose identity and digest match the registration', async () => {+ const stub = stubNpmRegistry(await buildRegistryPackage());++ activeStub = stub;++ const { data, errors } = await installApplication({+ input: {+ universalIdentifier: APP_UNIVERSAL_IDENTIFIER,+ version: VALID_VERSION,+ },+ expectToFail: false,+ });++ expect(errors).toBeUndefined();+ expect(data.installApplication.id).toBeDefined();+ expect(stub.requestedUrls[0]).toBe(expectedMetadataUrl());+ });+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/build-npm-registry-package.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/build-npm-registry-package.util.tsnew file mode 100644index 00000000000..2ef6fb33faa--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/build-npm-registry-package.util.ts@@ -0,0 +1,49 @@+import { createAppTarball } from 'test/integration/metadata/suites/application/utils/create-app-tarball.util';++type RegistryVersionMetadata = {+ name: string | null;+ dist: { tarball: string };+};++export type StubbedRegistryPackage = {+ tarballUrl: string;+ tarballBuffer: Buffer;+ metadata: RegistryVersionMetadata;+};++// Builds the registry metadata and tarball a stubbed npm registry serves for+// one package version. Overrides let a test forge the mismatches the install+// path must reject: a metadata or package.json name that is not the requested+// package, or a manifest identifier that is not the registration's.+export const buildNpmRegistryPackage = async ({+ registryBaseUrl,+ packageName,+ version,+ manifestJson,+ packageJsonName = packageName,+ metadataName = packageName,+}: {+ registryBaseUrl: string;+ packageName: string;+ version: string;+ manifestJson: string;+ packageJsonName?: string;+ metadataName?: string | null;+}): Promise<StubbedRegistryPackage> => {+ const tarballBuffer = await createAppTarball({+ 'manifest.json': manifestJson,+ 'package.json': JSON.stringify({ name: packageJsonName, version }),+ });++ const unscopedName = packageName.split('/').pop() ?? packageName;+ const tarballUrl = `${registryBaseUrl}/${packageName}/-/${unscopedName}-${version}.tgz`;++ return {+ tarballUrl,+ tarballBuffer,+ metadata: {+ name: metadataName,+ dist: { tarball: tarballUrl },+ },+ };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/stub-npm-registry.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/stub-npm-registry.util.tsnew file mode 100644index 00000000000..0f1314b826e--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/stub-npm-registry.util.ts@@ -0,0 +1,61 @@+import { type AxiosInstance } from 'axios';+import { type StubbedRegistryPackage } from 'test/integration/metadata/suites/application/utils/build-npm-registry-package.util';+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';++import { type SecureHttpClientService } from 'src/engine/core-modules/secure-http-client/secure-http-client.service';+import { type TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';++export type NpmRegistryStub = {+ requestedUrls: string[];+ restore: () => void;+};++// Serves a single package from the running server's registry client, so an+// install never reaches npm. Requests to any other host fall through to the+// real client, leaving unrelated outbound traffic untouched.+export const stubNpmRegistry = (+ registryPackage: StubbedRegistryPackage,+): NpmRegistryStub => {+ const secureHttpClientService =+ getAppProviderByClassName<SecureHttpClientService>(+ 'SecureHttpClientService',+ );+ const registryBaseUrl = getAppProviderByClassName<TwentyConfigService>(+ 'TwentyConfigService',+ )+ .get('APP_REGISTRY_URL')+ .replace(/\/$/, '');++ const requestedUrls: string[] = [];+ const realGetHttpClient = secureHttpClientService.getHttpClient.bind(+ secureHttpClientService,+ );++ const spy = jest+ .spyOn(secureHttpClientService, 'getHttpClient')+ .mockImplementation((config, context) => {+ const client = realGetHttpClient(config, context);+ const realGet = client.get.bind(client);++ client.get = (async (url: string, requestConfig?: unknown) => {+ if (typeof url !== 'string' || !url.startsWith(registryBaseUrl)) {+ return realGet(url, requestConfig);+ }++ requestedUrls.push(url);++ if (url === registryPackage.tarballUrl) {+ return { data: registryPackage.tarballBuffer };+ }++ return { data: registryPackage.metadata };+ }) as AxiosInstance['get'];++ return client;+ });++ return {+ requestedUrls,+ restore: () => spy.mockRestore(),+ };+};