Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.
TypeScript agentic-aiagentsaiai-agentsaiagentsdeveloper-toolsfunction-callinggpt-4javascriptjsllmllmopsmcppythonremote-mcp-serverssetypescript
fix: apply automated code update (#3600)
hex-security-app[bot]17fe8810591c
diff --git a/ts/packages/cli/src/commands/py/commands/py.generate.cmd.ts b/ts/packages/cli/src/commands/py/commands/py.generate.cmd.tsindex f192fd005..7c813937c 100644--- a/ts/packages/cli/src/commands/py/commands/py.generate.cmd.ts+++ b/ts/packages/cli/src/commands/py/commands/py.generate.cmd.ts@@ -155,7 +155,7 @@ export function generatePythonTypeStubs({const index = createToolkitIndex({ toolkits, typeableTools, triggerTypes, versionMap });// Generate Python sources- const sources = generatePythonSources({+ const sources = yield* generatePythonSources({banner: BANNER,outputDir,})(index);diff --git a/ts/packages/cli/src/generation/python/generate.ts b/ts/packages/cli/src/generation/python/generate.tsindex 108c5437f..7fc34ecc8 100644--- a/ts/packages/cli/src/generation/python/generate.ts+++ b/ts/packages/cli/src/generation/python/generate.ts@@ -1,6 +1,7 @@-import path from 'node:path';import type { ToolkitIndex } from 'src/generation/create-toolkit-index';import type { SourceFile } from 'src/generation/types';+import { Effect } from 'effect';+import { safeOutputPath, type SafeOutputPathError } from 'src/generation/safe-output-path';import { generatePythonToolkitSources } from './generate-toolkit-sources';type GeneratePythonSourcesParams = {@@ -9,13 +10,15 @@ type GeneratePythonSourcesParams = {};export function generatePythonSources(params: GeneratePythonSourcesParams) {- return (index: ToolkitIndex): Array<SourceFile> => {+ return (index: ToolkitIndex): Effect.Effect<Array<SourceFile>, SafeOutputPathError> => {const toolkiteSources = generatePythonToolkitSources(params.banner)(index);- return [- ...toolkiteSources.map(- ([filename, content]) => [path.join(params.outputDir, filename), content] as const- ),- ] as const;+ return Effect.all(+ toolkiteSources.map(([filename, content]) =>+ safeOutputPath(params.outputDir, filename).pipe(+ Effect.map(filePath => [filePath, content] as const)+ )+ )+ );};}diff --git a/ts/packages/cli/src/generation/safe-output-path.ts b/ts/packages/cli/src/generation/safe-output-path.tsnew file mode 100644index 000000000..c96a8a9d2--- /dev/null+++ b/ts/packages/cli/src/generation/safe-output-path.ts@@ -0,0 +1,45 @@+import path from 'node:path';+import { Data, Effect } from 'effect';++export class SafeOutputPathError extends Data.TaggedError('generation/SafeOutputPathError')<{+ readonly filename: string;+ readonly outputDir: string;+ readonly resolvedPath: string;+ readonly message: string;+}> {}++/**+ * Joins a generated filename to the output directory, ensuring the result stays+ * within `outputDir`.+ *+ * Defense in depth against path traversal / arbitrary file write (CWE-22): even+ * though toolkit slugs are validated at decode time, this guarantees that any+ * filename derived from API-controlled data cannot escape the intended output+ * directory via `..` segments or absolute paths.+ *+ * Fails if the resolved path is not contained within `outputDir`.+ */+export function safeOutputPath(+ outputDir: string,+ filename: string+): Effect.Effect<string, SafeOutputPathError> {+ const resolvedDir = path.resolve(outputDir);+ const resolved = path.resolve(resolvedDir, filename);+ const relative = path.relative(resolvedDir, resolved);+ const isWithinOutputDir =+ relative === '' ||+ (!relative.startsWith(`..${path.sep}`) && relative !== '..' && !path.isAbsolute(relative));++ if (path.isAbsolute(filename) || !isWithinOutputDir) {+ return Effect.fail(+ new SafeOutputPathError({+ filename,+ outputDir,+ resolvedPath: resolved,+ message: `Refusing unsafe generated filename: ${filename} resolves to ${resolved}`,+ })+ );+ }++ return Effect.succeed(path.join(outputDir, filename));+}diff --git a/ts/packages/cli/src/generation/typescript/generate.ts b/ts/packages/cli/src/generation/typescript/generate.tsindex 9562d5fb2..c3d19f794 100644--- a/ts/packages/cli/src/generation/typescript/generate.ts+++ b/ts/packages/cli/src/generation/typescript/generate.ts@@ -1,12 +1,14 @@import * as ts from '@composio/ts-builders';import path from 'node:path';+import { safeOutputPath, type SafeOutputPathError } from 'src/generation/safe-output-path';import type { ToolkitIndex } from 'src/generation/create-toolkit-index';+import type { SourceFile } from 'src/generation/types';import { generateTypeScriptToolkitSources } from './generate-toolkit-sources';import { generateIndexSource } from './generate-index-source';import { Effect } from 'effect';import type { GenerateTypeFromJsonSchemaError } from './generate-type-from-json-schema';-type SourceFile = readonly [filename: string, content: string];+type GenerateTypeScriptSourcesError = GenerateTypeFromJsonSchemaError | SafeOutputPathError;type GenerateTypeScriptSourcesParams = {banner: string;@@ -18,7 +20,7 @@ type GenerateTypeScriptSourcesParams = {export function generateTypeScriptSources(params: GenerateTypeScriptSourcesParams) {return (index: ToolkitIndex- ): Effect.Effect<Array<SourceFile>, GenerateTypeFromJsonSchemaError, never> =>+ ): Effect.Effect<Array<SourceFile>, GenerateTypeScriptSourcesError, never> =>Effect.gen(function* () {const toolkitSources = yield* generateTypeScriptToolkitSources(params.banner)(index);@@ -26,12 +28,15 @@ export function generateTypeScriptSources(params: GenerateTypeScriptSourcesParamconst indexFilename = path.join(params.outputDir, 'index.ts');if (!params.emitSingleFile) {- return [- ...toolkitSources.map(- ([filename, content]) => [path.join(params.outputDir, filename), content] as const- ),- [indexFilename, indexSource] as const,- ] as const;+ const safeToolkitSources = yield* Effect.all(+ toolkitSources.map(([filename, content]) =>+ safeOutputPath(params.outputDir, filename).pipe(+ Effect.map(filePath => [filePath, content] as const)+ )+ )+ );++ return [...safeToolkitSources, [indexFilename, indexSource] as const] as const;}const localToolkitsSources = toolkitSources.map(([_, content]) => content).join('\n');diff --git a/ts/packages/cli/src/models/toolkits.ts b/ts/packages/cli/src/models/toolkits.tsindex 799ceee4d..c72bc6ade 100644--- a/ts/packages/cli/src/models/toolkits.ts+++ b/ts/packages/cli/src/models/toolkits.ts@@ -1,9 +1,25 @@import { Brand, Schema } from 'effect';import { JSONTransformSchema } from './utils/json-transform-schema';+/**+ * A toolkit slug used to derive generated source filenames.+ *+ * Restricted to a single, safe path segment (no `/`, `\`, or `..`) to prevent+ * path traversal / arbitrary file write when the slug is interpolated into a+ * filename and joined to the generator's output directory. See CWE-22.+ */+export const ToolkitSlug = Schema.Trim.pipe(+ Schema.nonEmptyString(),+ Schema.pattern(/^[a-z0-9_][a-z0-9_-]*$/, {+ identifier: 'ToolkitSlug',+ message: () =>+ 'Toolkit slug must contain only lowercase letters, digits, underscores, and hyphens (no path separators)',+ })+);+export const Toolkit = Schema.Struct({name: Schema.String, // "Gmail"- slug: Schema.Trim.pipe(Schema.nonEmptyString()), // "gmail"+ slug: ToolkitSlug, // "gmail"auth_schemes: Schema.Array(Schema.String), // [ "OAUTH2", "BEARER_TOKEN" ]composio_managed_auth_schemes: Schema.Array(Schema.String), // [ "OAUTH2" ]is_local_toolkit: Schema.Boolean,@@ -67,7 +83,7 @@ export type AuthConfigDetail = Schema.Schema.Type<typeof AuthConfigDetail>;*/export const ToolkitDetailed = Schema.Struct({name: Schema.String,- slug: Schema.Trim.pipe(Schema.nonEmptyString()),+ slug: ToolkitSlug,is_local_toolkit: Schema.Boolean,composio_managed_auth_schemes: Schema.optionalWith(Schema.Array(Schema.String), {default: () => [],diff --git a/ts/packages/cli/src/services/composio-clients.ts b/ts/packages/cli/src/services/composio-clients.tsindex d0de6c845..6e0fdd723 100644--- a/ts/packages/cli/src/services/composio-clients.ts+++ b/ts/packages/cli/src/services/composio-clients.ts@@ -15,7 +15,13 @@ import {import { Composio as _RawComposioClient, APIPromise } from '@composio/client';import type { AuthConfigCreateParams } from '@composio/client/resources/auth-configs';import type { ConnectedAccountListParams } from '@composio/client/resources/connected-accounts';-import { Toolkit, Toolkits, ToolkitDetailed, type ToolkitSearchResult } from 'src/models/toolkits';+import {+ Toolkit,+ Toolkits,+ ToolkitDetailed,+ ToolkitSlug,+ type ToolkitSearchResult,+} from 'src/models/toolkits';import { AuthConfigItem, AuthConfigItems } from 'src/models/auth-configs';import { ConnectedAccountItem, ConnectedAccountItems } from 'src/models/connected-accounts';import { TriggerInstanceItems } from 'src/models/triggers';@@ -251,7 +257,7 @@ export type ToolkitsResponse = Schema.Schema.Type<typeof ToolkitsResponse>;// Similar to Toolkits, without auth_schemes, with auth_config_details insteadexport const ToolkitRetrieveResponse = Schema.Struct({name: Schema.String,- slug: Schema.Trim.pipe(Schema.nonEmptyString()),+ slug: ToolkitSlug,is_local_toolkit: Schema.Boolean,composio_managed_auth_schemes: Schema.optionalWith(Schema.Array(Schema.String), {default: () => [],diff --git a/ts/packages/cli/test/src/generation/safe-output-path.test.ts b/ts/packages/cli/test/src/generation/safe-output-path.test.tsnew file mode 100644index 000000000..c8ac6671a--- /dev/null+++ b/ts/packages/cli/test/src/generation/safe-output-path.test.ts@@ -0,0 +1,41 @@+import path from 'node:path';+import { describe, expect, it, assert } from '@effect/vitest';+import { Effect, Either } from 'effect';+import { safeOutputPath, SafeOutputPathError } from 'src/generation/safe-output-path';++describe('safeOutputPath', () => {+ it.effect(+ '[Given] a relative output directory and normal filename [Then] it returns a path in the same coordinate space',+ Effect.fn(function* () {+ const outputDir = 'generated';+ const filePath = yield* safeOutputPath(outputDir, 'gmail.ts');++ expect(filePath).toBe(path.join(outputDir, 'gmail.ts'));+ expect(path.isAbsolute(filePath)).toBe(false);+ })+ );++ it.effect(+ '[Given] an absolute generated filename [Then] it fails through the Effect error channel',+ Effect.fn(function* () {+ const result = yield* safeOutputPath('generated', path.resolve('gmail.ts')).pipe(+ Effect.either+ );++ assert(Either.isLeft(result));+ expect(result.left).toBeInstanceOf(SafeOutputPathError);+ expect(result.left.filename).toBe(path.resolve('gmail.ts'));+ })+ );++ it.effect(+ '[Given] a parent-directory generated filename [Then] it fails through the Effect error channel',+ Effect.fn(function* () {+ const result = yield* safeOutputPath('generated', '../gmail.ts').pipe(Effect.either);++ assert(Either.isLeft(result));+ expect(result.left).toBeInstanceOf(SafeOutputPathError);+ expect(result.left.filename).toBe('../gmail.ts');+ })+ );+});diff --git a/ts/packages/cli/test/src/models/toolkits.test.ts b/ts/packages/cli/test/src/models/toolkits.test.tsnew file mode 100644index 000000000..cc8096653--- /dev/null+++ b/ts/packages/cli/test/src/models/toolkits.test.ts@@ -0,0 +1,17 @@+import { describe, expect, it } from '@effect/vitest';+import { Effect } from 'effect';+import toolkitsJson from 'test/__mocks__/toolkits.json' with { type: 'json' };+import { toolkitsFromJSON } from 'src/models/toolkits';++describe('ToolkitSlug', () => {+ it.effect(+ '[Given] cached toolkit data with underscore-prefixed slugs [Then] it decodes successfully',+ Effect.fn(function* () {+ const toolkits = yield* toolkitsFromJSON(JSON.stringify(toolkitsJson));++ expect(toolkits.map(toolkit => toolkit.slug)).toEqual(+ expect.arrayContaining(['_21risk', '_2chat'])+ );+ })+ );+});