<?php
/**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
+use Friendica\DI;
use Friendica\Model\APContact;
use Friendica\Model\Contact;
use Friendica\Model\User;
return $isrequest;
}
- /**
- * Fetches ActivityPub content from the given url
- *
- * @param string $url content url
- * @param integer $uid User ID for the signature
- * @return array
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- */
- public static function fetchContent(string $url, int $uid = 0): array
- {
- return HTTPSignature::fetch($url, $uid);
- }
-
private static function getAccountType(array $apcontact): int
{
$accounttype = -1;
*/
public static function fetchOutbox(string $url, int $uid)
{
- $data = self::fetchContent($url, $uid);
+ $data = HTTPSignature::fetch($url, $uid);
if (empty($data)) {
return;
}
return [];
}
- $data = self::fetchContent($url, $uid);
+ $data = HTTPSignature::fetch($url, $uid);
if (empty($data)) {
return [];
}
return false;
}
- if (empty($apcontact['gsid'] || empty($apcontact['baseurl']))) {
+ if (empty($apcontact['gsid']) || empty($apcontact['baseurl'])) {
Logger::debug('No server found', ['uid' => $uid, 'signer' => $signer, 'called_by' => $called_by]);
return false;
}
return false;
}
- // @todo Look for user blocked domains
+ $limited = DI::config()->get('system', 'limited_servers');
+ if (!empty($limited)) {
+ $servers = explode(',', str_replace(' ', '', $limited));
+ $host = parse_url($apcontact['baseurl'], PHP_URL_HOST);
+ if (!empty($host) && in_array($host, $servers)) {
+ return false;
+ }
+ }
+
+ if (DI::userGServer()->isIgnoredByUser($uid, $apcontact['gsid'])) {
+ return false;
+ }
Logger::debug('Server is an accepted requester', ['uid' => $uid, 'id' => $apcontact['gsid'], 'url' => $apcontact['baseurl'], 'signer' => $signer, 'called_by' => $called_by]);