Add OPTIONS endpoint

[friendica.git] / src / Module / Special / HTTPException.php

diff --git a/src/Module/Special/HTTPException.php b/src/Module/Special/HTTPException.php
index 09e962407a6a56c4628638909d529e97218338d3..34bb67538555dd37e8103d59ba9a76263924c528 100644 (file)
--- a/src/Module/Special/HTTPException.php
+++ b/src/Module/Special/HTTPException.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
  *
@@ -21,6 +21,7 @@
 
 namespace Friendica\Module\Special;
 
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\DI;
@@ -42,41 +43,15 @@ class HTTPException
         */
        private static function getVars(\Friendica\Network\HTTPException $e)
        {
-               $message = $e->getMessage();
-
-               $titles = [
-                       200 => 'OK',
-                       400 => DI::l10n()->t('Bad Request'),
-                       401 => DI::l10n()->t('Unauthorized'),
-                       403 => DI::l10n()->t('Forbidden'),
-                       404 => DI::l10n()->t('Not Found'),
-                       500 => DI::l10n()->t('Internal Server Error'),
-                       503 => DI::l10n()->t('Service Unavailable'),
-               ];
-               $title = ($titles[$e->getCode()] ?? '') ?: 'Error ' . $e->getCode();
-
-               if (empty($message)) {
-                       // Explanations are taken from https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
-                       $explanation = [
-                               400 => DI::l10n()->t('The server cannot or will not process the request due to an apparent client error.'),
-                               401 => DI::l10n()->t('Authentication is required and has failed or has not yet been provided.'),
-                               403 => DI::l10n()->t('The request was valid, but the server is refusing action. The user might not have the necessary permissions for a resource, or may need an account.'),
-                               404 => DI::l10n()->t('The requested resource could not be found but may be available in the future.'),
-                               500 => DI::l10n()->t('An unexpected condition was encountered and no more specific message is suitable.'),
-                               503 => DI::l10n()->t('The server is currently unavailable (because it is overloaded or down for maintenance). Please try again later.'),
-                       ];
-
-                       $message = $explanation[$e->getCode()] ?? '';
-               }
-
+               // Explanations are mostly taken from https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
                $vars = [
-                       '$title' => $title,
-                       '$message' => $message,
+                       '$title' => $e->getDescription() ?: 'Error ' . $e->getCode(),
+                       '$message' => $e->getMessage() ?: $e->getExplanation(),
                        '$back' => DI::l10n()->t('Go back'),
                        '$stack_trace' => DI::l10n()->t('Stack trace:'),
                ];
 
-               if (is_site_admin()) {
+               if (DI::app()->isSiteAdmin()) {
                        $vars['$thrown'] = DI::l10n()->t('Exception thrown in %s:%d', $e->getFile(), $e->getLine());
                        $vars['$trace'] = $e->getTraceAsString();
                }
@@ -90,7 +65,7 @@ class HTTPException
         * @param \Friendica\Network\HTTPException $e
         * @throws \Exception
         */
-       public static function rawContent(\Friendica\Network\HTTPException $e)
+       public function rawContent(\Friendica\Network\HTTPException $e)
        {
                $content = '';
 
@@ -99,7 +74,7 @@ class HTTPException
                        $content = Renderer::replaceMacros($tpl, self::getVars($e));
                }
 
-               System::httpExit($e->getCode(), $e->httpdesc, $content);
+               System::httpExit($e->getCode(), $e->getDescription(), $content);
        }
 
        /**
@@ -109,9 +84,13 @@ class HTTPException
         * @return string
         * @throws \Exception
         */
-       public static function content(\Friendica\Network\HTTPException $e)
+       public function content(\Friendica\Network\HTTPException $e): string
        {
-               header($_SERVER["SERVER_PROTOCOL"] . ' ' . $e->getCode() . ' ' . $e->httpdesc);
+               header($_SERVER["SERVER_PROTOCOL"] . ' ' . $e->getCode() . ' ' . $e->getDescription());
+
+               if ($e->getCode() >= 400) {
+                       Logger::debug('Exit with error', ['code' => $e->getCode(), 'description' => $e->getDescription(), 'query' => DI::args()->getQueryString(), 'callstack' => System::callstack(20), 'method' => $_SERVER['REQUEST_METHOD'], 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
+               }
 
                $tpl = Renderer::getMarkupTemplate('exception.tpl');