X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGServer.php;h=af03041498d56cdb2ecaa36bf9afc3e5ced9a880;hb=2e05dac7dae0a3d028b442a2d5afbd4176a32e99;hp=6a1a363e34f96580d991d74b6a8294e2d63715fd;hpb=acda145ceee17ea9bfc21b5733313547535fd10e;p=friendica.git

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index 6a1a363e34..af03041498 100644
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -32,7 +32,8 @@ use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Module\Register;
-use Friendica\Network\CurlResult;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
+use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
 use Friendica\Protocol\Relay;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
@@ -112,10 +113,37 @@ class GServer
 		if ($no_check || !self::check($url)) {
 			return null;
 		}
-	
+
 		return self::getID($url, true);
 	}
 
+	/**
+	 * Retrieves all the servers which base domain are matching the provided domain pattern
+	 *
+	 * The pattern is a simple fnmatch() pattern with ? for single wildcard and * for multiple wildcard
+	 *
+	 * @param string $pattern
+	 * @return array
+	 * @throws Exception
+	 */
+	public static function listByDomainPattern(string $pattern): array
+	{
+		$likePattern = 'http://' . strtr($pattern, ['_' => '\_', '%' => '\%', '?' => '_', '*' => '%']);
+
+		// The SUBSTRING_INDEX returns everything before the eventual third /, which effectively trims an
+		// eventual server path and keep only the server domain which we're matching against the pattern.
+		$sql = "SELECT `gserver`.*, COUNT(*) AS `contacts`
+			FROM `gserver`
+			LEFT JOIN `contact` ON `gserver`.`id` = `contact`.`gsid`
+			WHERE SUBSTRING_INDEX(`gserver`.`nurl`, '/', 3) LIKE ?
+			AND NOT `gserver`.`failed`
+			GROUP BY `gserver`.`id`";
+
+		$stmt = DI::dba()->p($sql, $likePattern);
+
+		return DI::dba()->toArray($stmt);
+	}
+
 	/**
 	 * Checks if the given server is reachable
 	 *
@@ -171,7 +199,7 @@ class GServer
 		if (($now - $contact_time) < (60 * 60 * 24)) {
 			return DateTimeFormat::utc('now +1 day');
 		}
-		
+
 		// If the last contact was less than a week before then try again in a week
 		if (($now - $contact_time) < (60 * 60 * 24 * 7)) {
 			return DateTimeFormat::utc('now +1 week');
@@ -314,7 +342,7 @@ class GServer
 
 		// When a nodeinfo is present, we don't need to dig further
 		$xrd_timeout = DI::config()->get('system', 'xrd_timeout');
-		$curlResult = DI::httpRequest()->get($url . '/.well-known/nodeinfo', ['timeout' => $xrd_timeout]);
+		$curlResult = DI::httpClient()->get($url . '/.well-known/nodeinfo', [HttpClientOptions::TIMEOUT => $xrd_timeout]);
 		if ($curlResult->isTimeout()) {
 			self::setFailure($url);
 			return false;
@@ -322,7 +350,7 @@ class GServer
 
 		// On a redirect follow the new host but mark the old one as failure
 		if ($curlResult->isSuccess() && (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
-			$curlResult = DI::httpRequest()->get($url, ['timeout' => $xrd_timeout]);
+			$curlResult = DI::httpClient()->get($url, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
 			if (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST)) {
 				Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $curlResult->getRedirectUrl()]);
 				self::setFailure($url);
@@ -358,7 +386,7 @@ class GServer
 					$basedata = ['detection-method' => self::DETECT_MANUAL];
 				}
 
-				$curlResult = DI::httpRequest()->get($baseurl, ['timeout' => $xrd_timeout]);
+				$curlResult = DI::httpClient()->get($baseurl, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
 				if ($curlResult->isSuccess()) {
 					if ((parse_url($baseurl, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
 						Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $curlResult->getRedirectUrl()]);
@@ -382,7 +410,7 @@ class GServer
 					// When the base path doesn't seem to contain a social network we try the complete path.
 					// Most detectable system have to be installed in the root directory.
 					// We checked the base to avoid false positives.
-					$curlResult = DI::httpRequest()->get($url, ['timeout' => $xrd_timeout]);
+					$curlResult = DI::httpClient()->get($url, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
 					if ($curlResult->isSuccess()) {
 						$urldata = self::analyseRootHeader($curlResult, $serverdata);
 						$urldata = self::analyseRootBody($curlResult, $urldata, $url);
@@ -526,7 +554,7 @@ class GServer
 	{
 		Logger::info('Discover relay data', ['server' => $server_url]);
 
-		$curlResult = DI::httpRequest()->get($server_url . '/.well-known/x-social-relay');
+		$curlResult = DI::httpClient()->get($server_url . '/.well-known/x-social-relay');
 		if (!$curlResult->isSuccess()) {
 			return;
 		}
@@ -621,7 +649,7 @@ class GServer
 	 */
 	private static function fetchStatistics(string $url)
 	{
-		$curlResult = DI::httpRequest()->get($url . '/statistics.json');
+		$curlResult = DI::httpClient()->get($url . '/statistics.json');
 		if (!$curlResult->isSuccess()) {
 			return [];
 		}
@@ -671,18 +699,19 @@ class GServer
 	/**
 	 * Detect server type by using the nodeinfo data
 	 *
-	 * @param string     $url        address of the server
-	 * @param CurlResult $curlResult
+	 * @param string                  $url        address of the server
+	 * @param ICanHandleHttpResponses $httpResult
+	 *
 	 * @return array Server data
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function fetchNodeinfo(string $url, CurlResult $curlResult)
+	private static function fetchNodeinfo(string $url, ICanHandleHttpResponses $httpResult)
 	{
-		if (!$curlResult->isSuccess()) {
+		if (!$httpResult->isSuccess()) {
 			return [];
 		}
 
-		$nodeinfo = json_decode($curlResult->getBody(), true);
+		$nodeinfo = json_decode($httpResult->getBody(), true);
 
 		if (!is_array($nodeinfo) || empty($nodeinfo['links'])) {
 			return [];
@@ -731,7 +760,7 @@ class GServer
 	 */
 	private static function parseNodeinfo1(string $nodeinfo_url)
 	{
-		$curlResult = DI::httpRequest()->get($nodeinfo_url);
+		$curlResult = DI::httpClient()->get($nodeinfo_url);
 
 		if (!$curlResult->isSuccess()) {
 			return [];
@@ -802,13 +831,14 @@ class GServer
 	/**
 	 * Parses Nodeinfo 2
 	 *
+	 * @see https://git.feneas.org/jaywink/nodeinfo2
 	 * @param string $nodeinfo_url address of the nodeinfo path
 	 * @return array Server data
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function parseNodeinfo2(string $nodeinfo_url)
 	{
-		$curlResult = DI::httpRequest()->get($nodeinfo_url);
+		$curlResult = DI::httpClient()->get($nodeinfo_url);
 		if (!$curlResult->isSuccess()) {
 			return [];
 		}
@@ -850,7 +880,9 @@ class GServer
 		if (!empty($nodeinfo['protocols'])) {
 			$protocols = [];
 			foreach ($nodeinfo['protocols'] as $protocol) {
-				$protocols[$protocol] = true;
+				if (is_string($protocol)) {
+					$protocols[$protocol] = true;
+				}
 			}
 
 			if (!empty($protocols['dfrn'])) {
@@ -885,7 +917,7 @@ class GServer
 	 */
 	private static function fetchSiteinfo(string $url, array $serverdata)
 	{
-		$curlResult = DI::httpRequest()->get($url . '/siteinfo.json');
+		$curlResult = DI::httpClient()->get($url . '/siteinfo.json');
 		if (!$curlResult->isSuccess()) {
 			return $serverdata;
 		}
@@ -954,7 +986,7 @@ class GServer
 	private static function validHostMeta(string $url)
 	{
 		$xrd_timeout = DI::config()->get('system', 'xrd_timeout');
-		$curlResult = DI::httpRequest()->get($url . '/.well-known/host-meta', ['timeout' => $xrd_timeout]);
+		$curlResult = DI::httpClient()->get($url . '/.well-known/host-meta', [HttpClientOptions::TIMEOUT => $xrd_timeout]);
 		if (!$curlResult->isSuccess()) {
 			return false;
 		}
@@ -1044,7 +1076,7 @@ class GServer
 	{
 		$serverdata['poco'] = '';
 
-		$curlResult = DI::httpRequest()->get($url . '/poco');
+		$curlResult = DI::httpClient()->get($url . '/poco');
 		if (!$curlResult->isSuccess()) {
 			return $serverdata;
 		}
@@ -1074,7 +1106,7 @@ class GServer
 	 */
 	public static function checkMastodonDirectory(string $url, array $serverdata)
 	{
-		$curlResult = DI::httpRequest()->get($url . '/api/v1/directory?limit=1');
+		$curlResult = DI::httpClient()->get($url . '/api/v1/directory?limit=1');
 		if (!$curlResult->isSuccess()) {
 			return $serverdata;
 		}
@@ -1101,7 +1133,7 @@ class GServer
 	 */
 	private static function detectPeertube(string $url, array $serverdata)
 	{
-		$curlResult = DI::httpRequest()->get($url . '/api/v1/config');
+		$curlResult = DI::httpClient()->get($url . '/api/v1/config');
 
 		if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
 			return $serverdata;
@@ -1149,7 +1181,7 @@ class GServer
 	 */
 	private static function detectNextcloud(string $url, array $serverdata)
 	{
-		$curlResult = DI::httpRequest()->get($url . '/status.php');
+		$curlResult = DI::httpClient()->get($url . '/status.php');
 
 		if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
 			return $serverdata;
@@ -1183,7 +1215,7 @@ class GServer
 	 */
 	private static function detectMastodonAlikes(string $url, array $serverdata)
 	{
-		$curlResult = DI::httpRequest()->get($url . '/api/v1/instance');
+		$curlResult = DI::httpClient()->get($url . '/api/v1/instance');
 
 		if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
 			return $serverdata;
@@ -1249,7 +1281,7 @@ class GServer
 	 */
 	private static function detectHubzilla(string $url, array $serverdata)
 	{
-		$curlResult = DI::httpRequest()->get($url . '/api/statusnet/config.json');
+		$curlResult = DI::httpClient()->get($url . '/api/statusnet/config.json');
 		if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
 			return $serverdata;
 		}
@@ -1347,7 +1379,7 @@ class GServer
 	private static function detectGNUSocial(string $url, array $serverdata)
 	{
 		// Test for GNU Social
-		$curlResult = DI::httpRequest()->get($url . '/api/gnusocial/version.json');
+		$curlResult = DI::httpClient()->get($url . '/api/gnusocial/version.json');
 		if ($curlResult->isSuccess() && ($curlResult->getBody() != '{"error":"not implemented"}') &&
 			($curlResult->getBody() != '') && (strlen($curlResult->getBody()) < 30)) {
 			$serverdata['platform'] = 'gnusocial';
@@ -1360,12 +1392,12 @@ class GServer
 			if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
 				$serverdata['detection-method'] = self::DETECT_GNUSOCIAL;
 			}
-	
+
 			return $serverdata;
 		}
 
 		// Test for Statusnet
-		$curlResult = DI::httpRequest()->get($url . '/api/statusnet/version.json');
+		$curlResult = DI::httpClient()->get($url . '/api/statusnet/version.json');
 		if ($curlResult->isSuccess() && ($curlResult->getBody() != '{"error":"not implemented"}') &&
 			($curlResult->getBody() != '') && (strlen($curlResult->getBody()) < 30)) {
 
@@ -1401,9 +1433,9 @@ class GServer
 	 */
 	private static function detectFriendica(string $url, array $serverdata)
 	{
-		$curlResult = DI::httpRequest()->get($url . '/friendica/json');
+		$curlResult = DI::httpClient()->get($url . '/friendica/json');
 		if (!$curlResult->isSuccess()) {
-			$curlResult = DI::httpRequest()->get($url . '/friendika/json');
+			$curlResult = DI::httpClient()->get($url . '/friendika/json');
 			$friendika = true;
 			$platform = 'Friendika';
 		} else {
@@ -1420,7 +1452,7 @@ class GServer
 			return $serverdata;
 		}
 
-		if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {			
+		if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
 			$serverdata['detection-method'] = $friendika ? self::DETECT_FRIENDIKA : self::DETECT_FRIENDICA;
 		}
 
@@ -1615,11 +1647,11 @@ class GServer
 		} elseif ($curlResult->inHeader('x-diaspora-version')) {
 			$serverdata['platform'] = 'diaspora';
 			$serverdata['network'] = Protocol::DIASPORA;
-			$serverdata['version'] = $curlResult->getHeader('x-diaspora-version');
+			$serverdata['version'] = $curlResult->getHeader('x-diaspora-version')[0] ?? '';
 		} elseif ($curlResult->inHeader('x-friendica-version')) {
 			$serverdata['platform'] = 'friendica';
 			$serverdata['network'] = Protocol::DFRN;
-			$serverdata['version'] = $curlResult->getHeader('x-friendica-version');
+			$serverdata['version'] = $curlResult->getHeader('x-friendica-version')[0] ?? '';
 		} else {
 			return $serverdata;
 		}
@@ -1662,13 +1694,9 @@ class GServer
 
 		$last_update = date('c', time() - (60 * 60 * 24 * $requery_days));
 
-		$gservers = DBA::p("SELECT `id`, `url`, `nurl`, `network`, `poco`, `directory-type`
-			FROM `gserver`
-			WHERE NOT `failed`
-			AND `directory-type` != ?
-			AND `last_poco_query` < ?
-			ORDER BY RAND()", self::DT_NONE, $last_update
-		);
+		$gservers = DBA::select('gserver', ['id', 'url', 'nurl', 'network', 'poco', 'directory-type'],
+			["NOT `failed` AND `directory-type` != ? AND `last_poco_query` < ?", GServer::DT_NONE, $last_update],
+			['order' => ['RAND()']]);
 
 		while ($gserver = DBA::fetch($gservers)) {
 			Logger::info('Update peer list', ['server' => $gserver['url'], 'id' => $gserver['id']]);
@@ -1679,7 +1707,7 @@ class GServer
 
 			$fields = ['last_poco_query' => DateTimeFormat::utcNow()];
 			DBA::update('gserver', $fields, ['nurl' => $gserver['nurl']]);
-	
+
 			if (--$no_of_queries == 0) {
 				break;
 			}
@@ -1707,7 +1735,7 @@ class GServer
 		$protocols = ['activitypub', 'diaspora', 'dfrn', 'ostatus'];
 		foreach ($protocols as $protocol) {
 			$query = '{nodes(protocol:"' . $protocol . '"){host}}';
-			$curlResult = DI::httpRequest()->fetch('https://the-federation.info/graphql?query=' . urlencode($query));
+			$curlResult = DI::httpClient()->fetch('https://the-federation.info/graphql?query=' . urlencode($query));
 			if (!empty($curlResult)) {
 				$data = json_decode($curlResult, true);
 				if (!empty($data['data']['nodes'])) {
@@ -1724,8 +1752,7 @@ class GServer
 
 		if (!empty($accesstoken)) {
 			$api = 'https://instances.social/api/1.0/instances/list?count=0';
-			$header = ['Authorization: Bearer '.$accesstoken];
-			$curlResult = DI::httpRequest()->get($api, ['header' => $header]);
+			$curlResult = DI::httpClient()->get($api, [HttpClientOptions::HEADERS => ['Authorization' => ['Bearer ' . $accesstoken]]]);
 
 			if ($curlResult->isSuccess()) {
 				$servers = json_decode($curlResult->getBody(), true);
@@ -1745,8 +1772,8 @@ class GServer
 	 *
 	 * @param int $gsid     Server id
 	 * @param int $protocol Protocol id
-	 * @return void 
-	 * @throws Exception 
+	 * @return void
+	 * @throws Exception
 	 */
 	public static function setProtocol(int $gsid, int $protocol)
 	{
@@ -1805,8 +1832,8 @@ class GServer
 	 * Fetch the protocol of the given server
 	 *
 	 * @param int $gsid Server id
-	 * @return int 
-	 * @throws Exception 
+	 * @return int
+	 * @throws Exception
 	 */
 	public static function getProtocol(int $gsid)
 	{