Merge remote-tracking branch 'upstream/2023.09-rc' into smilies

[friendica.git] / src / Module / OAuth / Token.php

diff --git a/src/Module/OAuth/Token.php b/src/Module/OAuth/Token.php
index 21c18d47c6020a90129137f629a8b26f164929c9..61a7f22889e5bd5ed09f2afa4e252008a2da8ade 100644 (file)
--- a/src/Module/OAuth/Token.php
+++ b/src/Module/OAuth/Token.php
@@ -25,10 +25,12 @@ use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\User;
 use Friendica\Module\BaseApi;
 use Friendica\Module\Special\HTTPException;
 use Friendica\Security\OAuth;
 use Friendica\Util\DateTimeFormat;
+use GuzzleHttp\Psr7\Uri;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -60,7 +62,7 @@ class Token extends BaseApi
                        $authorization = $_SERVER['REDIRECT_REMOTE_USER'] ?? '';
                }
 
-               if (empty($request['client_id']) && substr($authorization, 0, 6) == 'Basic ') {
+               if ((empty($request['client_id']) || empty($request['client_secret'])) && substr($authorization, 0, 6) == 'Basic ') {
                        // Per RFC2617, usernames can't contain a colon but password can,
                        // so we cut on the first colon to obtain the username and the password
                        // @see https://www.rfc-editor.org/rfc/rfc2617#section-2
@@ -71,8 +73,7 @@ class Token extends BaseApi
                        }
                }
 
-               // "client_secret" is required for "client_credentials": https://www.oauth.com/oauth2-servers/access-tokens/client-credentials/
-               if (empty($request['client_id']) || (($request['grant_type'] == 'client_credentials') && empty($request['client_secret']))) {
+               if (empty($request['client_id']) || empty($request['client_secret'])) {
                        Logger::warning('Incomplete request data', ['request' => $request]);
                        DI::mstdnError()->Unauthorized('invalid_client', DI::l10n()->t('Incomplete request data'));
                }
@@ -86,23 +87,29 @@ class Token extends BaseApi
                        // the "client_credentials" are used as a token for the application itself.
                        // see https://aaronparecki.com/oauth-2-simplified/#client-credentials
                        $token = OAuth::createTokenForUser($application, 0, '');
+                       $me = null;
                } elseif ($request['grant_type'] == 'authorization_code') {
                        // For security reasons only allow freshly created tokens
-                       $condition = ["`redirect_uri` = ? AND `id` = ? AND `code` = ? AND `created_at` > ?",
-                               $request['redirect_uri'], $application['id'], $request['code'], DateTimeFormat::utc('now - 5 minutes')];
+                       $uri = new Uri($request['redirect_uri']);
+                       $condition = [
+                               "`redirect_uri` LIKE ? AND `id` = ? AND `code` = ? AND `created_at` > ?",
+                               '%' . $uri->getScheme() . '://' . $uri->getHost() . $uri->getPath() . '%', $application['id'], $request['code'], DateTimeFormat::utc('now - 5 minutes')
+                       ];
 
-                       $token = DBA::selectFirst('application-view', ['access_token', 'created_at'], $condition);
+                       $token = DBA::selectFirst('application-view', ['access_token', 'created_at', 'uid'], $condition);
                        if (!DBA::isResult($token)) {
                                Logger::notice('Token not found or outdated', $condition);
                                DI::mstdnError()->Unauthorized();
                        }
+                       $owner = User::getOwnerDataById($token['uid']);
+                       $me = $owner['url'];
                } else {
                        Logger::warning('Unsupported or missing grant type', ['request' => $_REQUEST]);
                        DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Unsupported or missing grant type'));
                }
 
-               $object = new \Friendica\Object\Api\Mastodon\Token($token['access_token'], 'Bearer', $application['scopes'], $token['created_at']);
+               $object = new \Friendica\Object\Api\Mastodon\Token($token['access_token'], 'Bearer', $application['scopes'], $token['created_at'], $me);
 
-               System::jsonExit($object->toArray());
+               $this->jsonExit($object->toArray());
        }
 }