X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=23c115eaba2035e1e405690de128a6926f07ae36;hb=7cdd2d1336e768def2f9b2dc1d4026f8d9bb3804;hp=c547afcd4d0655ded20d6a121839458db3cd3786;hpb=06371d29a679e3eed2a4c5cbb7b2b15ee82ede23;p=friendica.git

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index c547afcd4d..23c115eaba 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -101,7 +101,7 @@ class Probe
 			if (isset($data[$field])) {
 				if (in_array($field, $numeric_fields)) {
 					$newdata[$field] = (int)$data[$field];
-				} else {	
+				} else {
 					$newdata[$field] = $data[$field];
 				}
 			} elseif (!in_array($field, $numeric_fields)) {
@@ -170,7 +170,7 @@ class Probe
 		Logger::info('Probing', ['host' => $host, 'ssl_url' => $ssl_url, 'url' => $url, 'callstack' => System::callstack(20)]);
 		$xrd = null;
 
-		$curlResult = DI::httpRequest()->get($ssl_url, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+		$curlResult = DI::httpClient()->get($ssl_url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
 		$ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
 		if ($curlResult->isSuccess()) {
 			$xml = $curlResult->getBody();
@@ -187,7 +187,7 @@ class Probe
 		}
 
 		if (!is_object($xrd) && !empty($url)) {
-			$curlResult = DI::httpRequest()->get($url, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+			$curlResult = DI::httpClient()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
 			$connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
 			if ($curlResult->isTimeout()) {
 				Logger::info('Probing timeout', ['url' => $url]);
@@ -231,6 +231,11 @@ class Probe
 			}
 		}
 
+		if (Network::isUrlBlocked($host_url)) {
+			Logger::info('Domain is blocked', ['url' => $host]);
+			return [];
+		}
+
 		self::$baseurl = $host_url;
 
 		Logger::info('Probing successful', ['host' => $host]);
@@ -424,16 +429,11 @@ class Probe
 	 */
 	private static function getHideStatus($url)
 	{
-		$curlResult = DI::httpRequest()->get($url, false, ['content_length' => 1000000]);
+		$curlResult = DI::httpClient()->get($url, [HTTPClientOptions::CONTENT_LENGTH => 1000000]);
 		if (!$curlResult->isSuccess()) {
 			return false;
 		}
 
-		// If the file is too large then exit
-		if (($curlResult->getInfo()['download_content_length'] ?? 0) > 1000000) {
-			return false;
-		}
-
 		// If it isn't a HTML file then exit
 		if (($curlResult->getContentType() != '') && !strstr(strtolower($curlResult->getContentType()), 'html')) {
 			return false;
@@ -630,6 +630,11 @@ class Probe
 	 */
 	private static function getWebfinger(string $template, string $type, string $uri, string $addr)
 	{
+		if (Network::isUrlBlocked($template)) {
+			Logger::info('Domain is blocked', ['url' => $template]);
+			return [];
+		}
+
 		// First try the address because this is the primary purpose of webfinger
 		if (!empty($addr)) {
 			$detected = $addr;
@@ -848,7 +853,7 @@ class Probe
 
 	public static function pollZot($url, $data)
 	{
-		$curlResult = DI::httpRequest()->get($url);
+		$curlResult = DI::httpClient()->get($url);
 		if ($curlResult->isTimeout()) {
 			return $data;
 		}
@@ -945,7 +950,7 @@ class Probe
 	{
 		$xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20);
 
-		$curlResult = DI::httpRequest()->get($url, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
+		$curlResult = DI::httpClient()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => [$type]]);
 		if ($curlResult->isTimeout()) {
 			self::$istimeout = true;
 			return [];
@@ -1014,7 +1019,7 @@ class Probe
 	 */
 	private static function pollNoscrape($noscrape_url, $data)
 	{
-		$curlResult = DI::httpRequest()->get($noscrape_url);
+		$curlResult = DI::httpClient()->get($noscrape_url);
 		if ($curlResult->isTimeout()) {
 			self::$istimeout = true;
 			return $data;
@@ -1280,7 +1285,7 @@ class Probe
 	 */
 	private static function pollHcard($hcard_url, $data, $dfrn = false)
 	{
-		$curlResult = DI::httpRequest()->get($hcard_url);
+		$curlResult = DI::httpClient()->get($hcard_url);
 		if ($curlResult->isTimeout()) {
 			self::$istimeout = true;
 			return [];
@@ -1541,7 +1546,7 @@ class Probe
 							$pubkey = substr($pubkey, 5);
 						}
 					} elseif (Strings::normaliseLink($pubkey) == 'http://') {
-						$curlResult = DI::httpRequest()->get($pubkey);
+						$curlResult = DI::httpClient()->get($pubkey);
 						if ($curlResult->isTimeout()) {
 							self::$istimeout = true;
 							return $short ? false : [];
@@ -1575,7 +1580,7 @@ class Probe
 		}
 
 		// Fetch all additional data from the feed
-		$curlResult = DI::httpRequest()->get($data["poll"]);
+		$curlResult = DI::httpClient()->get($data["poll"]);
 		if ($curlResult->isTimeout()) {
 			self::$istimeout = true;
 			return [];
@@ -1627,7 +1632,7 @@ class Probe
 	 */
 	private static function pumpioProfileData($profile_link)
 	{
-		$curlResult = DI::httpRequest()->get($profile_link);
+		$curlResult = DI::httpClient()->get($profile_link);
 		if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
 			return [];
 		}
@@ -1867,7 +1872,7 @@ class Probe
 	 */
 	private static function feed($url, $probe = true)
 	{
-		$curlResult = DI::httpRequest()->get($url);
+		$curlResult = DI::httpClient()->get($url);
 		if ($curlResult->isTimeout()) {
 			self::$istimeout = true;
 			return [];
@@ -2091,7 +2096,7 @@ class Probe
 			return '';
 		}
 
-		$curlResult = DI::httpRequest()->get($gserver['noscrape'] . '/' . $data['nick']);
+		$curlResult = DI::httpClient()->get($gserver['noscrape'] . '/' . $data['nick']);
 
 		if ($curlResult->isSuccess() && !empty($curlResult->getBody())) {
 			$noscrape = json_decode($curlResult->getBody(), true);
@@ -2166,7 +2171,7 @@ class Probe
 	private static function updateFromFeed(array $data)
 	{
 		// Search for the newest entry in the feed
-		$curlResult = DI::httpRequest()->get($data['poll']);
+		$curlResult = DI::httpClient()->get($data['poll']);
 		if (!$curlResult->isSuccess() || !$curlResult->getBody()) {
 			return '';
 		}
@@ -2224,29 +2229,29 @@ class Probe
 				throw new HTTPException\NotFoundException('User not found.');
 			}
 
-			$profile   = User::getOwnerDataById($uid);
+			$owner     = User::getOwnerDataById($uid);
 			$approfile = ActivityPub\Transmitter::getProfile($uid);
 
-			if (empty($profile['gsid'])) {
-				$profile['gsid'] = GServer::getID($approfile['generator']['url']);
+			if (empty($owner['gsid'])) {
+				$owner['gsid'] = GServer::getID($approfile['generator']['url']);
 			}
 
 			$data = [
-				'name' => $profile['name'], 'nick' => $profile['nick'], 'guid' => $approfile['diaspora:guid'] ?? '',
-				'url' => $profile['url'], 'addr' => $profile['addr'], 'alias' => $profile['alias'],
-				'photo' => Contact::getAvatarUrlForId($profile['id'], '', $profile['updated']),
-				'header' => $profile['header'] ? Contact::getHeaderUrlForId($profile['id'], $profile['updated']) : '',
-				'account-type' => $profile['contact-type'], 'community' => ($profile['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
-				'keywords' => $profile['keywords'], 'location' => $profile['location'], 'about' => $profile['about'],
-				'xmpp' => $profile['xmpp'], 'matrix' => $profile['matrix'], 
-				'hide' => !$profile['net-publish'], 'batch' => '', 'notify' => $profile['notify'],
-				'poll' => $profile['poll'], 'request' => $profile['request'], 'confirm' => $profile['confirm'],
-				'subscribe' => $approfile['generator']['url'] . '/follow?url={uri}', 'poco' => $profile['poco'],
+				'name' => $owner['name'], 'nick' => $owner['nick'], 'guid' => $approfile['diaspora:guid'] ?? '',
+				'url' => $owner['url'], 'addr' => $owner['addr'], 'alias' => $owner['alias'],
+				'photo' => User::getAvatarUrl($owner),
+				'header' => $owner['header'] ? Contact::getHeaderUrlForId($owner['id'], $owner['updated']) : '',
+				'account-type' => $owner['contact-type'], 'community' => ($owner['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
+				'keywords' => $owner['keywords'], 'location' => $owner['location'], 'about' => $owner['about'],
+				'xmpp' => $owner['xmpp'], 'matrix' => $owner['matrix'],
+				'hide' => !$owner['net-publish'], 'batch' => '', 'notify' => $owner['notify'],
+				'poll' => $owner['poll'], 'request' => $owner['request'], 'confirm' => $owner['confirm'],
+				'subscribe' => $approfile['generator']['url'] . '/follow?url={uri}', 'poco' => $owner['poco'],
 				'following' => $approfile['following'], 'followers' => $approfile['followers'],
 				'inbox' => $approfile['inbox'], 'outbox' => $approfile['outbox'],
 				'sharedinbox' => $approfile['endpoints']['sharedInbox'], 'network' => Protocol::DFRN,
-				'pubkey' => $profile['upubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $profile['gsid'],
-				'manually-approve' => in_array($profile['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP])
+				'pubkey' => $owner['upubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $owner['gsid'],
+				'manually-approve' => in_array($owner['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP])
 			];
 		} catch (Exception $e) {
 			// Default values for non existing targets