M_Viper/ts-website
M_Viper
/
ts-website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Experimental IPv6 support

This commit is contained in:
Wruczek 2019-06-05 05:01:23 +02:00
parent efe0e5a6ad
commit 47fa208b30
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/private/php/Auth.php
View File

@ -2,12 +2,6 @@
namespace Wruczek\TSWebsite; namespace Wruczek\TSWebsite;
use function array_filter;
use function array_keys;
use Exception;
use function in_array;
use function time;
use function var_dump;
use Wruczek\PhpFileCache\PhpFileCache; use Wruczek\PhpFileCache\PhpFileCache;
use Wruczek\TSWebsite\Utils\Language\LanguageUtils; use Wruczek\TSWebsite\Utils\Language\LanguageUtils;
use Wruczek\TSWebsite\Utils\TeamSpeakUtils; use Wruczek\TSWebsite\Utils\TeamSpeakUtils;
@ -52,7 +46,16 @@ class Auth {
// Skip query clients // Skip query clients
if ($client["client_type"]) continue; if ($client["client_type"]) continue;
if ((string) $client["connection_client_ip"] === $ip) { $clientIp = (string) $client["connection_client_ip"];
// IPv6 support - remove brackets from the beginning and the end of clientIp if there are any
// because we will be comparing it to Utils::getClientIp() that does not have them.
//
// Brackets in IPv6 addresses are no longer returned starting from TeamSpeak server version 3.8.0,
// but we want to maintain backwards compatibility
$clientIp = trim($clientIp, "[]");
if ($clientIp === $ip) {
$ret[$client["client_database_id"]] = (string) $client["client_nickname"]; $ret[$client["client_database_id"]] = (string) $client["client_nickname"];
} }
} }