wenil/amneziavpnphp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add protocol_id to VPN clients insertion logic

Browse Source
This commit is contained in:
infosave2007
2026-02-13 20:13:57 +03:00
parent 444e64a50a
commit e12f923aff
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
inc/InstallProtocolManager.php
+3 -1
View File
@@ -467,6 +467,7 @@ class InstallProtocolManager
} }
} }
$restored = 0; $restored = 0;
$pid = self::resolveProtocolId($protocol);
if (trim($wgConfig) !== '') { if (trim($wgConfig) !== '') {
$pattern = '/\[Peer\][^\[]*?PublicKey\s*=\s*(.+?)\s*[\r\n]+[\s\S]*?AllowedIPs\s*=\s*(.+?)(?:\r?\n|$)/'; $pattern = '/\[Peer\][^\[]*?PublicKey\s*=\s*(.+?)\s*[\r\n]+[\s\S]*?AllowedIPs\s*=\s*(.+?)(?:\r?\n|$)/';
if (preg_match_all($pattern, $wgConfig, $matches, PREG_SET_ORDER)) { if (preg_match_all($pattern, $wgConfig, $matches, PREG_SET_ORDER)) {
@@ -491,7 +492,7 @@ class InstallProtocolManager
continue; continue;
} }
$name = $nameByPub[$pub] ?? ('import-' . str_replace('.', '_', $clientIp)); $name = $nameByPub[$pub] ?? ('import-' . str_replace('.', '_', $clientIp));
$ins = $pdo->prepare('INSERT INTO vpn_clients (server_id, user_id, name, client_ip, public_key, private_key, preshared_key, config, status, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, NOW())'); $ins = $pdo->prepare('INSERT INTO vpn_clients (server_id, user_id, name, client_ip, public_key, private_key, preshared_key, config, protocol_id, status, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW())');
$ins->execute([ $ins->execute([
$server->getId(), $server->getId(),
$serverData['user_id'] ?? null, $serverData['user_id'] ?? null,
@@ -501,6 +502,7 @@ class InstallProtocolManager
'', '',
$details['preshared_key'] ?? null, $details['preshared_key'] ?? null,
'', '',
$pid ?: null,
'active' // Import as active since they already work on the server 'active' // Import as active since they already work on the server
]); ]);
$restored++; $restored++;