Merge pull request #10323 from annando/issue-10306

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

diff --git a/src/Model/User.php b/src/Model/User.php
index 4b716f260632dc92ff975c98b1bf79a191421f1f..2131406d4a5f8cf2be7432c66b57f2839936224c 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;
                }
 
@@ -523,11 +523,18 @@ class User
                try {
                        $user = self::getAuthenticationInfo($user_info);
                } catch (Exception $e) {
-                       if (is_string($user_info)) {
-                               return self::getIdFromAuthenticateHooks($user_info, $password);
-                       } else {
+                       $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 (empty($username) || is_numeric($username)) {
                                throw $e;
                        }
+
+                       return self::getIdFromAuthenticateHooks($username, $password);
                }
 
                if ($third_party && DI::pConfig()->get($user['uid'], '2fa', 'verified')) {
@@ -574,7 +581,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,
@@ -590,7 +598,7 @@ class User
                Hook::callAll('authenticate', $addon_auth);
 
                if ($addon_auth['authenticated'] && $addon_auth['user_record']) {
-                       return $user['uid'];
+                       return $addon_auth['user_record']['uid'];
                }
 
                throw new HTTPException\ForbiddenException(DI::l10n()->t('Login failed'));