dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-28 01:26:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

SSH - handle SSH error

Browse Source
This commit is contained in:
SPRINX0\prochazka
2025-01-06 08:24:14 +01:00
parent aff282d31e
commit 053ba471a6
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/api/src/utility/sshTunnel.js
View File

@@ -43,19 +43,25 @@ function callForwardProcess(connection, tunnelConfig, tunnelCacheKey) {
logger.error(extractErrorLogData(err), 'Error connecting SSH'); logger.error(extractErrorLogData(err), 'Error connecting SSH');
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let promiseHandled = false;
subprocess.on('message', resp => { subprocess.on('message', resp => {
// @ts-ignore // @ts-ignore
const { msgtype, errorMessage } = resp; const { msgtype, errorMessage } = resp;
if (msgtype == 'connected') { if (msgtype == 'connected') {
resolve(subprocess); resolve(subprocess);
promiseHandled = true;
} }
if (msgtype == 'error') { if (msgtype == 'error') {
reject(new Error(errorMessage)); reject(new Error(errorMessage));
promiseHandled = true;
} }
}); });
subprocess.on('exit', code => { subprocess.on('exit', code => {
logger.info('SSH forward process exited'); logger.info('SSH forward process exited');
delete sshTunnelCache[tunnelCacheKey]; delete sshTunnelCache[tunnelCacheKey];
if (!promiseHandled) {
reject(new Error('SSH forward process exited, try to change "Local host address for SSH connections" in Settings/Connections'));
}
}); });
}); });
} }

1
packages/web/src/settings/SettingsModal.svelte
View File

@@ -211,7 +211,6 @@ ORDER BY
{ value: '127.0.0.1', label: '127.0.0.1 (IPv4)' }, { value: '127.0.0.1', label: '127.0.0.1 (IPv4)' },
{ value: '::1', label: '::1 (IPv6)' }, { value: '::1', label: '::1 (IPv6)' },
{ value: 'localhost', label: 'localhost (domain name)' }, { value: 'localhost', label: 'localhost (domain name)' },
{ value: 'testerror', label: 'testerror' },
]} ]}
/> />