mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-11-09 22:24:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(core): Support CIFS permission restrictions in source control

Browse source
This commit is contained in:
Iván Ovejero 2024-09-19 12:41:37 +02:00
parent ee7147c6b3
commit 5b1e4e2f79
No known key found for this signature in database
2 changed files with 35 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
packages/cli/src/environments/source-control/__tests__/source-control-preferences.service.test.ts Normal file
View file

@ -0,0 +1,30 @@
import { mock } from 'jest-mock-extended';
import type { InstanceSettings } from 'n8n-core';
import fsp from 'node:fs/promises';
import { SourceControlPreferencesService } from '../source-control-preferences.service.ee';
describe('SourceControlPreferencesService', () => {
const service = new SourceControlPreferencesService(
mock<InstanceSettings>({ n8nFolder: 'test' }),
mock(),
mock(),
);
describe('getPrivateKeyPath', () => {
it('should return the path to the private key file', async () => {
fsp.writeFile = jest.fn();
// @ts-expect-error Private method
jest.spyOn(service, 'getPrivateKeyFromDatabase').mockResolvedValue('private-key');
await service.getPrivateKeyPath();
expect(fsp.writeFile).toHaveBeenCalledWith(
expect.stringContaining('ssh_private_key_temp'),
'private-key',
{ mode: 0o600, encoding: 'utf8' },
);
});
});
});

9
packages/cli/src/environments/source-control/source-control-preferences.service.ee.ts
View file

@ -3,7 +3,7 @@ import { validate } from 'class-validator';
import { rm as fsRm } from 'fs/promises';
import { Cipher, InstanceSettings } from 'n8n-core';
import { ApplicationError, jsonParse } from 'n8n-workflow';
import { writeFile, chmod, readFile } from 'node:fs/promises';
import { writeFile, readFile } from 'node:fs/promises';
import path from 'path';
import Container, { Service } from 'typedi';
@ -97,9 +97,10 @@ export class SourceControlPreferencesService {
const tempFilePath = path.join(this.instanceSettings.n8nFolder, 'ssh_private_key_temp');
await writeFile(tempFilePath, dbPrivateKey);
await chmod(tempFilePath, 0o600);
await writeFile(tempFilePath, dbPrivateKey, {
mode: 0o600, // required by OpenSSH login client
encoding: 'utf8',
});
return tempFilePath;
}