private/nexus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sdsds
All checks were successful
Deploy / deploy-staging (push) Successful in 5s
Details
Deploy / deploy-production (push) Has been skipped
Details

Browse Source
This commit is contained in:
Lars Gebhardt-Kusche
2026-04-27 01:58:04 +02:00
parent f94dd83b68
commit bd6242cd76
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/pihole/pages/api.php
View File

@@ -330,13 +330,25 @@ $detectApi = function (array $instance) use ($v6Auth, $v6RequestAny, $v5Request,
if (($authRes['ok'] ?? false) && !empty($authRes['sid'])) { if (($authRes['ok'] ?? false) && !empty($authRes['sid'])) {
$sid = (string)$authRes['sid']; $sid = (string)$authRes['sid'];
$probe = $v6RequestAny($instance, ['dns/blocking', 'stats/summary', 'summary'], 'GET', [], $sid); $probe = $v6RequestAny($instance, ['stats/summary', 'summary'], 'GET', [], $sid);
if (!($probe['ok'] ?? false)) {
$versionProbe = $v6RequestAny($instance, ['dns/blocking'], 'GET', [], $sid);
if (($versionProbe['ok'] ?? false) || in_array((int)($versionProbe['http_code'] ?? 0), [401, 403], true)) {
$probe = $versionProbe;
}
}
if (!(empty($authRes['cached'])) && in_array((int)($probe['http_code'] ?? 0), [401, 403], true)) { if (!(empty($authRes['cached'])) && in_array((int)($probe['http_code'] ?? 0), [401, 403], true)) {
$clearSessionCache($instance); $clearSessionCache($instance);
$authRes = $v6Auth($instance); $authRes = $v6Auth($instance);
if (($authRes['ok'] ?? false) && !empty($authRes['sid'])) { if (($authRes['ok'] ?? false) && !empty($authRes['sid'])) {
$sid = (string)$authRes['sid']; $sid = (string)$authRes['sid'];
$probe = $v6RequestAny($instance, ['dns/blocking', 'stats/summary', 'summary'], 'GET', [], $sid); $probe = $v6RequestAny($instance, ['stats/summary', 'summary'], 'GET', [], $sid);
if (!($probe['ok'] ?? false)) {
$versionProbe = $v6RequestAny($instance, ['dns/blocking'], 'GET', [], $sid);
if (($versionProbe['ok'] ?? false) || in_array((int)($versionProbe['http_code'] ?? 0), [401, 403], true)) {
$probe = $versionProbe;
}
}
} }
} }
return ['version' => 6, 'sid' => $sid, 'probe' => $probe, 'auth' => $authRes]; return ['version' => 6, 'sid' => $sid, 'probe' => $probe, 'auth' => $authRes];
@@ -348,7 +360,7 @@ $detectApi = function (array $instance) use ($v6Auth, $v6RequestAny, $v5Request,
} }
} }
$probe = $v6RequestAny($instance, ['dns/blocking', 'stats/summary', 'summary'], 'GET', [], $sid); $probe = $v6RequestAny($instance, ['stats/summary', 'summary', 'dns/blocking'], 'GET', [], $sid);
if ($probe['ok'] || in_array((int)($probe['http_code'] ?? 0), [401, 403], true)) { if ($probe['ok'] || in_array((int)($probe['http_code'] ?? 0), [401, 403], true)) {
return ['version' => 6, 'sid' => $sid, 'probe' => $probe, 'auth' => $authRes]; return ['version' => 6, 'sid' => $sid, 'probe' => $probe, 'auth' => $authRes];
} }