valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drop support for (obsolete, removed from recent php versions) php safe_mode setting 

remove ugly hacks for curl + open_basedir combination breaking support for http redirects
This commit is contained in:
Andrew Dolgov 2015-11-19 20:05:17 +03:00
parent 6497fb65b4
commit 4c46702672
8 changed files with 17 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/functions.php Normal file → Executable file
View File

@ -351,16 +351,7 @@
$fetch_curl_used = true; $fetch_curl_used = true;
if (ini_get("safe_mode") || ini_get("open_basedir") || defined("FORCE_GETURL")) { $ch = curl_init($url);
$new_url = geturl($url);
if (!$new_url) {
// geturl has already populated $fetch_last_error
return false;
}
$ch = curl_init($new_url);
} else {
$ch = curl_init($url);
}
if ($timestamp && !$post_query) { if ($timestamp && !$post_query) {
curl_setopt($ch, CURLOPT_HTTPHEADER, curl_setopt($ch, CURLOPT_HTTPHEADER,
@ -369,7 +360,7 @@
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : FILE_FETCH_CONNECT_TIMEOUT); curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : FILE_FETCH_CONNECT_TIMEOUT);
curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : FILE_FETCH_TIMEOUT); curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : FILE_FETCH_TIMEOUT);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("safe_mode") && !ini_get("open_basedir")); curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir"));
curl_setopt($ch, CURLOPT_MAXREDIRS, 20); curl_setopt($ch, CURLOPT_MAXREDIRS, 20);
curl_setopt($ch, CURLOPT_BINARYTRANSFER, true); curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@ -379,7 +370,7 @@
curl_setopt($ch, CURLOPT_ENCODING, ""); curl_setopt($ch, CURLOPT_ENCODING, "");
//curl_setopt($ch, CURLOPT_REFERER, $url); //curl_setopt($ch, CURLOPT_REFERER, $url);
if (!ini_get("safe_mode") && !ini_get("open_basedir")) { if (!ini_get("open_basedir")) {
curl_setopt($ch, CURLOPT_COOKIEJAR, "/dev/null"); curl_setopt($ch, CURLOPT_COOKIEJAR, "/dev/null");
} }

71
include/functions2.php
View File

@ -2249,77 +2249,6 @@
return in_array($interface, class_implements($class)); return in_array($interface, class_implements($class));
} }
function geturl($url, $depth = 0, $nobody = true){
if ($depth == 20) return $url;
if (!function_exists('curl_init'))
return user_error('CURL Must be installed for geturl function to work. Ask your host to enable it or uncomment extension=php_curl.dll in php.ini', E_USER_ERROR);
$curl = curl_init();
$header[0] = "Accept: text/xml,application/xml,application/xhtml+xml,";
$header[0] .= "text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5";
$header[] = "Cache-Control: max-age=0";
$header[] = "Connection: keep-alive";
$header[] = "Keep-Alive: 300";
$header[] = "Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7";
$header[] = "Accept-Language: en-us,en;q=0.5";
$header[] = "Pragma: ";
curl_setopt($curl, CURLOPT_URL, $url);
curl_setopt($curl, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 5.1; rv:5.0) Gecko/20100101 Firefox/5.0 Firefox/5.0');
curl_setopt($curl, CURLOPT_HTTPHEADER, $header);
curl_setopt($curl, CURLOPT_HEADER, true);
curl_setopt($curl, CURLOPT_NOBODY, $nobody);
curl_setopt($curl, CURLOPT_REFERER, $url);
curl_setopt($curl, CURLOPT_ENCODING, 'gzip,deflate');
curl_setopt($curl, CURLOPT_AUTOREFERER, true);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
//curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); //CURLOPT_FOLLOWLOCATION Disabled...
curl_setopt($curl, CURLOPT_TIMEOUT, 60);
if (defined('_CURL_HTTP_PROXY')) {
curl_setopt($curl, CURLOPT_PROXY, _CURL_HTTP_PROXY);
}
$html = curl_exec($curl);
$status = curl_getinfo($curl);
if($status['http_code']!=200){
// idiot site not allowing http head
if($status['http_code'] == 405) {
curl_close($curl);
return geturl($url, $depth +1, false);
}
if($status['http_code'] == 301 || $status['http_code'] == 302) {
curl_close($curl);
list($header) = explode("\r\n\r\n", $html, 2);
$matches = array();
preg_match("/(Location:|URI:)[^(\n)]*/", $header, $matches);
$url = trim(str_replace($matches[1],"",$matches[0]));
$url_parsed = parse_url($url);
return (isset($url_parsed))? geturl($url, $depth + 1):'';
}
global $fetch_last_error;
$fetch_last_error = curl_errno($curl) . " " . curl_error($curl);
curl_close($curl);
# $oline='';
# foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';}
# $line =$oline." \r\n ".$url."\r\n-----------------\r\n";
# $handle = @fopen('./curl.error.log', 'a');
# fwrite($handle, $line);
return FALSE;
}
curl_close($curl);
return $url;
}
function get_minified_js($files) { function get_minified_js($files) {
require_once 'lib/jshrink/Minifier.php'; require_once 'lib/jshrink/Minifier.php';

8
include/sanity_check.php Normal file → Executable file
View File

@ -134,14 +134,10 @@
array_push($errors, "PHP support for hash() function is required but was not found."); array_push($errors, "PHP support for hash() function is required but was not found.");
} }
if (!function_exists("ctype_lower")) { if (ini_get("safe_mode")) {
array_push($errors, "PHP support for ctype functions are required by HTMLPurifier."); array_push($errors, "PHP safe mode setting is obsolete and not supported by tt-rss.");
} }
/* if (ini_get("safe_mode")) {
array_push($errors, "PHP safe mode setting is not supported.");
} */
if ((PUBSUBHUBBUB_HUB || PUBSUBHUBBUB_ENABLED) && !function_exists("curl_init")) { if ((PUBSUBHUBBUB_HUB || PUBSUBHUBBUB_ENABLED) && !function_exists("curl_init")) {
array_push($errors, "PHP support for CURL is required for PubSubHubbub."); array_push($errors, "PHP support for CURL is required for PubSubHubbub.");
} }

10
install/index.php Normal file → Executable file
View File

@ -67,17 +67,13 @@
array_push($errors, "PHP support for hash() function is required but was not found."); array_push($errors, "PHP support for hash() function is required but was not found.");
} }
if (!function_exists("ctype_lower")) {
array_push($errors, "PHP support for ctype functions are required by HTMLPurifier.");
}
if (!function_exists("iconv")) { if (!function_exists("iconv")) {
array_push($errors, "PHP support for iconv is required to handle multiple charsets."); array_push($errors, "PHP support for iconv is required to handle multiple charsets.");
} }
/* if (ini_get("safe_mode")) { if (ini_get("safe_mode")) {
array_push($errors, "PHP safe mode setting is not supported."); array_push($errors, "PHP safe mode setting is obsolete and not supported by tt-rss.");
} */ }
if (!class_exists("DOMDocument")) { if (!class_exists("DOMDocument")) {
array_push($errors, "PHP support for DOMDocument is required, but was not found."); array_push($errors, "PHP support for DOMDocument is required, but was not found.");

3
plugins/af_readability/init.php Normal file → Executable file
View File

@ -106,8 +106,7 @@ class Af_Readability extends Plugin {
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_HEADER, true); curl_setopt($ch, CURLOPT_HEADER, true);
curl_setopt($ch, CURLOPT_NOBODY, true); curl_setopt($ch, CURLOPT_NOBODY, true);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir"));
!ini_get("safe_mode") && !ini_get("open_basedir"));
curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT); curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT);
@$result = curl_exec($ch); @$result = curl_exec($ch);

3
plugins/af_redditimgur/init.php
View File

@ -262,8 +262,7 @@ class Af_RedditImgur extends Plugin {
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_HEADER, true); curl_setopt($ch, CURLOPT_HEADER, true);
curl_setopt($ch, CURLOPT_NOBODY, true); curl_setopt($ch, CURLOPT_NOBODY, true);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir"));
!ini_get("safe_mode") && !ini_get("open_basedir"));
curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT); curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT);
@$result = curl_exec($ch); @$result = curl_exec($ch);

8
plugins/af_tumblr_1280/init.php Normal file → Executable file
View File

@ -4,7 +4,7 @@ class Af_Tumblr_1280 extends Plugin {
function about() { function about() {
return array(1.0, return array(1.0,
"Replace Tumblr pictures with largest size if available", "Replace Tumblr pictures with largest size if available (requires CURL)",
"fox"); "fox");
} }
@ -18,7 +18,8 @@ class Af_Tumblr_1280 extends Plugin {
function hook_article_filter($article) { function hook_article_filter($article) {
$owner_uid = $article["owner_uid"]; if (!function_exists("curl_init") || ini_get("open_basedir"))
return $article;
$charset_hack = '<head> $charset_hack = '<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
@ -46,8 +47,7 @@ class Af_Tumblr_1280 extends Plugin {
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_HEADER, true); curl_setopt($ch, CURLOPT_HEADER, true);
curl_setopt($ch, CURLOPT_NOBODY, true); curl_setopt($ch, CURLOPT_NOBODY, true);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
!ini_get("safe_mode") && !ini_get("open_basedir"));
curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT); curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT);
@$result = curl_exec($ch); @$result = curl_exec($ch);

59
plugins/af_unburn/init.php Normal file → Executable file
View File

@ -17,23 +17,19 @@ class Af_Unburn extends Plugin {
function hook_article_filter($article) { function hook_article_filter($article) {
$owner_uid = $article["owner_uid"]; $owner_uid = $article["owner_uid"];
if (!function_exists("curl_init")) if (!function_exists("curl_init") || ini_get("open_basedir"))
return $article; return $article;
if ((strpos($article["link"], "feedproxy.google.com") !== FALSE || if ((strpos($article["link"], "feedproxy.google.com") !== FALSE ||
strpos($article["link"], "/~r/") !== FALSE || strpos($article["link"], "/~r/") !== FALSE ||
strpos($article["link"], "feedsportal.com") !== FALSE)) { strpos($article["link"], "feedsportal.com") !== FALSE)) {
if (ini_get("safe_mode") || ini_get("open_basedir")) { $ch = curl_init($article["link"]);
$ch = curl_init(geturl($article["link"]));
} else {
$ch = curl_init($article["link"]);
}
curl_setopt($ch, CURLOPT_TIMEOUT, 5); curl_setopt($ch, CURLOPT_TIMEOUT, 5);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_HEADER, true); curl_setopt($ch, CURLOPT_HEADER, true);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("safe_mode") && !ini_get("open_basedir")); curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT); curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT);
if (defined('_CURL_HTTP_PROXY')) { if (defined('_CURL_HTTP_PROXY')) {
@ -76,55 +72,6 @@ class Af_Unburn extends Plugin {
return $article; return $article;
} }
function geturl($url){
(function_exists('curl_init')) ? '' : die('cURL Must be installed for geturl function to work. Ask your host to enable it or uncomment extension=php_curl.dll in php.ini');
$curl = curl_init();
$header[0] = "Accept: text/xml,application/xml,application/xhtml+xml,";
$header[0] .= "text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5";
$header[] = "Cache-Control: max-age=0";
$header[] = "Connection: keep-alive";
$header[] = "Keep-Alive: 300";
$header[] = "Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7";
$header[] = "Accept-Language: en-us,en;q=0.5";
$header[] = "Pragma: ";
curl_setopt($curl, CURLOPT_URL, $url);
curl_setopt($curl, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 5.1; rv:5.0) Gecko/20100101 Firefox/5.0 Firefox/5.0');
curl_setopt($curl, CURLOPT_HTTPHEADER, $header);
curl_setopt($curl, CURLOPT_HEADER, true);
curl_setopt($curl, CURLOPT_REFERER, $url);
curl_setopt($curl, CURLOPT_ENCODING, 'gzip,deflate');
curl_setopt($curl, CURLOPT_AUTOREFERER, true);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
//curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); //CURLOPT_FOLLOWLOCATION Disabled...
curl_setopt($curl, CURLOPT_TIMEOUT, 60);
$html = curl_exec($curl);
$status = curl_getinfo($curl);
curl_close($curl);
if($status['http_code']!=200){
if($status['http_code'] == 301 || $status['http_code'] == 302) {
list($header) = explode("\r\n\r\n", $html, 2);
$matches = array();
preg_match("/(Location:|URI:)[^(\n)]*/", $header, $matches);
$url = trim(str_replace($matches[1],"",$matches[0]));
$url_parsed = parse_url($url);
return (isset($url_parsed))? geturl($url):'';
}
$oline='';
foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';}
$line =$oline." \r\n ".$url."\r\n-----------------\r\n";
$handle = @fopen('./curl.error.log', 'a');
fwrite($handle, $line);
return FALSE;
}
return $url;
}
function api_version() { function api_version() {
return 2; return 2;
} }