refactor(MikrotikConfig): extend MikroTik credentials handling to support home routers and update related error messages for improved clarity
Publish Fast Tabler Docker image / build-and-push-fast (push) Successful in 1m40s
Publish Fast Tabler Docker image / build-and-push-fast (push) Successful in 1m40s
This commit is contained in:
@@ -72,9 +72,9 @@ async function loadPasswordMap() {
|
||||
return map;
|
||||
}
|
||||
|
||||
/** Получить MikroTik credentials из сервера (jumphost) */
|
||||
/** Получить MikroTik credentials из сервера (jumphost или home — входной роутер) */
|
||||
function getMikrotikCredentials(server) {
|
||||
if (!server || server.type !== 'jumphost') return null;
|
||||
if (!server || (server.type !== 'jumphost' && server.type !== 'home')) return null;
|
||||
const host = server.mikrotikHost || server.ip || server.dns;
|
||||
if (!host) return null;
|
||||
const port = server.mikrotikPort;
|
||||
@@ -182,8 +182,8 @@ async function testMikrotikConnection(req, res) {
|
||||
if (serverId) {
|
||||
const servers = await readServersFromS3();
|
||||
const server = servers.find(s => (s.id || s.dns || s.ip) === serverId);
|
||||
if (!server || server.type !== 'jumphost') {
|
||||
return sendError(res, 400, 'Jumphost server not found', 'E_NOT_FOUND');
|
||||
if (!server || (server.type !== 'jumphost' && server.type !== 'home')) {
|
||||
return sendError(res, 400, 'Сервер (jumphost или входной роутер) не найден', 'E_NOT_FOUND');
|
||||
}
|
||||
creds = getMikrotikCredentials(server);
|
||||
if (!creds) {
|
||||
|
||||
Reference in New Issue
Block a user