X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FNetwork.php;h=e4e9c5af5bb5a75673017425b6cc298057fa74ac;hb=19e95ebdda9f52a5c2e024edbeb539edba8eba41;hp=255b3c8c4d3e1b8d1f41d1b8358b27251102a5d2;hpb=2f28c2ebbfd8f66093d7081d40b1d48f65fcff20;p=friendica.git diff --git a/src/Util/Network.php b/src/Util/Network.php index 255b3c8c4d..e4e9c5af5b 100644 --- a/src/Util/Network.php +++ b/src/Util/Network.php @@ -4,13 +4,13 @@ */ namespace Friendica\Util; -use Friendica\Core\Addon; +use DOMDocument; +use DomXPath; +use Friendica\Core\Config; +use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\System; -use Friendica\Core\Config; use Friendica\Network\CurlResult; -use DOMDocument; -use DomXPath; class Network { @@ -31,6 +31,7 @@ class Network * @param string $cookiejar Path to cookie jar file * * @return string The fetched content + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function fetchUrl($url, $binary = false, &$redirects = 0, $timeout = 0, $accept_content = null, $cookiejar = '') { @@ -55,6 +56,7 @@ class Network * @param string $cookiejar Path to cookie jar file * * @return CurlResult With all relevant information, 'body' contains the actual fetched content. + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function fetchUrlFull($url, $binary = false, &$redirects = 0, $timeout = 0, $accept_content = null, $cookiejar = '') { @@ -83,17 +85,23 @@ class Network * 'novalidate' => do not validate SSL certs, default is to validate using our CA list * 'nobody' => only return the header * 'cookiejar' => path to cookie jar file + * 'header' => header array * * @return CurlResult + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function curl($url, $binary = false, &$redirects = 0, $opts = []) { - $ret = ['return_code' => 0, 'success' => false, 'header' => '', 'info' => '', 'body' => '']; - $stamp1 = microtime(true); - $a = get_app(); + $a = \get_app(); + if (strlen($url) > 1000) { + Logger::log('URL is longer than 1000 characters. Callstack: ' . System::callstack(20), Logger::DEBUG); + return CurlResult::createErrorCurl(substr($url, 0, 200)); + } + + $parts2 = []; $parts = parse_url($url); $path_parts = explode('/', defaults($parts, 'path', '')); foreach ($path_parts as $part) { @@ -119,7 +127,7 @@ class Network @curl_setopt($ch, CURLOPT_HEADER, true); - if (x($opts, "cookiejar")) { + if (!empty($opts['cookiejar'])) { curl_setopt($ch, CURLOPT_COOKIEJAR, $opts["cookiejar"]); curl_setopt($ch, CURLOPT_COOKIEFILE, $opts["cookiejar"]); } @@ -128,7 +136,7 @@ class Network // @curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); // @curl_setopt($ch, CURLOPT_MAXREDIRS, 5); - if (x($opts, 'accept_content')) { + if (!empty($opts['accept_content'])) { curl_setopt( $ch, CURLOPT_HTTPHEADER, @@ -136,6 +144,10 @@ class Network ); } + if (!empty($opts['header'])) { + curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['header']); + } + @curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); @curl_setopt($ch, CURLOPT_USERAGENT, $a->getUserAgent()); @@ -150,15 +162,15 @@ class Network /// @todo We could possibly set this value to "gzip" or something similar curl_setopt($ch, CURLOPT_ENCODING, ''); - if (x($opts, 'headers')) { + if (!empty($opts['headers'])) { @curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']); } - if (x($opts, 'nobody')) { + if (!empty($opts['nobody'])) { @curl_setopt($ch, CURLOPT_NOBODY, $opts['nobody']); } - if (x($opts, 'timeout')) { + if (!empty($opts['timeout'])) { @curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']); } else { $curl_time = Config::get('system', 'curl_timeout', 60); @@ -220,7 +232,7 @@ class Network @curl_close($ch); - $a->saveTimestamp($stamp1, 'network'); + $a->getProfiler()->saveTimestamp($stamp1, 'network', System::callstack()); return $curlResponse; } @@ -235,6 +247,7 @@ class Network * @param integer $timeout The timeout in seconds, default system config value or 60 seconds * * @return CurlResult The content + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function post($url, $params, $headers = null, &$redirects = 0, $timeout = 0) { @@ -245,7 +258,7 @@ class Network return CurlResult::createErrorCurl($url); } - $a = get_app(); + $a = \get_app(); $ch = curl_init($url); if (($redirects > 8) || (!$ch)) { @@ -308,7 +321,6 @@ class Network $s = @curl_exec($ch); - $base = $s; $curl_info = curl_getinfo($ch); $curlResponse = new CurlResult($url, $s, $curl_info, curl_errno($ch), curl_error($ch)); @@ -322,7 +334,7 @@ class Network curl_close($ch); - $a->saveTimestamp($stamp1, 'network'); + $a->getProfiler()->saveTimestamp($stamp1, 'network', System::callstack()); Logger::log('post_url: end ' . $url, Logger::DATA); @@ -337,6 +349,7 @@ class Network * * @param string $url The URL to be validated * @return string|boolean The actual working URL, false else + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function isUrlValid($url) { @@ -356,7 +369,7 @@ class Network /// @TODO Really suppress function outcomes? Why not find them + debug them? $h = @parse_url($url); - if ((is_array($h)) && (@dns_get_record($h['host'], DNS_A + DNS_CNAME) || filter_var($h['host'], FILTER_VALIDATE_IP) )) { + if (!empty($h['host']) && (@dns_get_record($h['host'], DNS_A + DNS_CNAME) || filter_var($h['host'], FILTER_VALIDATE_IP) )) { return $url; } @@ -368,6 +381,7 @@ class Network * * @param string $addr The email address * @return boolean True if it's a valid email address, false if it's not + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function isEmailDomainValid($addr) { @@ -399,6 +413,7 @@ class Network * * @param string $url URL which get tested * @return boolean True if url is allowed otherwise return false + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function isUrlAllowed($url) { @@ -473,7 +488,8 @@ class Network * * @param string $email email address * @return boolean False if not allowed, true if allowed - * or if allowed list is not configured + * or if allowed list is not configured + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function isEmailDomainAllowed($email) { @@ -483,7 +499,7 @@ class Network } $str_allowed = Config::get('system', 'allowed_email', ''); - if (!x($str_allowed)) { + if (empty($str_allowed)) { return true; } @@ -522,7 +538,7 @@ class Network $avatar['url'] = ''; $avatar['success'] = false; - Addon::callHooks('avatar_lookup', $avatar); + Hook::callAll('avatar_lookup', $avatar); if (! $avatar['success']) { $avatar['url'] = System::baseUrl() . '/images/person-300.jpg'; @@ -587,18 +603,19 @@ class Network * This function strips tracking query params and follows redirections, either * through HTTP code or meta refresh tags. Stops after 10 redirections. * - * @todo Remove the $fetchbody parameter that generates an extraneous HEAD request + * @todo Remove the $fetchbody parameter that generates an extraneous HEAD request * - * @see ParseUrl::getSiteinfo + * @see ParseUrl::getSiteinfo * * @param string $url A user-submitted URL * @param int $depth The current redirection recursion level (internal) * @param bool $fetchbody Wether to fetch the body or not after the HEAD requests * @return string A canonical URL + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function finalUrl($url, $depth = 1, $fetchbody = false) { - $a = get_app(); + $a = \get_app(); $url = self::stripTrackingQueryParams($url); @@ -623,7 +640,7 @@ class Network $http_code = $curl_info['http_code']; curl_close($ch); - $a->saveTimestamp($stamp1, "network"); + $a->getProfiler()->saveTimestamp($stamp1, "network", System::callstack()); if ($http_code == 0) { return $url; @@ -665,7 +682,7 @@ class Network $body = curl_exec($ch); curl_close($ch); - $a->saveTimestamp($stamp1, "network"); + $a->getProfiler()->saveTimestamp($stamp1, "network", System::callstack()); if (trim($body) == "") { return $url; @@ -713,8 +730,8 @@ class Network return ""; } - $url1 = normalise_link($url1); - $url2 = normalise_link($url2); + $url1 = Strings::normaliseLink($url1); + $url2 = Strings::normaliseLink($url2); $parts1 = parse_url($url1); $parts2 = parse_url($url2); @@ -785,7 +802,7 @@ class Network $match .= $path; - return normalise_link($match); + return Strings::normaliseLink($match); } /** @@ -818,4 +835,28 @@ class Network (strlen($query) ? "?".$query : '') . (strlen($fragment) ? "#".$fragment : ''); } + + + /** + * Switch the scheme of an url between http and https + * + * @param string $url URL + * + * @return string switched URL + */ + public static function switchScheme($url) + { + $scheme = parse_url($url, PHP_URL_SCHEME); + if (empty($scheme)) { + return $url; + } + + if ($scheme === 'http') { + $url = str_replace('http://', 'https://', $url); + } elseif ($scheme === 'https') { + $url = str_replace('https://', 'http://', $url); + } + + return $url; + } }