github-mirror/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2026-05-12 16:10:30 +02:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

fix(core): Wire EncryptionKeyProxy provider on bootstrap (#29581)

Browse Source
This commit is contained in:
Stephen Wright 2026-05-01 09:37:38 +01:00 committed by GitHub
parent 221c7f7410
commit ee7260c495
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/cli/src/modules/encryption-key-manager/__tests__/encryption-bootstrap.service.test.ts
View File

@ -1,11 +1,12 @@
import { mockInstance, mockLogger } from '@n8n/backend-test-utils';
import { InstanceSettings } from 'n8n-core';
import { EncryptionKeyProxy, InstanceSettings } from 'n8n-core';
import { KeyManagerService } from '../key-manager.service';
import { EncryptionBootstrapService } from '../encryption-bootstrap.service';
describe('EncryptionBootstrapService', () => {
const keyManager = mockInstance(KeyManagerService);
const encryptionKeyProxy = mockInstance(EncryptionKeyProxy);
beforeEach(() => {
jest.clearAllMocks();
@ -17,6 +18,7 @@ describe('EncryptionBootstrapService', () => {
new EncryptionBootstrapService(
keyManager,
mockInstance(InstanceSettings, { encryptionKey: 'test-instance-key' }),
encryptionKeyProxy,
mockLogger(),
);
@ -32,6 +34,12 @@ describe('EncryptionBootstrapService', () => {
expect(keyManager.bootstrapGcmKey).toHaveBeenCalled();
});
it('wires the key manager into the encryption key proxy', async () => {
await createService().run();
expect(encryptionKeyProxy.setProvider).toHaveBeenCalledWith(keyManager);
});
it('bootstraps CBC before GCM', async () => {
const order: string[] = [];
keyManager.bootstrapLegacyCbcKey.mockImplementation(async () => {

4
packages/cli/src/modules/encryption-key-manager/encryption-bootstrap.service.ts
View File

@ -1,6 +1,6 @@
import { Logger } from '@n8n/backend-common';
import { Service } from '@n8n/di';
import { InstanceSettings } from 'n8n-core';
import { EncryptionKeyProxy, InstanceSettings } from 'n8n-core';
import { KeyManagerService } from './key-manager.service';
@ -9,6 +9,7 @@ export class EncryptionBootstrapService {
constructor(
private readonly keyManager: KeyManagerService,
private readonly instanceSettings: InstanceSettings,
private readonly encryptionKeyProxy: EncryptionKeyProxy,
private readonly logger: Logger,
) {
this.logger = this.logger.scoped('encryption-key-manager');
@ -17,6 +18,7 @@ export class EncryptionBootstrapService {
async run(): Promise<void> {
await this.keyManager.bootstrapLegacyCbcKey(this.instanceSettings.encryptionKey);
await this.keyManager.bootstrapGcmKey();
this.encryptionKeyProxy.setProvider(this.keyManager);
this.logger.debug('Encryption key bootstrap complete');
}
}

16
packages/cli/test/setup-mocks.ts
View File

@ -1,5 +1,21 @@
import 'reflect-metadata';
// Clear proxy env vars so axios doesn't create HttpsProxyAgent for outbound requests.
// Nock 14 uses @mswjs/interceptors which cannot intercept requests routed through a
// proxy agent, causing "No socket was returned" failures when no real proxy is reachable.
for (const key of [
'HTTP_PROXY',
'http_proxy',
'HTTPS_PROXY',
'https_proxy',
'ALL_PROXY',
'all_proxy',
'NO_PROXY',
'no_proxy',
]) {
delete process.env[key];
}
jest.mock('@sentry/node');
jest.mock('@n8n_io/license-sdk');
jest.mock('@/telemetry');