fix(credentials): save resident keys without replacing live credentials
This commit is contained in:
@@ -43,11 +43,23 @@ export async function publicSnapshot(url, dataRoot) {
|
||||
storage: bootstrap.storage, eventCursor: bootstrap.eventCursor, database, exports, persistent: snapshotPersistentData(dataRoot),
|
||||
scope: 'Read-only public state, every original session export digest, original table/row/schema hashes and every original artifact byte hash. No credential extraction, model probe, execution or mutation.' };
|
||||
}
|
||||
export function compareOriginalState(before, after, { modelCenterSchemaChange = false } = {}) {
|
||||
export function compareOriginalState(before, after, { modelCenterSchemaChange = false, credentialDefaultsSchemaChange = false } = {}) {
|
||||
for (const field of ['pid', 'hasKey', 'configSha256', 'projectsSha256', 'sessionsSha256', 'eventCursor']) assert.deepEqual(after[field], before[field], field);
|
||||
assert.deepEqual(canonical(after.database.tables), canonical(before.database.tables), 'All original table schemas and every persistent row');
|
||||
assert.deepEqual(after.database.sessionIds, before.database.sessionIds); assert.deepEqual(after.exports, before.exports);
|
||||
assert.deepEqual(after.persistent, before.persistent, 'Every original artifact byte, persistent row and public disk config');
|
||||
if (credentialDefaultsSchemaChange) {
|
||||
assert.equal(before.version, '1.25.13'); assert.equal(after.version, '1.25.14');
|
||||
const expected = structuredClone(before.modelCenter);
|
||||
expected.storage = { ...expected.storage, credentialPersistenceSupported: true, defaultPersistKey: true,
|
||||
restart: '新填凭据默认本机加密保存并在重启后恢复;只有明确选择仅本次使用的凭据需要重新填写。' };
|
||||
for (const connection of expected.connections) {
|
||||
if (connection.savedCredential?.status === 'not_saved') connection.savedCredential.message = '尚无本机加密副本;仅本次使用的凭据不会在重启后恢复。';
|
||||
}
|
||||
assert.deepEqual(after.modelCenter, expected, 'Only the exact 1.25.14 credential-default public fields may change');
|
||||
return { originalRows: 'exact', originalExports: 'exact', originalArtifactBytes: 'exact', originalCredentialsAndRouting: 'exact',
|
||||
modelCenterChanges: ['storage.credentialPersistenceSupported', 'storage.defaultPersistKey', 'storage.restart', 'not_saved.message'] };
|
||||
}
|
||||
if (modelCenterSchemaChange) {
|
||||
const original = structuredClone(before.modelCenter), next = structuredClone(after.modelCenter);
|
||||
// 1.15 changes only the public explanatory text about optional DPAPI storage.
|
||||
|
||||
@@ -29,7 +29,7 @@ fs.mkdirSync(output, { recursive: false });
|
||||
const nodePath = fs.existsSync(path.join(appRoot, 'runtime/node.exe')) ? path.join(appRoot, 'runtime/node.exe') : process.execPath;
|
||||
const disposers = [], t = { after: dispose => disposers.push(dispose) };
|
||||
const f = fixture(t, { modernDefaults: true }); f.store.close();
|
||||
const keys = Object.fromEntries(['manual', 'temporary', 'catalog', 'import', 'legacy'].map(name => [name, 'owned-restart-' + name + '-' + randomUUID()]));
|
||||
const keys = Object.fromEntries(['manual', 'temporary', 'current', 'catalog', 'import', 'legacy'].map(name => [name, 'owned-restart-' + name + '-' + randomUUID()]));
|
||||
const marks = [], screenshots = [], starts = [], exits = [];
|
||||
const sha = value => createHash('sha256').update(value).digest('hex');
|
||||
const mark = step => { marks.push({ step, passed: true }); console.log(JSON.stringify({ step, passed: true })); };
|
||||
@@ -127,6 +127,13 @@ try {
|
||||
await expect(dialog.locator('.mc-connection').filter({ hasText: 'owned-manual-edited' })).toContainText('重启自动恢复');
|
||||
mark('editing without a new key preserves the saved credential and permits submission');
|
||||
await manual(dialog, 'owned-temporary', keys.temporary, true); mark('explicit temporary choice is reflected accurately');
|
||||
const currentCard = await manual(dialog, 'owned-current', keys.current, true);
|
||||
const currentBefore = (await first.api('/model-center')).connections.find(value => value.name === 'owned-current');
|
||||
await currentCard.getByRole('button', { name: '保存当前 Key', exact: true }).click();
|
||||
await expect(currentCard).toContainText('重启自动恢复');
|
||||
const currentAfter = (await first.api('/model-center')).connections.find(value => value.name === 'owned-current');
|
||||
assert.equal(currentAfter.credentialRevision, currentBefore.credentialRevision); assert.equal(currentAfter.revision, currentBefore.revision);
|
||||
mark('one-click current-key save needs no key input and keeps its credential and connection revisions');
|
||||
|
||||
await dialog.getByRole('button', { name: '从上游添加模型', exact: true }).click();
|
||||
const catalog = dialog.getByRole('region', { name: '上游模型目录', exact: true });
|
||||
@@ -154,14 +161,14 @@ try {
|
||||
|
||||
await first.api('/config', { ...first.bootstrap.config, mode: 'compatible', model: 'owned-legacy', baseUrl: mock.baseUrl, apiKey: keys.legacy });
|
||||
const center = await first.api('/model-center');
|
||||
assert.equal(center.attemptCount, 0); assert.equal(center.connections.filter(value => value.hasKey).length, 6);
|
||||
const saved = vaultSnapshot(); assert.equal(saved.entries.length, 4); assert.equal(saved.plaintextAbsent, true);
|
||||
assert.equal(center.attemptCount, 0); assert.equal(center.connections.filter(value => value.hasKey).length, 7);
|
||||
const saved = vaultSnapshot(); assert.equal(saved.entries.length, 5); assert.equal(saved.plaintextAbsent, true);
|
||||
write('before-restart.json', { saved, connections: center.connections.map(({ id, name, hasKey, savedCredential, credentialSource }) => ({ id, name, hasKey, savedCredential, credentialSource })) });
|
||||
assert.equal(Object.values(keys).some(key => JSON.stringify(center).includes(key)), false);
|
||||
await page.goto('about:blank'); await first.close();
|
||||
const second = await start('after-restart'); assert.notEqual(second.child.pid, first.child.pid);
|
||||
const restored = await second.api('/model-center');
|
||||
assert.equal(restored.attemptCount, 0); assert.equal(restored.connections.filter(value => value.hasKey).length, 5);
|
||||
assert.equal(restored.attemptCount, 0); assert.equal(restored.connections.filter(value => value.hasKey).length, 6);
|
||||
assert.equal(restored.connections.find(value => value.name === 'owned-temporary').hasKey, false);
|
||||
assert.equal(restored.connections.filter(value => value.name !== 'owned-temporary').every(value => value.hasKey), true);
|
||||
assert.equal(vaultSnapshot().sha256, saved.sha256);
|
||||
@@ -212,7 +219,7 @@ try {
|
||||
const final = await second.api('/model-center');
|
||||
assert.equal(final.attemptCount, 1);
|
||||
report = { status: 'passed', version: '1.25.14', appRoot, starts, exits, assertions: marks, screenshots,
|
||||
savedCiphertextUnchangedAcrossRestart: true, plaintextAbsent: saved.plaintextAbsent, restoredSavedConnections: 5,
|
||||
savedCiphertextUnchangedAcrossRestart: true, plaintextAbsent: saved.plaintextAbsent, restoredSavedConnections: 6,
|
||||
syntheticModelRequests: 1, realProviderRequests: 0, localCatalogRequests: mock.requests.filter(value => value.url === '/v1/models').length,
|
||||
temporaryCredentialRestored: false, pageErrors: errors };
|
||||
} catch (error) {
|
||||
|
||||
@@ -95,7 +95,8 @@ try {
|
||||
controller = new HostController({ appRoot: installedRoot, dataRoot, port, timeoutMs: 60000 });
|
||||
const connected = await controller.connect(); assert.equal(connected.identity.pid, original.pid);
|
||||
assert.equal(connected.identity.instanceId, original.instanceId);
|
||||
const after = await publicSnapshot(controller.url, dataRoot), retention = compareOriginalState(before, after);
|
||||
const after = await publicSnapshot(controller.url, dataRoot), retention = compareOriginalState(before, after,
|
||||
{ credentialDefaultsSchemaChange: previous.version === '1.25.13' && candidate.version === '1.25.14' });
|
||||
assert.equal(after.version, candidate.version); assert.equal(fs.realpathSync.native(after.runtimeRoot), fs.realpathSync.native(installedRoot));
|
||||
const pointer = read(path.join(installRoot, 'current.json'));
|
||||
assert.equal(pointer.revision, pointerBefore.revision + 1); assert.equal(pointer.previous.version, previous.version);
|
||||
@@ -107,6 +108,24 @@ try {
|
||||
const receiptBytes = fs.statSync(operationFile).size; assert.ok(receiptBytes > 4 * 1024 * 1024);
|
||||
save('state-updated.json', after); save('pointer-updated.json', pointer);
|
||||
passed(stage, { ...receipt, from: previous.version, to: after.version, pid: after.pid, instanceId: original.instanceId, retention, authenticated, receiptBytes });
|
||||
if (candidate.version === '1.25.14') {
|
||||
stage = 'save the retained old-process key internally and restore it in a new packaged process';
|
||||
const current = (await controller.api('/model-center')).connections.find(connection => connection.id === 'legacy-default');
|
||||
assert.equal(current.hasKey, true); assert.notEqual(current.savedCredential?.status, 'saved');
|
||||
const saved = await controller.api('/model-center/credentials', { method: 'POST', input: { id: current.id, revision: current.revision, action: 'save-current' } });
|
||||
assert.equal(saved.credential.status, 'saved');
|
||||
const retained = saved.center.connections.find(connection => connection.id === current.id);
|
||||
assert.equal(retained.revision, current.revision); assert.equal(retained.credentialRevision, current.credentialRevision);
|
||||
const savedState = await publicSnapshot(controller.url, dataRoot); save('state-saved.json', savedState);
|
||||
await controller.stop(); const fresh = await controller.start();
|
||||
assert.notEqual(fresh.identity.pid, original.pid); assert.notEqual(fresh.identity.instanceId, original.instanceId);
|
||||
const restored = await publicSnapshot(controller.url, dataRoot);
|
||||
const restartRetention = compareOriginalState(savedState, { ...restored, pid: savedState.pid });
|
||||
await controller.api('/config/models', { method: 'POST', input: {} }); assert.equal(authenticated, 3);
|
||||
save('state-restarted.json', restored);
|
||||
passed(stage, { pid: fresh.identity.pid, oldPid: original.pid, credentialRevision: retained.credentialRevision,
|
||||
restartRetention, authenticated, savedCiphertextUnchanged: true });
|
||||
}
|
||||
stage = 'owned program uninstall preserves data';
|
||||
await controller.stop(); controller = null;
|
||||
const baseline = snapshotPersistentData(dataRoot), uninstallLog = path.join(root, 'uninstall.log');
|
||||
|
||||
Reference in New Issue
Block a user