Skip to content

fix: protect implicitly loaded config from output overwrite #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rowkav09 merged 1 commit into from
Oct 5, 2026
Merged

fix: protect implicitly loaded config from output overwrite #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { buildManifest, DEFAULT_31_DIALECT } from './manifest.js';
import { createMcpTransformer } from './transformer.js';
import { watchSpec } from './watch.js';
import type { ManifestOptions } from './manifest.js';
import { readProjectConfig, resolveConfig, type ProjectConfig } from './config.js';
import { CONFIG_FILE, readProjectConfig, resolveConfig, type ProjectConfig } from './config.js';
import { assertOutputDoesNotContainInputs } from './output-safety.js';

const VERSION = '0.1.0';
Expand Down Expand Up @@ -181,7 +181,8 @@ async function main(): Promise<void> {
}
const spec = positionals[0];
if (!spec) fail(`missing <spec> argument\n\n${HELP}`);
const { options, config } = resolveConfig(await readProjectConfig(values.config), { name: values.name, baseUrl: values['base-url'], envPrefix: values['env-prefix'], overlays: values.overlay, include: values.include, exclude: values.exclude });
const configPath = values.config ?? await access(CONFIG_FILE).then(() => CONFIG_FILE, () => undefined);
const { options, config } = resolveConfig(await readProjectConfig(configPath), { name: values.name, baseUrl: values['base-url'], envPrefix: values['env-prefix'], overlays: values.overlay, include: values.include, exclude: values.exclude });
const flags = { out: values.out, name: options.serverName, baseUrl: options.baseUrl, envPrefix: options.envPrefix, transport: values.transport, port: values.port, include: options.include, exclude: options.exclude };
if (flags.transport && !['stdio', 'http'].includes(flags.transport)) fail('--transport must be stdio or http');
if (command !== 'serve' && (flags.transport || flags.port)) fail('--transport and --port are only valid with serve');
Expand All @@ -194,17 +195,17 @@ async function main(): Promise<void> {
}
if (values.watch && command === 'serve') fail('--watch is only supported by generate');
if (values.watch) {
if (flags.out) await assertOutputDoesNotContainInputs(flags.out, [{ label: 'spec', path: spec }, ...((config.overlays ?? []).map((path) => ({ label: 'overlay', path }))), { label: 'config', path: values.config }]);
if (flags.out) await assertOutputDoesNotContainInputs(flags.out, [{ label: 'spec', path: spec }, ...((config.overlays ?? []).map((path) => ({ label: 'overlay', path }))), { label: 'config', path: configPath }]);
const seconds = values['poll-interval'] === undefined ? 30 : Number(values['poll-interval']);
// Node clamps timer delays above 2^31-1 ms to 1 ms, which would poll the URL continuously (#298).
if (!Number.isFinite(seconds) || seconds < MIN_POLL_SECONDS || seconds > MAX_POLL_SECONDS) fail(`--poll-interval must be between ${MIN_POLL_SECONDS} and ${MAX_POLL_SECONDS} seconds`);
const handle = await watchSpec(spec, () => cmdGenerate(spec, flags, config, values.config), { pollIntervalMs: seconds * 1000, additionalInputs: config.overlays ?? [], discoverInputs: () => localRefDependencies(spec) });
const handle = await watchSpec(spec, () => cmdGenerate(spec, flags, config, configPath), { pollIntervalMs: seconds * 1000, additionalInputs: config.overlays ?? [], discoverInputs: () => localRefDependencies(spec) });
process.once('SIGINT', () => { handle.close(); process.exit(0); });
process.once('SIGTERM', () => { handle.close(); process.exit(0); });
} else if (command === 'serve') {
await cmdServe(spec, flags, config);
} else {
await cmdGenerate(spec, flags, config, values.config);
await cmdGenerate(spec, flags, config, configPath);
}
}

Expand Down
12 changes: 12 additions & 0 deletions test/generate.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,3 +283,15 @@ test('overlay reference protection uses the spec folder when the overlay lives e
assert.equal(await readFile(dependency, 'utf8'), '{}');
} finally { await rm(dir, { recursive: true, force: true }); }
});

test('generation protects the implicitly loaded default config from overwrite', async () => {
const dir = await mkdtemp(join(tmpdir(), 'spec2mcp-default-config-'));
try {
const config = join(dir, 'spec2mcp.config.json');
const original = JSON.stringify({ name: 'keep-my-settings', include: ['list*'] });
await writeFile(config, original);
await assert.rejects(run(process.execPath, [TSX, CLI, 'generate', PETSTORE, '--out', dir], { cwd: dir }),
(error: unknown) => /output directory contains config input/i.test((error as { stderr: string }).stderr));
assert.equal(await readFile(config, 'utf8'), original);
} finally { await rm(dir, { recursive: true, force: true }); }
});
Loading