AP: Always sign requests

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 6567e5e2605d9c4f530c2fb1a44d1981c01a9733..b6f8ffa3d1665e5950aa3b69e9dbb05a868fea50 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -3705,8 +3705,10 @@ class Item
         */
        public static function fetchByLink(string $uri, int $uid = 0)
        {
+               Logger::info('Trying to fetch link', ['uid' => $uid, 'uri' => $uri]);
                $item_id = self::searchByLink($uri, $uid);
                if (!empty($item_id)) {
+                       Logger::info('Link found', ['uid' => $uid, 'uri' => $uri, 'id' => $item_id]);
                        return $item_id;
                }
 
@@ -3717,9 +3719,11 @@ class Item
                }
 
                if (!empty($item_id)) {
+                       Logger::info('Link fetched', ['uid' => $uid, 'uri' => $uri, 'id' => $item_id]);
                        return $item_id;
                }
 
+               Logger::info('Link not found', ['uid' => $uid, 'uri' => $uri]);
                return 0;
        }
 

diff --git a/src/Model/User.php b/src/Model/User.php
index 78ae95804122d062a1263163936ca6a362314c1d..0317edf9bf1c10159a53a72849318cd4c056b534 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -185,6 +185,29 @@ class User
                return DBA::selectFirst('user', $fields, ['email' => $email]);
        }
 
+       /**
+        * Fetch the user array of the administrator. The first one if there are several.
+        *
+        * @param array $fields
+        * @return array user
+        */
+       public static function getFirstAdmin(array $fields = [])
+       {
+               $condition = [];
+               if (!empty(DI::config()->get('config', 'admin_nickname'))) {
+                       $condition['nickname'] = DI::config()->get('config', 'admin_nickname');
+               }
+               if (!empty(DI::config()->get('config', 'admin_email'))) {
+                       $adminList = explode(',', str_replace(' ', '', DI::config()->get('config', 'admin_email')));
+                       $condition['email'] = $adminList[0];
+                       $administrator = self::getByEmail($adminList[0], $fields);
+                       if (!empty($administrator)) {
+                               return $administrator;
+                       }
+               }
+               return [];
+       }
+
        /**
         * Get owner data by user id
         *

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 3325b1ae82bfc283029956137d784bfa0fd47b41..ea693ce2752be74f9ae4f4538b40aa59296e327c 100644 (file)
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -130,21 +130,13 @@ class Friendica extends BaseModule
                        $register_policy = $register_policies[$register_policy_int];
                }
 
-               $condition = [];
-               $admin = false;
-               if (!empty($config->get('config', 'admin_nickname'))) {
-                       $condition['nickname'] = $config->get('config', 'admin_nickname');
-               }
-               if (!empty($config->get('config', 'admin_email'))) {
-                       $adminList = explode(',', str_replace(' ', '', $config->get('config', 'admin_email')));
-                       $condition['email'] = $adminList[0];
-                       $administrator = User::getByEmail($adminList[0], ['username', 'nickname']);
-                       if (!empty($administrator)) {
-                               $admin = [
-                                       'name'    => $administrator['username'],
-                                       'profile' => DI::baseUrl()->get() . '/profile/' . $administrator['nickname'],
-                               ];
-                       }
+               $admin = [];
+               $administrator = User::getFirstAdmin(['username', 'nickname']);
+               if (!empty($administrator)) {
+                       $admin = [
+                               'name'    => $administrator['username'],
+                               'profile' => DI::baseUrl()->get() . '/profile/' . $administrator['nickname'],
+                       ];
                }
 
                $visible_addons = Addon::getVisibleList();

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index 3c4f4f2e67f6be61aa5e7588f74586572c6fa7d9..c04b9e592debc183f60930959c7e5b7b46086c24 100644 (file)
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -22,6 +22,7 @@
 namespace Friendica\Protocol;
 
 use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\User;
@@ -89,22 +90,21 @@ class ActivityPub
         */
        public static function fetchContent(string $url, int $uid = 0)
        {
-               if (!empty($uid)) {
-                       return HTTPSignature::fetch($url, $uid);
-               }
-
-               $curlResult = DI::httpRequest()->get($url, false, ['accept_content' => 'application/activity+json, application/ld+json']);
-               if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
-                       return false;
-               }
-
-               $content = json_decode($curlResult->getBody(), true);
+               if (empty($uid)) {
+                       $user = User::getFirstAdmin(['uid']);
+               
+                       if (empty($user['uid'])) {
+                               // When the system setup is missing an admin we just take the first user
+                               $condition = ['verified' => true, 'blocked' => false, 'account_removed' => false, 'account_expired' => false];
+                               $user = DBA::selectFirst('user', ['uid'], $condition);
+                       }
 
-               if (empty($content) || !is_array($content)) {
-                       return false;
+                       if (!empty($user['uid'])) {
+                               $uid = $user['uid'];
+                       }
                }
 
-               return $content;
+               return HTTPSignature::fetch($url, $uid);
        }
 
        private static function getAccountType($apcontact)