X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FNetwork.php;h=0f6389ce870363d5438ad857a366e41215d63f38;hb=4b44aca50735dc047e495825bff7dfa717acb615;hp=35744647e31ea742f412657e31f31e9d59c8ec18;hpb=af77af0446476290e7fcbf7db29f7feabced0f64;p=friendica.git diff --git a/src/Util/Network.php b/src/Util/Network.php index 35744647e3..0f6389ce87 100644 --- a/src/Util/Network.php +++ b/src/Util/Network.php @@ -10,6 +10,7 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\System; +use Friendica\DI; use Friendica\Network\CurlResult; class Network @@ -23,19 +24,19 @@ class Network * * @brief Curl wrapper * @param string $url URL to fetch - * @param boolean $binary default false + * @param bool $binary default false * TRUE if asked to return binary results (file download) - * @param integer $redirects The recursion counter for internal use - default 0 - * @param integer $timeout Timeout in seconds, default system config value or 60 seconds + * @param int $timeout Timeout in seconds, default system config value or 60 seconds * @param string $accept_content supply Accept: header with 'accept_content' as the value * @param string $cookiejar Path to cookie jar file + * @param int $redirects The recursion counter for internal use - default 0 * * @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 = '') + public static function fetchUrl(string $url, bool $binary = false, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0) { - $ret = self::fetchUrlFull($url, $binary, $redirects, $timeout, $accept_content, $cookiejar); + $ret = self::fetchUrlFull($url, $binary, $timeout, $accept_content, $cookiejar, $redirects); return $ret->getBody(); } @@ -48,26 +49,27 @@ class Network * * @brief Curl wrapper with array of return values. * @param string $url URL to fetch - * @param boolean $binary default false + * @param bool $binary default false * TRUE if asked to return binary results (file download) - * @param integer $redirects The recursion counter for internal use - default 0 - * @param integer $timeout Timeout in seconds, default system config value or 60 seconds + * @param int $timeout Timeout in seconds, default system config value or 60 seconds * @param string $accept_content supply Accept: header with 'accept_content' as the value * @param string $cookiejar Path to cookie jar file + * @param int $redirects The recursion counter for internal use - default 0 * * @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 = '') + public static function fetchUrlFull(string $url, bool $binary = false, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0) { return self::curl( $url, $binary, - $redirects, - ['timeout'=>$timeout, - 'accept_content'=>$accept_content, - 'cookiejar'=>$cookiejar - ] + [ + 'timeout' => $timeout, + 'accept_content' => $accept_content, + 'cookiejar' => $cookiejar + ], + $redirects ); } @@ -75,9 +77,8 @@ class Network * @brief fetches an URL. * * @param string $url URL to fetch - * @param boolean $binary default false + * @param bool $binary default false * TRUE if asked to return binary results (file download) - * @param int $redirects The recursion counter for internal use - default 0 * @param array $opts (optional parameters) assoziative array with: * 'accept_content' => supply Accept: header with 'accept_content' as the value * 'timeout' => int Timeout in seconds, default system config value or 60 seconds @@ -86,15 +87,16 @@ class Network * 'nobody' => only return the header * 'cookiejar' => path to cookie jar file * 'header' => header array + * @param int $redirects The recursion counter for internal use - default 0 * * @return CurlResult * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function curl($url, $binary = false, &$redirects = 0, $opts = []) + public static function curl(string $url, bool $binary = false, array $opts = [], int &$redirects = 0) { $stamp1 = microtime(true); - $a = \get_app(); + $a = DI::app(); if (strlen($url) > 1000) { Logger::log('URL is longer than 1000 characters. Callstack: ' . System::callstack(20), Logger::DEBUG); @@ -103,7 +105,7 @@ class Network $parts2 = []; $parts = parse_url($url); - $path_parts = explode('/', defaults($parts, 'path', '')); + $path_parts = explode('/', $parts['path'] ?? ''); foreach ($path_parts as $part) { if (strlen($part) <> mb_strlen($part)) { $parts2[] = rawurlencode($part); @@ -227,12 +229,12 @@ class Network $redirects++; Logger::log('curl: redirect ' . $url . ' to ' . $curlResponse->getRedirectUrl()); @curl_close($ch); - return self::curl($curlResponse->getRedirectUrl(), $binary, $redirects, $opts); + return self::curl($curlResponse->getRedirectUrl(), $binary, $opts, $redirects); } @curl_close($ch); - $a->getProfiler()->saveTimestamp($stamp1, 'network', System::callstack()); + DI::profiler()->saveTimestamp($stamp1, 'network', System::callstack()); return $curlResponse; } @@ -242,14 +244,14 @@ class Network * * @param string $url URL to post * @param mixed $params array of POST variables - * @param string $headers HTTP headers - * @param integer $redirects Recursion counter for internal use - default = 0 - * @param integer $timeout The timeout in seconds, default system config value or 60 seconds + * @param array $headers HTTP headers + * @param int $redirects Recursion counter for internal use - default = 0 + * @param int $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) + public static function post(string $url, $params, array $headers = [], int $timeout = 0, int &$redirects = 0) { $stamp1 = microtime(true); @@ -258,7 +260,7 @@ class Network return CurlResult::createErrorCurl($url); } - $a = \get_app(); + $a = DI::app(); $ch = curl_init($url); if (($redirects > 8) || (!$ch)) { @@ -284,17 +286,7 @@ class Network curl_setopt($ch, CURLOPT_TIMEOUT, intval($curl_time)); } - if (defined('LIGHTTPD')) { - if (!is_array($headers)) { - $headers = ['Expect:']; - } else { - if (!in_array('Expect:', $headers)) { - array_push($headers, 'Expect:'); - } - } - } - - if ($headers) { + if (!empty($headers)) { curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); } @@ -334,13 +326,38 @@ class Network curl_close($ch); - $a->getProfiler()->saveTimestamp($stamp1, 'network', System::callstack()); + DI::profiler()->saveTimestamp($stamp1, 'network', System::callstack()); + + // Very old versions of Lighttpd don't like the "Expect" header, so we remove it when needed + if ($curlResponse->getReturnCode() == 417) { + $redirects++; + + if (empty($headers)) { + $headers = ['Expect:']; + } else { + if (!in_array('Expect:', $headers)) { + array_push($headers, 'Expect:'); + } + } + Logger::info('Server responds with 417, applying workaround', ['url' => $url]); + return self::post($url, $params, $headers, $redirects, $timeout); + } Logger::log('post_url: end ' . $url, Logger::DATA); return $curlResponse; } + /** + * Return raw post data from a post request + * + * @return string post data + */ + public static function postdata() + { + return file_get_contents('php://input'); + } + /** * @brief Check URL to see if it's real * @@ -351,7 +368,7 @@ class Network * @return string|boolean The actual working URL, false else * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function isUrlValid($url) + public static function isUrlValid(string $url) { if (Config::get('system', 'disable_url_validation')) { return $url; @@ -369,7 +386,7 @@ class Network /// @TODO Really suppress function outcomes? Why not find them + debug them? $h = @parse_url($url); - if (!empty($h['host']) && (@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; } @@ -381,9 +398,8 @@ 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) + public static function isEmailDomainValid(string $addr) { if (Config::get('system', 'disable_email_validation')) { return true; @@ -396,7 +412,7 @@ class Network $h = substr($addr, strpos($addr, '@') + 1); // Concerning the @ see here: https://stackoverflow.com/questions/36280957/dns-get-record-a-temporary-server-error-occurred - if ($h && (@dns_get_record($h, DNS_A + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) { + if ($h && (@dns_get_record($h, DNS_A + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP))) { return true; } if ($h && @dns_get_record($h, DNS_CNAME + DNS_MX)) { @@ -413,9 +429,8 @@ 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) + public static function isUrlAllowed(string $url) { $h = @parse_url($url); @@ -460,7 +475,7 @@ class Network * * @return boolean */ - public static function isUrlBlocked($url) + public static function isUrlBlocked(string $url) { $host = @parse_url($url, PHP_URL_HOST); if (!$host) { @@ -473,7 +488,7 @@ class Network } foreach ($domain_blocklist as $domain_block) { - if (strcasecmp($domain_block['domain'], $host) === 0) { + if (fnmatch(strtolower($domain_block['domain']), strtolower($host))) { return true; } } @@ -491,7 +506,7 @@ class Network * or if allowed list is not configured * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function isEmailDomainAllowed($email) + public static function isEmailDomainAllowed(string $email) { $domain = strtolower(substr($email, strpos($email, '@') + 1)); if (!$domain) { @@ -516,7 +531,7 @@ class Network * @param array $domain_list * @return boolean */ - public static function isDomainAllowed($domain, array $domain_list) + public static function isDomainAllowed(string $domain, array $domain_list) { $found = false; @@ -531,7 +546,7 @@ class Network return $found; } - public static function lookupAvatarByEmail($email) + public static function lookupAvatarByEmail(string $email) { $avatar['size'] = 300; $avatar['email'] = $email; @@ -541,7 +556,7 @@ class Network Hook::callAll('avatar_lookup', $avatar); if (! $avatar['success']) { - $avatar['url'] = System::baseUrl() . '/images/person-300.jpg'; + $avatar['url'] = DI::baseUrl() . '/images/person-300.jpg'; } Logger::log('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], Logger::DEBUG); @@ -554,7 +569,7 @@ class Network * @param string $url Any user-submitted URL that may contain tracking params * @return string The same URL stripped of tracking parameters */ - public static function stripTrackingQueryParams($url) + public static function stripTrackingQueryParams(string $url) { $urldata = parse_url($url); if (!empty($urldata["query"])) { @@ -613,9 +628,9 @@ class Network * @return string A canonical URL * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function finalUrl($url, $depth = 1, $fetchbody = false) + public static function finalUrl(string $url, int $depth = 1, bool $fetchbody = false) { - $a = \get_app(); + $a = DI::app(); $url = self::stripTrackingQueryParams($url); @@ -640,7 +655,7 @@ class Network $http_code = $curl_info['http_code']; curl_close($ch); - $a->getProfiler()->saveTimestamp($stamp1, "network", System::callstack()); + DI::profiler()->saveTimestamp($stamp1, "network", System::callstack()); if ($http_code == 0) { return $url; @@ -682,7 +697,7 @@ class Network $body = curl_exec($ch); curl_close($ch); - $a->getProfiler()->saveTimestamp($stamp1, "network", System::callstack()); + DI::profiler()->saveTimestamp($stamp1, "network", System::callstack()); if (trim($body) == "") { return $url; @@ -724,7 +739,7 @@ class Network * @param string $url2 * @return string The matching part */ - public static function getUrlMatch($url1, $url2) + public static function getUrlMatch(string $url1, string $url2) { if (($url1 == "") || ($url2 == "")) { return ""; @@ -792,8 +807,8 @@ class Network $i = 0; $path = ""; do { - $path1 = defaults($pathparts1, $i, ''); - $path2 = defaults($pathparts2, $i, ''); + $path1 = $pathparts1[$i] ?? ''; + $path2 = $pathparts2[$i] ?? ''; if ($path1 == $path2) { $path .= $path1."/"; @@ -812,7 +827,7 @@ class Network * * @return string The glued URL */ - public static function unparseURL($parsed) + public static function unparseURL(array $parsed) { $get = function ($key) use ($parsed) { return isset($parsed[$key]) ? $parsed[$key] : null; @@ -835,4 +850,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(string $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; + } }