Skip to content

fix(ssh): store host key buffer in addHostKey so verifyHostKey matches #1361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
naaa760 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(ssh): store host key buffer in addHostKey so verifyHostKey matches #1361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions src/main/services/ssh/SshHostKeyService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,21 +132,15 @@ export class SshHostKeyService {
* @param host - Hostname or IP address
* @param port - SSH port
* @param keyType - Type of host key
* @param fingerprint - Host key fingerprint
* @param key - Raw host key buffer
*/
async addHostKey(
host: string,
port: number,
keyType: string,
fingerprint: string
): Promise<void> {
async addHostKey(host: string, port: number, keyType: string, key: Buffer): Promise<void> {
await this.initialize();

const hostPort = port === 22 ? host : `[${host}]:${port}`;
// Store fingerprint with algorithm so we can persist correctly
this.knownHosts.set(hostPort, { algorithm: keyType || 'ssh-ed25519', keyBase64: fingerprint });
const keyBase64 = key.toString('base64');
this.knownHosts.set(hostPort, { algorithm: keyType || 'ssh-ed25519', keyBase64 });

// Rewrite entire file to ensure consistency
await this.persistKnownHosts();
}

Expand Down
18 changes: 12 additions & 6 deletions src/main/services/ssh/__tests__/SshHostKeyService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,34 +195,40 @@ host3.example.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdH
it('should add host key with standard port', async () => {
(access as Mock).mockRejectedValue(new Error('File not found'));

await service.addHostKey('new.host.com', 22, 'ssh-ed25519', 'SHA256:abc123def456');
const keyBuffer = Buffer.from('new-host-key-data');
await service.addHostKey('new.host.com', 22, 'ssh-ed25519', keyBuffer);

const expectedKeyBase64 = keyBuffer.toString('base64');
expect(writeFile).toHaveBeenCalledWith(
'/home/testuser/.ssh/known_hosts',
'new.host.com ssh-ed25519 SHA256:abc123def456\n'
`new.host.com ssh-ed25519 ${expectedKeyBase64}\n`
);
});

it('should add host key with non-standard port', async () => {
(access as Mock).mockRejectedValue(new Error('File not found'));

await service.addHostKey('new.host.com', 2222, 'ssh-ed25519', 'SHA256:abc123def456');
const keyBuffer = Buffer.from('new-host-key-data');
await service.addHostKey('new.host.com', 2222, 'ssh-ed25519', keyBuffer);

const expectedKeyBase64 = keyBuffer.toString('base64');
expect(writeFile).toHaveBeenCalledWith(
'/home/testuser/.ssh/known_hosts',
'[new.host.com]:2222 ssh-ed25519 SHA256:abc123def456\n'
`[new.host.com]:2222 ssh-ed25519 ${expectedKeyBase64}\n`
);
});

it('should update existing host key', async () => {
(access as Mock).mockResolvedValue(undefined);
(readFile as Mock).mockResolvedValue('old.host.com ssh-ed25519 oldkey\n');

await service.addHostKey('old.host.com', 22, 'ssh-ed25519', 'new-fingerprint');
const keyBuffer = Buffer.from('updated-key-data');
await service.addHostKey('old.host.com', 22, 'ssh-ed25519', keyBuffer);

const expectedKeyBase64 = keyBuffer.toString('base64');
expect(writeFile).toHaveBeenCalledWith(
'/home/testuser/.ssh/known_hosts',
'old.host.com ssh-ed25519 new-fingerprint\n'
`old.host.com ssh-ed25519 ${expectedKeyBase64}\n`
);
});
});
Expand Down