WEBDIENSTE/ECC
1
0
Fork 0
mirror of https://github.com/affaan-m/ECC.git synced 2026-09-29 04:55:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge relative-root consent correction from PR #3008

Browse Source 
Source-PR: https://github.com/affaan-m/ECC/pull/3008
Source-Head: d0dc1fcb08
This commit is contained in:
affaan-m
2026-09-27 23:41:30 -04:00
parent 426bb26620 d0dc1fcb08
commit 17c1752262
3 changed files with 126 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/lib/install-lifecycle.js
+2 -2
View File
@@ -1735,7 +1735,7 @@ function analyzeRecord(record, context) {
}
function buildDoctorReport(options = {}) {
const repoRoot = options.repoRoot || DEFAULT_REPO_ROOT;
const repoRoot = options.repoRoot ? path.resolve(options.repoRoot) : DEFAULT_REPO_ROOT;
const manifests = loadInstallManifests({ repoRoot });
const records = discoverInstalledStates({
homeDir: options.homeDir,
@@ -1973,7 +1973,7 @@ function preflightOpenCodeHookDeactivation(record, context, options = {}) {
}
function repairInstalledStates(options = {}) {
const repoRoot = options.repoRoot || DEFAULT_REPO_ROOT;
const repoRoot = options.repoRoot ? path.resolve(options.repoRoot) : DEFAULT_REPO_ROOT;
const manifests = loadInstallManifests({ repoRoot });
const context = {
repoRoot,
scripts/lib/install/apply.js
+2 -1
View File
@@ -398,8 +398,9 @@ const LEGACY_OPENCODE_PLUGIN_DIGESTS = Object.freeze([
]);
function knownOpenCodePluginDigests(plan) {
if (typeof plan.sourceRoot !== 'string' || !path.isAbsolute(plan.sourceRoot)) return new Set();
// Historical refusal fingerprints do not depend on a current source checkout.
const digests = new Set(LEGACY_OPENCODE_PLUGIN_DIGESTS);
if (typeof plan.sourceRoot !== 'string' || !path.isAbsolute(plan.sourceRoot)) return digests;
const sourcePlan = { ...plan, targetRoot: plan.sourceRoot };
for (const directory of ['.opencode/plugins', '.opencode/dist/plugins']) {
for (const name of ['ecc-hooks', 'index']) {
tests/lib/opencode-hook-consent-safety.test.js
+122
View File
@@ -366,6 +366,128 @@ function runTests() {
});
}));
}
for (const rootForm of ['relative', 'missing']) {
for (const consent of [null, 'declined']) {
test(`${rootForm} source root keeps historical refusal for fresh ${consent || 'default'} apply`, () => fixture(value => {
const legacy = legacyPluginFixtures[0];
assert.strictEqual(sha256(legacy.content), legacy.sha256);
fs.unlinkSync(value.installStatePath);
for (const operation of value.basePlan.operations) fs.unlinkSync(operation.destinationPath);
const alias = path.join(value.targetRoot, 'plugins', 'index.js');
fs.writeFileSync(alias, legacy.content);
const sourceRoot = rootForm === 'relative'
? path.relative(process.cwd(), value.sourceRoot) : undefined;
if (sourceRoot) assert.strictEqual(path.isAbsolute(sourceRoot), false);
const plan = withHookConsent({ ...value.basePlan, sourceRoot }, consent);
assert.throws(() => applyInstallPlan(plan), /Refusing OpenCode hook deactivation/);
assert.strictEqual(fs.readFileSync(alias, 'utf8'), legacy.content);
assert.strictEqual(fs.existsSync(value.installStatePath), false);
for (const operation of value.basePlan.operations) assert.strictEqual(fs.existsSync(operation.destinationPath), false);
assert.strictEqual(fs.existsSync(`${value.installStatePath}.ecc.lock`), false);
}));
}
}
for (const mode of ['doctor', 'repair']) {
for (const historical of [true, false]) {
test(`${mode} with relative repoRoot ${historical ? 'refuses historical ECC' : 'preserves unrelated user'} aliases`, () => fixture(value => {
applyInstallPlan(value.declinePlan);
const alias = path.join(value.targetRoot, 'plugins', 'index.js');
const content = historical ? legacyPluginFixtures[0].content
: 'export default async () => ({ "user.plugin": () => {} });\n';
fs.writeFileSync(alias, content);
const before = fs.readFileSync(value.installStatePath);
const operationsBefore = value.basePlan.operations.map(operation => fs.readFileSync(operation.destinationPath));
const repoRoot = path.relative(process.cwd(), value.sourceRoot);
assert.strictEqual(path.isAbsolute(repoRoot), false);
if (mode === 'doctor') {
const result = buildDoctorReport({ repoRoot, homeDir: value.homeDir,
projectRoot: value.homeDir, targets: ['opencode'] }).results[0];
const issue = result.issues.find(entry => entry.code === 'opencode-hook-consent-violation');
assert.strictEqual(Boolean(issue), historical, JSON.stringify(result.issues));
if (historical) assert.match(issue.message, /OpenCode hook activation remains active/);
} else {
const result = repair(value, { repoRoot }).results[0];
if (historical) {
assert.strictEqual(result.status, 'error');
assert.match(result.error, /Refusing OpenCode hook deactivation/);
assert.notStrictEqual(result.stateRefreshed, true);
} else assert.strictEqual(result.status, 'ok', result.error);
}
assert.strictEqual(fs.readFileSync(alias, 'utf8'), content);
if (historical) assert.deepStrictEqual(fs.readFileSync(value.installStatePath), before);
else {
const { lastValidatedAt: _beforeValidation, ...priorState } = JSON.parse(before);
const { lastValidatedAt: _afterValidation, ...afterState } = readInstallState(value.installStatePath);
assert.deepStrictEqual(afterState, priorState, 'Only the validation timestamp may change');
}
assert.ok(!readInstallState(value.installStatePath).operations.some(operation => operation.destinationPath === alias));
assert.deepStrictEqual(value.basePlan.operations.map(operation => fs.readFileSync(operation.destinationPath)), operationsBefore);
assert.strictEqual(fs.existsSync(`${value.installStatePath}.ecc.lock`), false);
}));
}
}
for (const mode of ['apply', 'repair']) {
test(`${mode} with relative root refuses a historical alias inserted after preflight`, () => fixture(value => {
const alias = path.join(value.targetRoot, 'plugins', 'index.js');
const content = legacyPluginFixtures[0].content;
const repoRoot = path.relative(process.cwd(), value.sourceRoot);
withWritableOpenMutation(path.join(value.targetRoot, 'plugins', 'ecc-hooks.ts'),
() => fs.writeFileSync(alias, content), () => {
if (mode === 'apply') {
assert.throws(() => applyInstallPlan({ ...value.declinePlan, sourceRoot: repoRoot }),
/OpenCode hook activation remains active/);
} else {
const result = repair(value, { repoRoot }).results[0];
assert.strictEqual(result.status, 'error');
assert.match(result.error, /OpenCode hook activation remains active/);
assert.notStrictEqual(result.stateRefreshed, true);
}
assert.strictEqual(fs.readFileSync(alias, 'utf8'), content);
const state = readInstallState(value.installStatePath);
assert.ok(!state.operations.some(operation => operation.destinationPath === alias));
assert.strictEqual(state.request.hookConsent, value.state.request.hookConsent);
assert.strictEqual(fs.existsSync(`${value.installStatePath}.ecc.lock`), false);
});
}));
}
for (const artifact of ['source', 'build']) {
test(`relative repoRoot attributes only trusted current ${artifact} bytes in doctor and repair`, () => fixture(value => {
applyInstallPlan(value.declinePlan);
const source = artifact === 'source'
? path.join(value.sourceRoot, '.opencode', 'plugins', 'ecc-hooks.ts')
: path.join(value.sourceRoot, '.opencode', 'dist', 'plugins', 'index.js');
if (artifact === 'build') fs.writeFileSync(source, 'module.exports = { eccHook: true };\n');
const content = fs.readFileSync(source);
const alias = path.join(value.targetRoot, 'plugins', 'index.js');
fs.writeFileSync(alias, content);
const before = fs.readFileSync(value.installStatePath);
const operationsBefore = value.basePlan.operations.map(operation => fs.readFileSync(operation.destinationPath));
const repoRoot = path.relative(process.cwd(), value.sourceRoot);
assert.strictEqual(path.isAbsolute(repoRoot), false);
const doctor = buildDoctorReport({ repoRoot, homeDir: value.homeDir,
projectRoot: value.homeDir, targets: ['opencode'] }).results[0];
assert.ok(doctor.issues.some(issue => issue.code === 'opencode-hook-consent-violation'), JSON.stringify(doctor.issues));
const result = repair(value, { repoRoot }).results[0];
assert.strictEqual(result.status, 'error');
assert.match(result.error, /Refusing OpenCode hook deactivation/);
assert.notStrictEqual(result.stateRefreshed, true);
assert.deepStrictEqual(fs.readFileSync(alias), content);
assert.deepStrictEqual(fs.readFileSync(value.installStatePath), before);
assert.deepStrictEqual(value.basePlan.operations.map(operation => fs.readFileSync(operation.destinationPath)), operationsBefore);
assert.strictEqual(fs.existsSync(`${value.installStatePath}.ecc.lock`), false);
}));
}
for (const mode of ['doctor', 'repair']) {
test(`${mode} still rejects unsupported explicit repoRoot types`, () => fixture(value => {
for (const repoRoot of [{}, true, 1]) {
const invoke = mode === 'doctor'
? () => buildDoctorReport({ repoRoot, homeDir: value.homeDir,
projectRoot: value.homeDir, targets: ['opencode'] })
: () => repair(value, { repoRoot });
assert.throws(invoke, error => error instanceof TypeError && error.code === 'ERR_INVALID_ARG_TYPE');
}
}));
}
for (const artifact of ['source', 'build']) {
test(`unrecorded ${artifact}-identical ECC alias still fails closed`, () => fixture(value => {
applyInstallPlan(value.declinePlan);