mirror of
https://github.com/affaan-m/ECC.git
synced 2026-11-17 05:22:17 +00:00
fix(scripts): reject inherited package manager names
This commit is contained in:
1 parent
b38be6a7f6
commit
4385863e56
4 files changed
+96
-10
No files matched your search
@@ -56,6 +56,12 @@ const PACKAGE_MANAGERS = {
|
||||
}
|
||||
};
|
||||
|
||||
// Only explicitly supported primitive names are valid; inherited object keys
|
||||
// (for example "constructor") are not package manager configurations.
|
||||
function isSupportedPackageManager(name) {
|
||||
return typeof name === 'string' && Object.prototype.hasOwnProperty.call(PACKAGE_MANAGERS, name);
|
||||
}
|
||||
|
||||
// Priority order for detection
|
||||
const DETECTION_PRIORITY = ['pnpm', 'bun', 'yarn', 'npm'];
|
||||
|
||||
@@ -117,7 +123,7 @@ function detectFromPackageJson(projectDir = process.cwd()) {
|
||||
if (pkg.packageManager) {
|
||||
// Format: "pnpm@8.6.0" or just "pnpm"
|
||||
const pmName = pkg.packageManager.split('@')[0];
|
||||
if (PACKAGE_MANAGERS[pmName]) {
|
||||
if (isSupportedPackageManager(pmName)) {
|
||||
return pmName;
|
||||
}
|
||||
}
|
||||
@@ -168,7 +174,7 @@ function getPackageManager(options = {}) {
|
||||
|
||||
// 1. Check environment variable
|
||||
const envPm = process.env.CLAUDE_PACKAGE_MANAGER;
|
||||
if (envPm && PACKAGE_MANAGERS[envPm]) {
|
||||
if (isSupportedPackageManager(envPm)) {
|
||||
return {
|
||||
name: envPm,
|
||||
config: PACKAGE_MANAGERS[envPm],
|
||||
@@ -182,7 +188,7 @@ function getPackageManager(options = {}) {
|
||||
if (projectConfig) {
|
||||
try {
|
||||
const config = JSON.parse(projectConfig);
|
||||
if (config.packageManager && PACKAGE_MANAGERS[config.packageManager]) {
|
||||
if (isSupportedPackageManager(config.packageManager)) {
|
||||
return {
|
||||
name: config.packageManager,
|
||||
config: PACKAGE_MANAGERS[config.packageManager],
|
||||
@@ -216,7 +222,7 @@ function getPackageManager(options = {}) {
|
||||
|
||||
// 5. Check global user preference
|
||||
const globalConfig = loadConfig();
|
||||
if (globalConfig && globalConfig.packageManager && PACKAGE_MANAGERS[globalConfig.packageManager]) {
|
||||
if (globalConfig && isSupportedPackageManager(globalConfig.packageManager)) {
|
||||
return {
|
||||
name: globalConfig.packageManager,
|
||||
config: PACKAGE_MANAGERS[globalConfig.packageManager],
|
||||
@@ -242,7 +248,7 @@ function getPackageManager(options = {}) {
|
||||
* Set user's preferred package manager (global)
|
||||
*/
|
||||
function setPreferredPackageManager(pmName) {
|
||||
if (!PACKAGE_MANAGERS[pmName]) {
|
||||
if (!isSupportedPackageManager(pmName)) {
|
||||
throw new Error(`Unknown package manager: ${pmName}`);
|
||||
}
|
||||
|
||||
@@ -263,7 +269,7 @@ function setPreferredPackageManager(pmName) {
|
||||
* Set project's preferred package manager
|
||||
*/
|
||||
function setProjectPackageManager(pmName, projectDir = process.cwd()) {
|
||||
if (!PACKAGE_MANAGERS[pmName]) {
|
||||
if (!isSupportedPackageManager(pmName)) {
|
||||
throw new Error(`Unknown package manager: ${pmName}`);
|
||||
}
|
||||
|
||||
@@ -420,6 +426,7 @@ function getCommandPattern(action) {
|
||||
|
||||
module.exports = {
|
||||
PACKAGE_MANAGERS,
|
||||
isSupportedPackageManager,
|
||||
DETECTION_PRIORITY,
|
||||
getPackageManager,
|
||||
setPreferredPackageManager,
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
|
||||
const {
|
||||
PACKAGE_MANAGERS,
|
||||
isSupportedPackageManager,
|
||||
getPackageManager,
|
||||
setPreferredPackageManager,
|
||||
setProjectPackageManager,
|
||||
@@ -113,7 +114,7 @@ function listAvailable() {
|
||||
}
|
||||
|
||||
function setGlobal(pmName) {
|
||||
if (!PACKAGE_MANAGERS[pmName]) {
|
||||
if (!isSupportedPackageManager(pmName)) {
|
||||
console.error(`Error: Unknown package manager "${pmName}"`);
|
||||
console.error(`Available: ${Object.keys(PACKAGE_MANAGERS).join(', ')}`);
|
||||
process.exit(1);
|
||||
@@ -136,7 +137,7 @@ function setGlobal(pmName) {
|
||||
}
|
||||
|
||||
function setProject(pmName) {
|
||||
if (!PACKAGE_MANAGERS[pmName]) {
|
||||
if (!isSupportedPackageManager(pmName)) {
|
||||
console.error(`Error: Unknown package manager "${pmName}"`);
|
||||
console.error(`Available: ${Object.keys(PACKAGE_MANAGERS).join(', ')}`);
|
||||
process.exit(1);
|
||||
@@ -195,7 +196,7 @@ if (projectIdx !== -1) {
|
||||
|
||||
// If just a package manager name is provided, set it globally
|
||||
const pmName = args[0];
|
||||
if (PACKAGE_MANAGERS[pmName]) {
|
||||
if (isSupportedPackageManager(pmName)) {
|
||||
setGlobal(pmName);
|
||||
} else {
|
||||
console.error(`Error: Unknown option or package manager "${pmName}"`);
|
||||
|
||||
@@ -1759,6 +1759,63 @@ function runTests() {
|
||||
})) passed++;
|
||||
else failed++;
|
||||
|
||||
console.log('\nPackage manager name validation:');
|
||||
|
||||
for (const name of ['constructor', 'toString', '__proto__', ['npm'], null, 42]) {
|
||||
if (test(`rejects unsupported manager value ${JSON.stringify(name)} in setters`, () => {
|
||||
withIsolatedHome(home => {
|
||||
const project = path.join(home, 'project');
|
||||
fs.mkdirSync(project);
|
||||
assert.throws(() => pm.setPreferredPackageManager(name), /Unknown package manager/);
|
||||
assert.throws(() => pm.setProjectPackageManager(name, project), /Unknown package manager/);
|
||||
assert.ok(!fs.existsSync(path.join(home, '.claude', 'package-manager.json')));
|
||||
assert.ok(!fs.existsSync(path.join(project, '.claude')));
|
||||
});
|
||||
})) passed++;
|
||||
else failed++;
|
||||
}
|
||||
|
||||
for (const source of ['environment', 'project-config', 'package.json', 'global-config']) {
|
||||
if (test(`ignores inherited manager names from ${source}`, () => {
|
||||
withIsolatedHome(home => {
|
||||
const project = path.join(home, 'project');
|
||||
fs.mkdirSync(project);
|
||||
const originalEnv = process.env.CLAUDE_PACKAGE_MANAGER;
|
||||
try {
|
||||
delete process.env.CLAUDE_PACKAGE_MANAGER;
|
||||
for (const name of source === 'environment'
|
||||
? ['constructor', 'toString', '__proto__']
|
||||
: ['constructor', 'toString', '__proto__', ['npm']]) {
|
||||
if (source === 'environment') {
|
||||
process.env.CLAUDE_PACKAGE_MANAGER = name;
|
||||
} else {
|
||||
const configPath = source === 'package.json'
|
||||
? path.join(project, 'package.json')
|
||||
: path.join(source === 'project-config' ? project : home, '.claude', 'package-manager.json');
|
||||
fs.mkdirSync(path.dirname(configPath), { recursive: true });
|
||||
fs.writeFileSync(configPath, JSON.stringify({ packageManager: name }));
|
||||
}
|
||||
const result = pm.getPackageManager({ projectDir: project });
|
||||
assert.strictEqual(result.name, 'npm');
|
||||
assert.strictEqual(result.source, 'default');
|
||||
assert.strictEqual(pm.getRunCommand('lint', { projectDir: project }), 'npm run lint');
|
||||
if (source === 'package.json') assert.strictEqual(pm.detectFromPackageJson(project), null);
|
||||
if (source !== 'global-config') {
|
||||
const lockPath = path.join(project, 'pnpm-lock.yaml');
|
||||
fs.writeFileSync(lockPath, '');
|
||||
assert.strictEqual(pm.getPackageManager({ projectDir: project }).name, 'pnpm');
|
||||
fs.unlinkSync(lockPath);
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
if (originalEnv === undefined) delete process.env.CLAUDE_PACKAGE_MANAGER;
|
||||
else process.env.CLAUDE_PACKAGE_MANAGER = originalEnv;
|
||||
}
|
||||
});
|
||||
})) passed++;
|
||||
else failed++;
|
||||
}
|
||||
|
||||
// Summary
|
||||
console.log('\n=== Test Results ===');
|
||||
console.log(`Passed: ${passed}`);
|
||||
|
||||
@@ -15,10 +15,11 @@ const { execFileSync } = require('child_process');
|
||||
const SCRIPT = path.join(__dirname, '..', '..', 'scripts', 'setup-package-manager.js');
|
||||
|
||||
// Run the script with given args, return { stdout, stderr, code }
|
||||
function run(args = [], env = {}) {
|
||||
function run(args = [], env = {}, cwd = process.cwd()) {
|
||||
try {
|
||||
const stdout = execFileSync('node', [SCRIPT, ...args], {
|
||||
encoding: 'utf8',
|
||||
cwd,
|
||||
stdio: ['pipe', 'pipe', 'pipe'],
|
||||
env: { ...process.env, ...env },
|
||||
timeout: 10000
|
||||
@@ -52,6 +53,26 @@ function runTests() {
|
||||
let passed = 0;
|
||||
let failed = 0;
|
||||
|
||||
for (const name of ['constructor', 'toString', '__proto__']) {
|
||||
for (const args of [[name], ['--global', name], ['--project', name]]) {
|
||||
if (test(`rejects inherited package manager: ${args.join(' ')}`, () => {
|
||||
const home = fs.mkdtempSync(path.join(os.tmpdir(), 'pm-cli-invalid-'));
|
||||
try {
|
||||
const result = run(args, {
|
||||
HOME: home,
|
||||
USERPROFILE: home,
|
||||
ECC_AGENT_DATA_HOME: path.join(home, '.claude')
|
||||
}, home);
|
||||
assert.strictEqual(result.code, 1);
|
||||
assert.ok(result.stderr.includes('Unknown'));
|
||||
assert.ok(!fs.existsSync(path.join(home, '.claude', 'package-manager.json')));
|
||||
} finally {
|
||||
fs.rmSync(home, { recursive: true, force: true });
|
||||
}
|
||||
})) passed++; else failed++;
|
||||
}
|
||||
}
|
||||
|
||||
// --help flag
|
||||
console.log('--help:');
|
||||
|
||||
|
||||
Reference in new issue
Block a user