X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnetwork.php;h=90aea6e766b59de4904e22d863c93ee421a6b6c7;hb=1ff217cc1373099b0e52ba8de5ab4a1335b0f184;hp=27292499beb85b1c2290e8630310859405df5058;hpb=8d469c155a3c0e8c9665546ab5bc5ab091a970b5;p=friendica.git

diff --git a/include/network.php b/include/network.php
index 27292499be..90aea6e766 100644
--- a/include/network.php
+++ b/include/network.php
@@ -4,10 +4,12 @@
  * @file include/network.php
  */
 
-use \Friendica\Core\Config;
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Core\Config;
+use Friendica\Network\Probe;
 
 require_once("include/xml.php");
-require_once('include/Probe.php');
 
 /**
  * @brief Curl wrapper
@@ -63,13 +65,13 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_
  *    string 'body' => fetched content
  */
 function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
-	$ret = array('return_code' => 0, 'success' => false, 'header' => '', 'body' => '');
+	$ret = array('return_code' => 0, 'success' => false, 'header' => '', 'info' => '', 'body' => '');
 
 	$stamp1 = microtime(true);
 
 	$a = get_app();
 
-	if (! check_domain_blocklist($url)) {
+	if (blocked_url($url)) {
 		logger('z_fetch_url: domain of ' . $url . ' is blocked', LOGGER_DATA);
 		return $ret;
 	}
@@ -106,6 +108,11 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
 		@curl_setopt($ch, CURLOPT_RANGE, '0-' . $range);
 	}
 
+	// Without this setting it seems as if some webservers send compressed content
+	// This seems to confuse curl so that it shows this uncompressed.
+	/// @todo  We could possibly set this value to "gzip" or something similar
+	curl_setopt($ch, CURLOPT_ENCODING, '');
+
 	if (x($opts, 'headers')) {
 		@curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']);
 	}
@@ -117,32 +124,36 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
 	if (x($opts, 'timeout')) {
 		@curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']);
 	} else {
-		$curl_time = intval(get_config('system', 'curl_timeout'));
+		$curl_time = intval(Config::get('system', 'curl_timeout'));
 		@curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
 	}
 
 	// by default we will allow self-signed certs
 	// but you can override this
 
-	$check_cert = get_config('system', 'verifyssl');
+	$check_cert = Config::get('system', 'verifyssl');
 	@curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
 
 	if ($check_cert) {
 		@curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
 	}
 
-	$proxy = get_config('system', 'proxy');
+	$proxy = Config::get('system', 'proxy');
 
 	if (strlen($proxy)) {
 		@curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
 		@curl_setopt($ch, CURLOPT_PROXY, $proxy);
-		$proxyuser = @get_config('system', 'proxyuser');
+		$proxyuser = @Config::get('system', 'proxyuser');
 
 		if (strlen($proxyuser)) {
 			@curl_setopt($ch, CURLOPT_PROXYUSERPWD, $proxyuser);
 		}
 	}
 
+	if (Config::get('system', 'ipv4_resolve', false)) {
+		curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
+	}
+
 	if ($binary) {
 		@curl_setopt($ch, CURLOPT_BINARYTRANSFER, 1);
 	}
@@ -153,6 +164,15 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
 	// if it throws any errors.
 
 	$s = @curl_exec($ch);
+	$curl_info = @curl_getinfo($ch);
+
+	// Special treatment for HTTP Code 416
+	// See https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/416
+	if (($curl_info['http_code'] == 416) && ($range > 0)) {
+		@curl_setopt($ch, CURLOPT_RANGE, '');
+		$s = @curl_exec($ch);
+		$curl_info = @curl_getinfo($ch);
+	}
 
 	if (curl_errno($ch) !== CURLE_OK) {
 		logger('fetch_url error fetching ' . $url . ': ' . curl_error($ch), LOGGER_NORMAL);
@@ -161,9 +181,10 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
 	$ret['errno'] = curl_errno($ch);
 
 	$base = $s;
-	$curl_info = @curl_getinfo($ch);
+	$ret['info'] = $curl_info;
 
 	$http_code = $curl_info['http_code'];
+
 	logger('fetch_url ' . $url . ': ' . $http_code . " " . $s, LOGGER_DATA);
 	$header = '';
 
@@ -171,7 +192,7 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
 	// allow for HTTP/2.x without fixing code
 
 	while (preg_match('/^HTTP\/[1-2].+? [1-5][0-9][0-9]/', $base)) {
-		$chunk = substr($base, 0, strpos($base, "\r\n\r\n") + 4);
+		$chunk = substr($base, 0, strpos($base,"\r\n\r\n") + 4);
 		$header .= $chunk;
 		$base = substr($base, strlen($chunk));
 	}
@@ -186,7 +207,7 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
 
 		$newurl = $curl_info['redirect_url'];
 
-		if (($new_location_info['path'] == '') AND ( $new_location_info['host'] != '')) {
+		if (($new_location_info['path'] == '') && ( $new_location_info['host'] != '')) {
 			$newurl = $new_location_info['scheme'] . '://' . $new_location_info['host'] . $old_location_info['path'];
 		}
 
@@ -195,9 +216,8 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
 		if (preg_match('/(Location:|URI:)(.*?)\n/i', $header, $matches)) {
 			$newurl = trim(array_pop($matches));
 		}
-
-		if (strpos($newurl, '/') === 0) {
-			$newurl = $old_location_info['scheme'] . '://' . $old_location_info['host'] . $newurl;
+		if (strpos($newurl,'/') === 0) {
+			$newurl = $old_location_info["scheme"]."://".$old_location_info["host"].$newurl;
 		}
 
 		if (filter_var($newurl, FILTER_VALIDATE_URL)) {
@@ -220,8 +240,8 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
 	if (!$ret['success']) {
 		$ret['error'] = curl_error($ch);
 		$ret['debug'] = $curl_info;
-		logger('z_fetch_url: error: ' . $url . ': ' . $ret['error'], LOGGER_DEBUG);
-		logger('z_fetch_url: debug: ' . print_r($curl_info, true), LOGGER_DATA);
+		logger('z_fetch_url: error: '.$url.': '.$ret['return_code'].' - '.$ret['error'], LOGGER_DEBUG);
+		logger('z_fetch_url: debug: '.print_r($curl_info, true), LOGGER_DATA);
 	}
 
 	$ret['body'] = substr($s, strlen($header));
@@ -252,7 +272,7 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
 function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0) {
 	$stamp1 = microtime(true);
 
-	if (!check_domain_blocklist($url)) {
+	if (blocked_url($url)) {
 		logger('post_url: domain of ' . $url . ' is blocked', LOGGER_DATA);
 		return false;
 	}
@@ -272,10 +292,14 @@ function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
 	curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
 	curl_setopt($ch, CURLOPT_USERAGENT, $a->get_useragent());
 
+	if (Config::get('system', 'ipv4_resolve', false)) {
+		curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
+	}
+
 	if (intval($timeout)) {
 		curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
 	} else {
-		$curl_time = intval(get_config('system', 'curl_timeout'));
+		$curl_time = intval(Config::get('system', 'curl_timeout'));
 		curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
 	}
 
@@ -293,19 +317,19 @@ function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
 		curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
 	}
 
-	$check_cert = get_config('system', 'verifyssl');
+	$check_cert = Config::get('system', 'verifyssl');
 	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
 
 	if ($check_cert) {
 		@curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
 	}
 
-	$proxy = get_config('system', 'proxy');
+	$proxy = Config::get('system', 'proxy');
 
 	if (strlen($proxy)) {
 		curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
 		curl_setopt($ch, CURLOPT_PROXY, $proxy);
-		$proxyuser = get_config('system', 'proxyuser');
+		$proxyuser = Config::get('system', 'proxyuser');
 		if (strlen($proxyuser)) {
 			curl_setopt($ch, CURLOPT_PROXYUSERPWD, $proxyuser);
 		}
@@ -341,7 +365,7 @@ function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
 		$newurl = trim(array_pop($matches));
 
 		if (strpos($newurl, '/') === 0) {
-			$newurl = $old_location_info['scheme'] . '://' . $old_location_info['host'] . $newurl;
+			$newurl = $old_location_info["scheme"] . "://" . $old_location_info["host"] . $newurl;
 		}
 
 		if (filter_var($newurl, FILTER_VALIDATE_URL)) {
@@ -372,14 +396,22 @@ function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
 
 function xml_status($st, $message = '') {
 
-	$xml_message = ((strlen($message)) ? "\t<message>" . xmlify($message) . "</message>\r\n" : '');
+	$result = array('status' => $st);
+
+	if ($message != '') {
+		$result['message'] = $message;
+	}
 
-	if($st)
+	if ($st) {
 		logger('xml_status returning non_zero: ' . $st . " message=" . $message);
+	}
+
+	header("Content-type: text/xml");
+
+	$xmldata = array("result" => $result);
+
+	echo xml::from_array($xmldata, $xml);
 
-	header( "Content-type: text/xml" );
-	echo '<?xml version="1.0" encoding="UTF-8"?>'."\r\n";
-	echo "<result>\r\n\t<status>$st</status>\r\n$xml_message</result>\r\n";
 	killme();
 }
 
@@ -402,12 +434,12 @@ function xml_status($st, $message = '') {
  */
 function http_status_exit($val, $description = array()) {
 	$err = '';
-	if($val >= 400) {
+	if ($val >= 400) {
 		$err = 'Error';
 		if (!isset($description["title"]))
 			$description["title"] = $err." ".$val;
 	}
-	if($val >= 200 && $val < 300)
+	if ($val >= 200 && $val < 300)
 		$err = 'OK';
 
 	logger('http_status_exit ' . $val);
@@ -433,20 +465,20 @@ function http_status_exit($val, $description = array()) {
  * @return boolean True if it's a valid URL, fals if something wrong with it
  */
 function validate_url(&$url) {
-	if(get_config('system','disable_url_validation'))
+	if (Config::get('system','disable_url_validation'))
 		return true;
 
 	// no naked subdomains (allow localhost for tests)
-	if(strpos($url,'.') === false && strpos($url,'/localhost/') === false)
+	if (strpos($url,'.') === false && strpos($url,'/localhost/') === false)
 		return false;
 
-	if(substr($url,0,4) != 'http')
+	if (substr($url,0,4) != 'http')
 		$url = 'http://' . $url;
 
 	/// @TODO Really supress 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 + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
+	if ((is_array($h)) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
 		return true;
 	}
 
@@ -461,14 +493,14 @@ function validate_url(&$url) {
  */
 function validate_email($addr) {
 
-	if(get_config('system','disable_email_validation'))
+	if (Config::get('system','disable_email_validation'))
 		return true;
 
-	if(! strpos($addr,'@'))
+	if (! strpos($addr,'@'))
 		return false;
 	$h = substr($addr,strpos($addr,'@') + 1);
 
-	if(($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
+	if (($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
 		return true;
 	}
 	return false;
@@ -491,7 +523,7 @@ function allowed_url($url) {
 		return false;
 	}
 
-	$str_allowed = get_config('system', 'allowed_sites');
+	$str_allowed = Config::get('system', 'allowed_sites');
 	if (! $str_allowed) {
 		return true;
 	}
@@ -501,7 +533,6 @@ function allowed_url($url) {
 	$host = strtolower($h['host']);
 
 	// always allow our own site
-
 	if ($host == strtolower($_SERVER['SERVER_NAME'])) {
 		return true;
 	}
@@ -522,34 +553,33 @@ function allowed_url($url) {
 }
 
 /**
- * Checks if the provided url domain isn't on the domain blacklist.
- * Return true if the check passed (not on the blacklist), false if not
- * or malformed URL
+ * Checks if the provided url domain is on the domain blocklist.
+ * Returns true if it is or malformed URL, false if not.
  *
  * @param string $url The url to check the domain from
  * @return boolean
  */
-function check_domain_blocklist($url) {
+function blocked_url($url) {
 	$h = @parse_url($url);
 
 	if (! $h) {
-		return false;
+		return true;
 	}
 
-	$domain_blocklist = get_config('system', 'blocklist', array());
+	$domain_blocklist = Config::get('system', 'blocklist', array());
 	if (! $domain_blocklist) {
-		return true;
+		return false;
 	}
 
 	$host = strtolower($h['host']);
 
 	foreach ($domain_blocklist as $domain_block) {
 		if (strtolower($domain_block['domain']) == $host) {
-			return false;
+			return true;
 		}
 	}
 
-	return true;
+	return false;
 }
 
 /**
@@ -563,24 +593,25 @@ function check_domain_blocklist($url) {
  */
 function allowed_email($email) {
 
-
 	$domain = strtolower(substr($email,strpos($email,'@') + 1));
-	if(! $domain)
+	if (! $domain) {
 		return false;
+	}
 
-	$str_allowed = get_config('system','allowed_email');
-	if(! $str_allowed)
+	$str_allowed = Config::get('system','allowed_email');
+	if (! $str_allowed) {
 		return true;
+	}
 
 	$found = false;
 
 	$fnmatch = function_exists('fnmatch');
 	$allowed = explode(',',$str_allowed);
 
-	if(count($allowed)) {
-		foreach($allowed as $a) {
+	if (count($allowed)) {
+		foreach ($allowed as $a) {
 			$pat = strtolower(trim($a));
-			if(($fnmatch && fnmatch($pat,$domain)) || ($pat == $domain)) {
+			if (($fnmatch && fnmatch($pat,$domain)) || ($pat == $domain)) {
 				$found = true;
 				break;
 			}
@@ -599,7 +630,7 @@ function avatar_img($email) {
 	call_hooks('avatar_lookup', $avatar);
 
 	if (! $avatar['success']) {
-		$avatar['url'] = App::get_baseurl() . '/images/person-175.jpg';
+		$avatar['url'] = System::baseUrl() . '/images/person-175.jpg';
 	}
 
 	logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG);
@@ -607,20 +638,15 @@ function avatar_img($email) {
 }
 
 
-function parse_xml_string($s,$strict = true) {
+function parse_xml_string($s, $strict = true) {
+	// the "strict" parameter is deactivated
+
 	/// @todo Move this function to the xml class
-	if($strict) {
-		if(! strstr($s,'<?xml'))
-			return false;
-		$s2 = substr($s,strpos($s,'<?xml'));
-	}
-	else
-		$s2 = $s;
 	libxml_use_internal_errors(true);
 
-	$x = @simplexml_load_string($s2);
-	if (! $x) {
-		logger('libxml: parse: error: ' . $s2, LOGGER_DATA);
+	$x = @simplexml_load_string($s);
+	if (!$x) {
+		logger('libxml: parse: error: ' . $s, LOGGER_DATA);
 		foreach (libxml_get_errors() as $err) {
 			logger('libxml: parse: ' . $err->code." at ".$err->line.":".$err->column." : ".$err->message, LOGGER_DATA);
 		}
@@ -632,7 +658,7 @@ function parse_xml_string($s,$strict = true) {
 function scale_external_images($srctext, $include_link = true, $scale_replace = false) {
 
 	// Suppress "view full size"
-	if (intval(get_config('system','no_view_full_size'))) {
+	if (intval(Config::get('system','no_view_full_size'))) {
 		$include_link = false;
 	}
 
@@ -648,7 +674,7 @@ function scale_external_images($srctext, $include_link = true, $scale_replace =
 		foreach ($matches as $mtch) {
 			logger('scale_external_image: ' . $mtch[1]);
 
-			$hostname = str_replace('www.','',substr(App::get_baseurl(),strpos(App::get_baseurl(),'://')+3));
+			$hostname = str_replace('www.','',substr(System::baseUrl(),strpos(System::baseUrl(),'://')+3));
 			if (stristr($mtch[1],$hostname)) {
 				continue;
 			}
@@ -724,22 +750,10 @@ function fix_contact_ssl_policy(&$contact,$new_policy) {
 	}
 
 	if ($ssl_changed) {
-		q("UPDATE `contact` SET
-			`url` = '%s',
-			`request` = '%s',
-			`notify` = '%s',
-			`poll` = '%s',
-			`confirm` = '%s',
-			`poco` = '%s'
-			WHERE `id` = %d LIMIT 1",
-			dbesc($contact['url']),
-			dbesc($contact['request']),
-			dbesc($contact['notify']),
-			dbesc($contact['poll']),
-			dbesc($contact['confirm']),
-			dbesc($contact['poco']),
-			intval($contact['id'])
-		);
+		$fields = array('url' => $contact['url'], 'request' => $contact['request'],
+				'notify' => $contact['notify'], 'poll' => $contact['poll'],
+				'confirm' => $contact['confirm'], 'poco' => $contact['poco']);
+		dba::update('contact', $fields, array('id' => $contact['id']));
 	}
 }
 
@@ -834,8 +848,8 @@ function original_url($url, $depth = 1, $fetchbody = false) {
 	if ($http_code == 0)
 		return($url);
 
-	if ((($curl_info['http_code'] == "301") OR ($curl_info['http_code'] == "302"))
-		AND (($curl_info['redirect_url'] != "") OR ($curl_info['location'] != ""))) {
+	if ((($curl_info['http_code'] == "301") || ($curl_info['http_code'] == "302"))
+		&& (($curl_info['redirect_url'] != "") || ($curl_info['location'] != ""))) {
 		if ($curl_info['redirect_url'] != "")
 			return(original_url($curl_info['redirect_url'], ++$depth, $fetchbody));
 		else
@@ -851,7 +865,7 @@ function original_url($url, $depth = 1, $fetchbody = false) {
 		return($url);
 
 	// if it isn't a HTML file then exit
-	if (($curl_info["content_type"] != "") AND !strstr(strtolower($curl_info["content_type"]),"html"))
+	if (($curl_info["content_type"] != "") && !strstr(strtolower($curl_info["content_type"]),"html"))
 		return($url);
 
 	$stamp1 = microtime(true);
@@ -901,11 +915,11 @@ function original_url($url, $depth = 1, $fetchbody = false) {
 function short_link($url) {
 	require_once('library/slinky.php');
 	$slinky = new Slinky($url);
-	$yourls_url = get_config('yourls','url1');
+	$yourls_url = Config::get('yourls','url1');
 	if ($yourls_url) {
-		$yourls_username = get_config('yourls','username1');
-		$yourls_password = get_config('yourls', 'password1');
-		$yourls_ssl = get_config('yourls', 'ssl1');
+		$yourls_username = Config::get('yourls','username1');
+		$yourls_password = Config::get('yourls', 'password1');
+		$yourls_ssl = Config::get('yourls', 'ssl1');
 		$yourls = new Slinky_YourLS();
 		$yourls->set('username', $yourls_username);
 		$yourls->set('password', $yourls_password);
@@ -945,7 +959,7 @@ function json_return_and_die($x) {
  */
 function matching_url($url1, $url2) {
 
-	if (($url1 == "") OR ($url2 == ""))
+	if (($url1 == "") || ($url2 == ""))
 		return "";
 
 	$url1 = normalise_link($url1);
@@ -954,7 +968,7 @@ function matching_url($url1, $url2) {
 	$parts1 = parse_url($url1);
 	$parts2 = parse_url($url2);
 
-	if (!isset($parts1["host"]) OR !isset($parts2["host"]))
+	if (!isset($parts1["host"]) || !isset($parts2["host"]))
 		return "";
 
 	if ($parts1["scheme"] != $parts2["scheme"])
@@ -983,9 +997,40 @@ function matching_url($url1, $url2) {
 		if ($path1 == $path2)
 			$path .= $path1."/";
 
-	} while (($path1 == $path2) AND ($i++ <= count($pathparts1)));
+	} while (($path1 == $path2) && ($i++ <= count($pathparts1)));
 
 	$match .= $path;
 
 	return normalise_link($match);
 }
+
+/**
+ * @brief Glue url parts together
+ *
+ * @param array $parsed URL parts
+ *
+ * @return string The glued URL
+ */
+function unParseUrl($parsed) {
+	$get = function ($key) use ($parsed) {
+		return isset($parsed[$key]) ? $parsed[$key] : null;
+	};
+
+	$pass      = $get('pass');
+	$user      = $get('user');
+	$userinfo  = $pass !== null ? "$user:$pass" : $user;
+	$port      = $get('port');
+	$scheme    = $get('scheme');
+	$query     = $get('query');
+	$fragment  = $get('fragment');
+	$authority =
+		($userinfo !== null ? $userinfo."@" : '') .
+		$get('host') .
+		($port ? ":$port" : '');
+
+	return	(strlen($scheme) ? $scheme.":" : '') .
+		(strlen($authority) ? "//".$authority : '') .
+		$get('path') .
+		(strlen($query) ? "?".$query : '') .
+		(strlen($fragment) ? "#".$fragment : '');
+}