Skip to content

fix(updater): fail-closed patch error handling + redirect-safe releases fetch #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabiodalez-dev merged 1 commit into from
Jun 16, 2026
+43 −9
Merged

fix(updater): fail-closed patch error handling + redirect-safe releases fetch #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 25 additions & 9 deletions app/Support/Updater.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,11 @@ private function fetchReleasesRaw(int $limit = 10): array
$ch = curl_init($url);
curl_setopt_array($ch, [
CURLOPT_RETURNTRANSFER => true,
CURLOPT_FOLLOWLOCATION => true,
// Do not follow redirects on this authenticated API call (api.github.com
// does not legitimately redirect); a 3xx is rejected as failure below,
// matching makeGitHubRequest()'s fail-closed redirect stance.
CURLOPT_FOLLOWLOCATION => false,
CURLOPT_MAXREDIRS => 0,
CURLOPT_TIMEOUT => 30,
CURLOPT_CONNECTTIMEOUT => 10,
CURLOPT_USERAGENT => 'Pinakes-Updater/1.0',
Expand All @@ -1012,7 +1016,7 @@ private function fetchReleasesRaw(int $limit = 10): array
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
curl_close($ch);

if ($curlResult !== false && $httpCode >= 200 && $httpCode < 400) {
if ($curlResult !== false && $httpCode >= 200 && $httpCode < 300) {
$response = $curlResult;
} elseif (in_array($httpCode, [401, 403], true) && $this->githubToken !== '') {
// Retry without token on auth failure
Expand All @@ -1021,7 +1025,8 @@ private function fetchReleasesRaw(int $limit = 10): array
$ch2 = curl_init($url);
curl_setopt_array($ch2, [
CURLOPT_RETURNTRANSFER => true,
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_FOLLOWLOCATION => false,
CURLOPT_MAXREDIRS => 0,
CURLOPT_TIMEOUT => 30,
CURLOPT_CONNECTTIMEOUT => 10,
CURLOPT_USERAGENT => 'Pinakes-Updater/1.0',
Expand All @@ -1032,7 +1037,7 @@ private function fetchReleasesRaw(int $limit = 10): array
$retryResult = curl_exec($ch2);
$retryCode = curl_getinfo($ch2, CURLINFO_HTTP_CODE);
curl_close($ch2);
if ($retryResult !== false && $retryCode >= 200 && $retryCode < 400) {
if ($retryResult !== false && $retryCode >= 200 && $retryCode < 300) {
$response = $retryResult;
}
}
Expand Down Expand Up @@ -3982,7 +3987,11 @@ public function applyPreUpdatePatch(string $targetVersion): array
}

if (file_put_contents($tempPatchFile, $patchContent) === false) {
$this->debugLog('ERROR', 'Impossibile salvare patch temporanea');
// The patch is PRESENT and digest-verified; if we can't even stage
// it we must NOT install without it — fail closed (nothing committed
// yet, the caller aborts and the user retries).
$this->debugLog('ERROR', 'Impossibile salvare pre-update patch temporanea → fail-closed');
$result['success'] = false;
return $result;
}

Expand All @@ -3992,7 +4001,9 @@ public function applyPreUpdatePatch(string $targetVersion): array
@unlink($tempPatchFile);

if (!is_array($patchDefinition)) {
$this->debugLog('WARNING', 'Patch definition non valida (non è un array)');
// Present, verified patch whose definition is malformed — fail closed.
$this->debugLog('ERROR', 'Pre-update patch definition non valida (non è un array) → fail-closed');
$result['success'] = false;
return $result;
}

Expand Down Expand Up @@ -4044,12 +4055,14 @@ public function applyPreUpdatePatch(string $targetVersion): array
]);

} catch (\Throwable $e) {
// Don't fail the entire update if patch fails
// A present, digest-verified pre-update patch that errors mid-apply must
// NOT let the install proceed half-patched — fail closed (nothing is
// committed yet, so the caller aborts and the user retries cleanly).
$this->debugLog('ERROR', 'Errore durante pre-update-patch', [
'exception' => get_class($e),
'message' => $e->getMessage()
]);
// Still return success=true to allow update to continue
$result['success'] = false;
$result['error'] = $e->getMessage();
}

Expand Down Expand Up @@ -4352,11 +4365,14 @@ public function applyPostInstallPatch(string $targetVersion): array
]);

} catch (\Throwable $e) {
// Don't fail if post-install patch fails - update is already done
// The core update is already committed, so this is NON-FATAL — but it
// must surface as a warning at the caller (success=false → warning
// branch), not be hidden as "no patch applied".
$this->debugLog('ERROR', 'Errore durante post-install-patch', [
'exception' => get_class($e),
'message' => $e->getMessage()
]);
$result['success'] = false;
$result['error'] = $e->getMessage();
}

Expand Down
18 changes: 18 additions & 0 deletions tests/updater-hardening.unit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,24 @@ protected function downloadPatchFile(string $url): ?string
// token-retry) must also pin follow_location => 0 so the bearer is never resent.
$check(substr_count($src, "'follow_location' => 0") >= 3,
'authenticated file_get_contents fallback paths also disable redirect follow');
// 14b. fetchReleasesRaw's cURL branch (primary + token-retry) is fail-closed on
// redirects too — FOLLOWLOCATION=false on both. (The asset-DOWNLOAD paths keep
// FOLLOWLOCATION=true on purpose: they must follow github.com→CDN, and stay
// token-safe via isApiUrl()/anonymous headers.)
$check(substr_count($src, 'CURLOPT_FOLLOWLOCATION => false') >= 2,
'fetchReleasesRaw cURL branch disables redirect auto-follow (primary + retry)');

// 15. Patch error handling is fail-closed where nothing is committed yet:
// a present, verified pre-update patch that errors mid-apply sets success=false
// (the caller aborts) — the old "Still return success=true" fail-open is gone.
$check(strpos($src, 'Still return success=true to allow update to continue') === false,
'pre-update patch no longer fails open on a mid-apply error');
$check(preg_match('/Errore durante pre-update-patch.*?\$result\[\x27success\x27\]\s*=\s*false/s', $src) === 1,
'pre-update patch catch is fail-closed (success=false)');
// post-install: the core update is already committed, so a runtime error is a
// non-fatal warning — but it must set success=false so it is not hidden.
$check(preg_match('/Errore durante post-install-patch.*?\$result\[\x27success\x27\]\s*=\s*false/s', $src) === 1,
'post-install patch catch surfaces errors (success=false), not hidden as "no patch"');

// ---------------------------------------------------------------------------
echo "\n" . ($failed === 0
Expand Down
Loading