Update copyright

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

diff --git a/src/Module/OAuth/Token.php b/src/Module/OAuth/Token.php
index 780fc7cea6df6c01cfea613990b928ee407fa66d..d41c056dfab00af847433934b4f760c34601f63d 100644 (file)
--- a/src/Module/OAuth/Token.php
+++ b/src/Module/OAuth/Token.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -26,6 +26,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Module\BaseApi;
+use Friendica\Security\OAuth;
 
 /**
  * @see https://docs.joinmastodon.org/spec/oauth/
@@ -33,19 +34,26 @@ use Friendica\Module\BaseApi;
  */
 class Token extends BaseApi
 {
-       public static function post(array $parameters = [])
+       protected function post(array $request = [])
        {
-               $request = self::getRequest([
-                       'grant_type'    => '',
-                       'code'          => '',
-                       'redirect_uri'  => '',
-                       'client_id'     => '',
-                       'client_secret' => '',
-               ]);
+               $request = $this->getRequest([
+                       'client_id'     => '', // Client ID, obtained during app registration
+                       'client_secret' => '', // Client secret, obtained during app registration
+                       'redirect_uri'  => '', // Set a URI to redirect the user to. If this parameter is set to "urn:ietf:wg:oauth:2.0:oob" then the token will be shown instead. Must match one of the redirect URIs declared during app registration.
+                       'scope'         => 'read', // List of requested OAuth scopes, separated by spaces. Must be a subset of scopes declared during app registration. If not provided, defaults to "read".
+                       'code'          => '', // A user authorization code, obtained via /oauth/authorize
+                       'grant_type'    => '', // Set equal to "authorization_code" if code is provided in order to gain user-level access. Otherwise, set equal to "client_credentials" to obtain app-level access only.
+               ], $request);
 
                // AndStatus transmits the client data in the AUTHORIZATION header field, see https://github.com/andstatus/andstatus/issues/530
-               if (empty($request['client_id']) && !empty($_SERVER['HTTP_AUTHORIZATION']) && (substr($_SERVER['HTTP_AUTHORIZATION'], 0, 6) == 'Basic ')) {
-                       $datapair = explode(':', base64_decode(trim(substr($_SERVER['HTTP_AUTHORIZATION'], 6))));
+               $authorization = $_SERVER['HTTP_AUTHORIZATION'] ?? '';
+               if (empty($authorization)) {
+                       // workaround for HTTP-auth in CGI mode
+                       $authorization = $_SERVER['REDIRECT_REMOTE_USER'] ?? '';
+               }
+
+               if (empty($request['client_id']) && substr($authorization, 0, 6) == 'Basic ') {
+                       $datapair = explode(':', base64_decode(trim(substr($authorization, 6))));
                        if (count($datapair) == 2) {
                                $request['client_id']     = $datapair[0];
                                $request['client_secret'] = $datapair[1];
@@ -57,7 +65,7 @@ class Token extends BaseApi
                        DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Incomplete request data'));
                }
 
-               $application = self::getApplication($request['client_id'], $request['client_secret'], $request['redirect_uri']);
+               $application = OAuth::getApplication($request['client_id'], $request['client_secret'], $request['redirect_uri']);
                if (empty($application)) {
                        DI::mstdnError()->UnprocessableEntity();
                }
@@ -65,7 +73,7 @@ class Token extends BaseApi
                if ($request['grant_type'] == 'client_credentials') {
                        // the "client_credentials" are used as a token for the application itself.
                        // see https://aaronparecki.com/oauth-2-simplified/#client-credentials
-                       $token = self::createTokenForUser($application, 0, '');
+                       $token = OAuth::createTokenForUser($application, 0, '');
                } elseif ($request['grant_type'] == 'authorization_code') {
                        // For security reasons only allow freshly created tokens
                        $condition = ["`redirect_uri` = ? AND `id` = ? AND `code` = ? AND `created_at` > UTC_TIMESTAMP() - INTERVAL ? MINUTE",