diff options
| -rw-r--r-- | app/Services/ImportService.php | 3 | ||||
| -rw-r--r-- | lib/lib_rss.php | 19 |
2 files changed, 21 insertions, 1 deletions
diff --git a/app/Services/ImportService.php b/app/Services/ImportService.php index a2920dc74..e7af7589d 100644 --- a/app/Services/ImportService.php +++ b/app/Services/ImportService.php @@ -275,7 +275,8 @@ class FreshRSS_Import_Service { $curl_params[CURLOPT_COOKIE] = $feed_elt['frss:CURLOPT_COOKIE']; } if (isset($feed_elt['frss:CURLOPT_COOKIEFILE'])) { - $curl_params[CURLOPT_COOKIEFILE] = $feed_elt['frss:CURLOPT_COOKIEFILE']; + // Allow only an empty value just to enable the libcurl cookie engine + $curl_params[CURLOPT_COOKIEFILE] = ''; } if (isset($feed_elt['frss:CURLOPT_FOLLOWLOCATION'])) { $curl_params[CURLOPT_FOLLOWLOCATION] = (bool)$feed_elt['frss:CURLOPT_FOLLOWLOCATION']; diff --git a/lib/lib_rss.php b/lib/lib_rss.php index b7c3817ee..532a9902a 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -319,8 +319,27 @@ function customSimplePie(array $attributes = [], array $curl_options = []): \Sim } } if (!empty($attributes['curl_params']) && is_array($attributes['curl_params'])) { + $safe_params = [ + CURLOPT_COOKIE, + CURLOPT_COOKIEFILE, + CURLOPT_FOLLOWLOCATION, + CURLOPT_HTTPHEADER, + CURLOPT_MAXREDIRS, + CURLOPT_POST, + CURLOPT_POSTFIELDS, + CURLOPT_PROXY, + CURLOPT_PROXYTYPE, + CURLOPT_USERAGENT, + ]; foreach ($attributes['curl_params'] as $co => $v) { if (is_int($co)) { + if (!in_array($co, $safe_params, true)) { + continue; + } + if ($co === CURLOPT_COOKIEFILE) { + // Allow only an empty value just to enable the libcurl cookie engine + $v = ''; + } $curl_options[$co] = $v; } } |