Merge pull request #13795 from annando/copyright

[friendica.git] / src / Protocol / ActivityPub.php

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index c27506ec1ef310501a6a377fef39d4b248f3d190..976a33b66e87f1ec874a2360c6a3247cb944d88b 100644 (file)
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -1,6 +1,6 @@
 <?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
  *
@@ -24,6 +24,7 @@ namespace Friendica\Protocol;
 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;
@@ -294,7 +295,7 @@ class ActivityPub
                        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;
                }
@@ -305,7 +306,18 @@ class ActivityPub
                        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]);