Standards

[friendica.git] / src / Model / User.php

diff --git a/src/Model/User.php b/src/Model/User.php
index 8a9f0a93042737cb1efa63952c10f1fbb05b4421..14f40662b2ea162dcf36689cb579cd731e9ae17b 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -312,8 +312,8 @@ class User
         */
        public static function getIdForURL(string $url)
        {
-               // Avoid any database requests when the hostname isn't even part of the url.
-               if (!strpos($url, DI::baseUrl()->getHostname())) {
+               // Avoid database queries when the local node hostname isn't even part of the url.
+               if (!Contact::isLocal($url)) {
                        return 0;
                }
 
@@ -391,7 +391,12 @@ class User
                        if (!DBA::exists('user', ['uid' => $uid]) || !$repairMissing) {
                                return false;
                        }
-                       Contact::createSelfFromUserId($uid);
+                       if (!DBA::exists('profile', ['uid' => $uid])) {
+                               DBA::insert('profile', ['uid' => $uid]);
+                       }
+                       if (!DBA::exists('contact', ['uid' => $uid, 'self' => true])) {
+                               Contact::createSelfFromUserId($uid);
+                       }
                        $owner = self::getOwnerDataById($uid, false);
                }
 
@@ -523,19 +528,18 @@ class User
                try {
                        $user = self::getAuthenticationInfo($user_info);
                } catch (Exception $e) {
-                       // Addons can create users, and creating a numeric username would create
+                       $username = (is_string($user_info) ? $user_info : $user_info['nickname'] ?? '');
+
+                       // Addons can create users, and since this 'catch' branch should only
+                       // execute if getAuthenticationInfo can't find an existing user, that's
+                       // exactly what will happen here. Creating a numeric username would create
                        // abiguity with user IDs, possibly opening up an attack vector.
                        // So let's be very careful about that.
-                       if (is_numeric($user_info) || is_numeric($user_info['nickname'] ?? '')) {
+                       if (empty($username) || is_numeric($username)) {
                                throw $e;
                        }
 
-                       $username = (is_string($user_info) ? $user_info : $user_info['nickname'] ?? '');
-
-                       if (!$username) {
-                               throw $e;
-                       }
-                       return self::getIdFromAuthenticateHooks($user_info, $password);
+                       return self::getIdFromAuthenticateHooks($username, $password);
                }
 
                if ($third_party && DI::pConfig()->get($user['uid'], '2fa', 'verified')) {
@@ -582,7 +586,8 @@ class User
         * @return int User Id if authentication is successful
         * @throws HTTPException\ForbiddenException
         */
-       public static function getIdFromAuthenticateHooks($username, $password) {
+       public static function getIdFromAuthenticateHooks($username, $password)
+       {
                $addon_auth = [
                        'username'      => $username,
                        'password'      => $password,
@@ -1123,6 +1128,8 @@ class User
                                        Photo::update(['profile' => 1], ['resource-id' => $resource_id]);
                                }
                        }
+
+                       Contact::updateSelfFromUserID($uid, true);
                }
 
                Hook::callAll('register_account', $uid);
@@ -1131,6 +1138,42 @@ class User
                return $return;
        }
 
+       /**
+        * Update a user entry and distribute the changes if needed
+        *
+        * @param array $fields
+        * @param integer $uid
+        * @return boolean
+        */
+       public static function update(array $fields, int $uid): bool
+       {
+               $old_owner = self::getOwnerDataById($uid);
+               if (empty($old_owner)) {
+                       return false;
+               }
+
+               if (!DBA::update('user', $fields, ['uid' => $uid])) {
+                       return false;
+               }
+
+               $update = Contact::updateSelfFromUserID($uid);
+
+               $owner = self::getOwnerDataById($uid);
+               if (empty($owner)) {
+                       return false;
+               }
+
+               if ($old_owner['name'] != $owner['name']) {
+                       Profile::update(['name' => $owner['name']], $uid);
+               }
+
+               if ($update) {
+                       Profile::publishUpdate($uid);
+               }
+
+               return true;
+       }
+
        /**
         * Sets block state for a given user
         *
@@ -1462,6 +1505,10 @@ class User
         */
        public static function identities($uid)
        {
+               if (empty($uid)) {
+                       return [];
+               }
+
                $identities = [];
 
                $user = DBA::selectFirst('user', ['uid', 'nickname', 'username', 'parent-uid'], ['uid' => $uid]);