aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/composer.json2
-rw-r--r--lib/lib_rss.php41
-rw-r--r--lib/simplepie/simplepie/src/File.php9
3 files changed, 28 insertions, 24 deletions
diff --git a/lib/composer.json b/lib/composer.json
index 963ee2717..bda192099 100644
--- a/lib/composer.json
+++ b/lib/composer.json
@@ -14,7 +14,7 @@
"marienfressinaud/lib_opml": "0.5.1",
"phpgt/cssxpath": "v1.4.0",
"phpmailer/phpmailer": "7.0.0",
- "simplepie/simplepie": "dev-freshrss#187c2f28c6a7050e46e7bbfa5579552f78a6c1df"
+ "simplepie/simplepie": "dev-freshrss#e7b26b4f01d377dc8174d5d4aee961604534d065"
},
"config": {
"sort-packages": true,
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 5e19ec628..e7503ffe4 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -735,7 +735,24 @@ function httpGet(string $url, string $cachePath, string $type = 'html', array $a
cleanCache(CLEANCACHE_HOURS);
}
- if (($retryAfter = FreshRSS_http_Util::getRetryAfter($url)) > 0) {
+ $options = [];
+ $accept = '';
+ $proxy = is_string(FreshRSS_Context::systemConf()->curl_options[CURLOPT_PROXY] ?? null) ? FreshRSS_Context::systemConf()->curl_options[CURLOPT_PROXY] : '';
+ if (is_array($attributes['curl_params'] ?? null)) {
+ $options = sanitizeCurlParams($attributes['curl_params']);
+ $proxy = is_string($options[CURLOPT_PROXY]) ? $options[CURLOPT_PROXY] : '';
+ if (is_array($options[CURLOPT_HTTPHEADER] ?? null)) {
+ // Remove headers problematic for security
+ $options[CURLOPT_HTTPHEADER] = array_filter($options[CURLOPT_HTTPHEADER],
+ fn($header) => is_string($header) && !preg_match('/^(Remote-User|X-WebAuth-User)\\s*:/i', $header));
+ // Add Accept header if it is not set
+ if (preg_grep('/^Accept\\s*:/i', $options[CURLOPT_HTTPHEADER]) === false) {
+ $options[CURLOPT_HTTPHEADER][] = 'Accept: ' . $accept;
+ }
+ }
+ }
+
+ if (($retryAfter = FreshRSS_http_Util::getRetryAfter($url, $proxy)) > 0) {
Minz_Log::warning('For that domain, will first retry after ' . date('c', $retryAfter) . '. ' . \SimplePie\Misc::url_remove_credentials($url));
return ['body' => '', 'effective_url' => $url, 'redirect_count' => 0, 'fail' => true];
}
@@ -744,7 +761,6 @@ function httpGet(string $url, string $cachePath, string $type = 'html', array $a
syslog(LOG_INFO, 'FreshRSS GET ' . $type . ' ' . \SimplePie\Misc::url_remove_credentials($url));
}
- $accept = '';
switch ($type) {
case 'json':
$accept = 'application/json,application/feed+json,application/javascript;q=0.9,text/javascript;q=0.8,*/*;q=0.7';
@@ -782,6 +798,9 @@ function httpGet(string $url, string $cachePath, string $type = 'html', array $a
//CURLOPT_VERBOSE => 1, // To debug sent HTTP headers
]);
+ curl_setopt_array($ch, $options);
+ curl_setopt_array($ch, FreshRSS_Context::systemConf()->curl_options);
+
$responseHeaders = '';
curl_setopt($ch, CURLOPT_HEADERFUNCTION, function (\CurlHandle $ch, string $header) use (&$responseHeaders) {
if (trim($header) !== '') { // Skip e.g. separation with trailer headers
@@ -790,22 +809,6 @@ function httpGet(string $url, string $cachePath, string $type = 'html', array $a
return strlen($header);
});
- curl_setopt_array($ch, FreshRSS_Context::systemConf()->curl_options);
-
- if (is_array($attributes['curl_params'] ?? null)) {
- $options = sanitizeCurlParams($attributes['curl_params']);
- if (is_array($options[CURLOPT_HTTPHEADER] ?? null)) {
- // Remove headers problematic for security
- $options[CURLOPT_HTTPHEADER] = array_filter($options[CURLOPT_HTTPHEADER],
- fn($header) => is_string($header) && !preg_match('/^(Remote-User|X-WebAuth-User)\\s*:/i', $header));
- // Add Accept header if it is not set
- if (preg_grep('/^Accept\\s*:/i', $options[CURLOPT_HTTPHEADER]) === false) {
- $options[CURLOPT_HTTPHEADER][] = 'Accept: ' . $accept;
- }
- }
- curl_setopt_array($ch, $options);
- }
-
if (isset($attributes['ssl_verify'])) {
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, empty($attributes['ssl_verify']) ? 0 : 2);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (bool)$attributes['ssl_verify']);
@@ -838,7 +841,7 @@ function httpGet(string $url, string $cachePath, string $type = 'html', array $a
$body = '';
Minz_Log::warning('Error fetching content: HTTP code ' . $c_status . ': ' . $c_error . ' ' . $url);
if (in_array($c_status, [429, 503], true)) {
- $retryAfter = FreshRSS_http_Util::setRetryAfter($url, $headers['retry-after'] ?? '');
+ $retryAfter = FreshRSS_http_Util::setRetryAfter($url, $proxy, $headers['retry-after'] ?? '');
if ($c_status === 429) {
$errorMessage = 'HTTP 429 Too Many Requests! [' . \SimplePie\Misc::url_remove_credentials($url) . ']';
} elseif ($c_status === 503) {
diff --git a/lib/simplepie/simplepie/src/File.php b/lib/simplepie/simplepie/src/File.php
index 874438c76..0981ebf96 100644
--- a/lib/simplepie/simplepie/src/File.php
+++ b/lib/simplepie/simplepie/src/File.php
@@ -145,7 +145,7 @@ class File implements Response
$responseHeaders .= "\r\n";
if (curl_errno($fp) === CURLE_WRITE_ERROR || curl_errno($fp) === CURLE_BAD_CONTENT_ENCODING) {
$this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp); // FreshRSS
- $this->on_http_response($responseBody === false ? false : $responseHeaders . $responseBody);
+ $this->on_http_response($responseBody === false ? false : $responseHeaders . $responseBody, $curl_options);
$this->error = null; // FreshRSS
curl_setopt($fp, CURLOPT_ENCODING, 'none');
$responseHeaders = '';
@@ -156,7 +156,7 @@ class File implements Response
if (curl_errno($fp) !== CURLE_OK) {
$this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp);
$this->success = false;
- $this->on_http_response($responseBody === false ? false : $responseHeaders . $responseBody);
+ $this->on_http_response($responseBody === false ? false : $responseHeaders . $responseBody, $curl_options);
} else {
// For PHPStan: `curl_exec` returns `false` only on error so the `is_string` check will always pass.
\assert(is_string($responseBody));
@@ -164,7 +164,7 @@ class File implements Response
// TODO: Replace with `CURLOPT_SUPPRESS_CONNECT_HEADERS` once PHP 7.2 support is dropped.
$responseHeaders = \SimplePie\HTTP\Parser::prepareHeaders($responseHeaders);
}
- $this->on_http_response($responseHeaders . $responseBody);
+ $this->on_http_response($responseHeaders . $responseBody, $curl_options);
if (\PHP_VERSION_ID < 80000) {
curl_close($fp);
}
@@ -332,8 +332,9 @@ class File implements Response
* Triggered just after an HTTP response is received.
* @param string|false $response The raw HTTP response headers and body, or false in case of failure (as returned by curl_exec()).
* FreshRSS.
+ * @param array<int, mixed> $curl_options
*/
- protected function on_http_response($response): void
+ protected function on_http_response($response, array $curl_options = []): void
{
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-10 12:36:16 +0000