Skip to content

feat(CachedRequestService): improve isProxyStarting robustness, diagnostics, and response handling #5326

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

Open
joshtrichards wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(CachedRequestService): improve isProxyStarting robustness, diagnostics, and response handling #5326

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
79 changes: 55 additions & 24 deletions lib/Service/CachedRequestService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,44 +114,75 @@ private function getAppDataFolder(): ISimpleFolder {
}

/**
* @return boolean indicating if proxy.php is in initialize or false otherwise
* Checks if the Collabora proxy (i.e. built-in CODE app) is in-use and, if so, whether it is currently
* initializing ("starting" or "restarting").
*
* @return bool True if proxy is initializing; false otherwise.
*/
private function isProxyStarting(): bool {
$url = $this->appConfig->getValueString('richdocuments', 'wopi_url', '');
$usesProxy = false;
$proxyPos = strrpos($url, 'proxy.php');
if ($proxyPos !== false) {
$usesProxy = true;

if ($proxyPos === false) {
return false;
}

if ($usesProxy === true) {
$statusUrl = substr($url, 0, $proxyPos);
$statusUrl = $statusUrl . 'proxy.php?status';
// Build endpoint for status checking
$statusUrl = substr($url, 0, $proxyPos) . 'proxy.php?status';

$options = [
'timeout' => 5,
'nextcloud' => ['allow_local_address' => true]
];

if ($this->appConfig->getValueString('richdocuments', 'disable_certificate_verification') === 'yes') {
$options['verify'] = false;
}

try {
$client = $this->clientService->newClient();
$options = ['timeout' => 5, 'nextcloud' => ['allow_local_address' => true]];
$response = $client->get($statusUrl, $options);

if ($this->appConfig->getValueString('richdocuments', 'disable_certificate_verification') === 'yes') {
$options['verify'] = false;
$statusCode = $response->getStatusCode();

if ($statusCode !== 200) {
$this->logger->debug("isProxyStarting: Proxy status endpoint returned non-200 code: {$statusCode} url={$statusUrl}");
return false;
}

try {
$response = $client->get($statusUrl, $options);
$bodyRaw = $response->getBody();
$body = json_decode($bodyRaw, true);

if ($response->getStatusCode() === 200) {
$body = json_decode($response->getBody(), true);
if (!is_array($body) || !isset($body['status'])) {
$this->logger->debug("isProxyStarting: Unexpected response format from proxy: url={$statusUrl} body={$bodyRaw}");
return false;
}

if ($body['status'] === 'starting'
|| $body['status'] === 'stopped'
|| $body['status'] === 'restarting') {
return true;
}
}
} catch (\Exception) {
// ignore
if ($body['status'] === 'error') {
$errorDetail = $body['error'] ?? '';
$this->logger->error("isProxyStarting: Proxy returned status 'error'. url={$statusUrl} error=\"{$errorDetail}\"");
return false;
}

if ($body['status'] === 'OK') {
$this->logger->debug("isProxyStarting: Proxy status is OK at url={$statusUrl} (already started)");
return false;
}

if ($body['status'] === 'starting' || $body['status'] === 'restarting') {
$this->logger->debug("isProxyStarting: Proxy is '{$body['status']}' at url={$statusUrl}");
return true;
}
}

return false;
// Defensive fallback
$this->logger->debug("isProxyStarting: Proxy status is '{$body['status']}' at url={$statusUrl} (not starting)");
return false;
} catch (\Throwable $e) {
$this->logger->debug(
"isProxyStarting: Exception contacting proxy status endpoint at {$statusUrl}: {$e->getMessage()}",
['exception' => $e]
);
return false;
}
}
}
Loading