denozord/router-lists-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(NetworkConfigManager): improve IPSec password validation and handling; ensure non-empty passwords are processed and add warnings for empty responses
Publish Fast Tabler Docker image / build-and-push-fast (push) Successful in 1m40s
Details

Browse Source
This commit is contained in:
denozord
2026-01-22 19:35:25 +07:00
parent 76a8b867f8
commit cb0c370c10
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/NetworkConfigManager.jsx
+19 -8
View File
@@ -1030,15 +1030,20 @@ function NetworkConfigManager() {
// Загружаем пароли для интерфейсов с IPSec // Загружаем пароли для интерфейсов с IPSec
const passwordIds = [...new Set(interfacesWithBothServers const passwordIds = [...new Set(interfacesWithBothServers
.filter(i => i.ipsecPasswordId) .filter(i => i.ipsecPasswordId && i.ipsecPasswordId.trim() !== '')
.map(i => i.ipsecPasswordId) .map(i => i.ipsecPasswordId.trim())
)]; )];
const passwordMap = {}; const passwordMap = {};
for (const passwordId of passwordIds) { for (const passwordId of passwordIds) {
try { try {
const response = await api.get(`/ipsec-passwords/${passwordId}`); const response = await api.get(`/ipsec-passwords/${passwordId}`);
passwordMap[passwordId] = response.data?.password || ''; const password = response.data?.password || '';
if (password) {
passwordMap[passwordId] = password;
} else {
console.warn(`IPSec password ${passwordId} loaded but empty`);
}
} catch (error) { } catch (error) {
console.error(`Error loading IPSec password ${passwordId}:`, error); console.error(`Error loading IPSec password ${passwordId}:`, error);
passwordMap[passwordId] = ''; passwordMap[passwordId] = '';
@@ -1075,8 +1080,8 @@ function NetworkConfigManager() {
type: iface.type, type: iface.type,
server2Name, server2Name,
server2Info: server2, server2Info: server2,
ipsecPasswordId: iface.ipsecPasswordId || null, ipsecPasswordId: (iface.ipsecPasswordId && iface.ipsecPasswordId.trim() !== '') ? iface.ipsecPasswordId.trim() : null,
ipsecPassword: iface.ipsecPasswordId ? passwordMap[iface.ipsecPasswordId] : null ipsecPassword: (iface.ipsecPasswordId && iface.ipsecPasswordId.trim() !== '') ? (passwordMap[iface.ipsecPasswordId.trim()] || null) : null
}); });
// Для второго сервера - МЕНЯЕМ МЕСТАМИ: remoteIp становится localIp, localIp становится remoteIp // Для второго сервера - МЕНЯЕМ МЕСТАМИ: remoteIp становится localIp, localIp становится remoteIp
@@ -1094,8 +1099,8 @@ function NetworkConfigManager() {
type: iface.type, type: iface.type,
server2Name: server1Name, server2Name: server1Name,
server2Info: server1, server2Info: server1,
ipsecPasswordId: iface.ipsecPasswordId || null, ipsecPasswordId: (iface.ipsecPasswordId && iface.ipsecPasswordId.trim() !== '') ? iface.ipsecPasswordId.trim() : null,
ipsecPassword: iface.ipsecPasswordId ? passwordMap[iface.ipsecPasswordId] : null ipsecPassword: (iface.ipsecPasswordId && iface.ipsecPasswordId.trim() !== '') ? (passwordMap[iface.ipsecPasswordId.trim()] || null) : null
}); });
}); });
@@ -1129,7 +1134,13 @@ function NetworkConfigManager() {
const remoteServerIp = iface.server2Info?.ip || iface.server2Name; const remoteServerIp = iface.server2Info?.ip || iface.server2Name;
const localServerIp = server.ip || serverName; const localServerIp = server.ip || serverName;
if (iface.ipsecPasswordId && iface.ipsecPassword) { // Проверяем наличие пароля: ipsecPasswordId должен быть не пустым и пароль должен быть загружен
const hasIpsecPassword = iface.ipsecPasswordId &&
iface.ipsecPasswordId.trim() !== '' &&
iface.ipsecPassword &&
iface.ipsecPassword.trim() !== '';
if (hasIpsecPassword) {
// GRE туннель с IPSec // GRE туннель с IPSec
code += `# Создание GRE туннеля с IPSec\n`; code += `# Создание GRE туннеля с IPSec\n`;
code += `/interface gre add name="${iface.interfaceName}" remote-address=${remoteServerIp} local-address=${localServerIp} keepalive=10s\n`; code += `/interface gre add name="${iface.interfaceName}" remote-address=${remoteServerIp} local-address=${localServerIp} keepalive=10s\n`;