yetangitu/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2025-10-03 01:39:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

updated test cases, added clarity in error messages

Browse source
This commit is contained in:
Karthik Kasturi 2025-08-20 01:23:06 +00:00
parent 39e527915e
commit 77395c147f
40 changed files with 158 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/Proxy/AbstractProxy.php
View file

@ -57,8 +57,8 @@ abstract class AbstractProxy
$proxyUrl = $this->_getProxyUrl($conf);
if (empty($proxyUrl)) {
$this->_error = 'Error calling proxy. Probably a configuration issue, like wrong or missing config keys.';
error_log($this->_error);
$this->_error = 'Proxy error: Proxy URL is empty. This can be a configuration issue, like wrong or missing config keys.';
$this->logErrorWithClassName($this->_error);
return;
}
@ -76,29 +76,34 @@ abstract class AbstractProxy
if (!empty($http_response_header) && preg_match('/HTTP\/\d+\.\d+\s+(\d+)/', $http_response_header[0], $matches)) {
$statusCode = $matches[1];
}
$this->_error = 'Error calling proxy. Probably a configuration issue, like wrong or missing config keys.';
error_log($this->_error . ' Status code: ' . $statusCode);
$this->_error = 'Proxy error: Bad response. This can be a configuration issue, like wrong or missing config keys or a temporary outage.';
$this->logErrorWithClassName($this->_error . ' Status code: ' . $statusCode);
return;
}
try {
$jsonData = Json::decode($data);
} catch (Exception $e) {
$this->_error = 'Error calling proxy. Probably a configuration issue, like wrong or missing config keys.';
error_log('Error calling proxy: ' . $e->getMessage());
$this->_error = 'Proxy error: Error parsing proxy response. This can be a configuration issue, like wrong or missing config keys.';
$this->logErrorWithClassName('Error calling proxy: ' . $e->getMessage());
return;
}
$url = $this->_extractShortUrl($jsonData);
if ($url === null || empty($url)) {
$this->_error = 'Error parsing proxy response.';
error_log('Error calling proxy: ' . $data);
$this->_error = 'Proxy error: Error parsing proxy response. This can be a configuration issue, like wrong or missing config keys.';
$this->logErrorWithClassName('Error calling proxy: ' . $data);
} else {
$this->_url = $url;
}
}
private function logErrorWithClassName(string $error)
{
error_log('[' . get_class($this) . '] ' . $error);
}
/**
* Returns the (untranslated) error message
*
@ -133,7 +138,7 @@ abstract class AbstractProxy
}
/**
* Abstract method to get the payload to send to the URL Shortener
* Abstract method to get the payload to send to the URL shortener
*
* @access protected
* @param Configuration $conf