X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=a01a6bc6c8310975608d997baaeee890fc88f9f9;hb=d4a5a8051ad34a7be72238967afb3e6b140afdc8;hp=378ddbc9de032429c864b68d4835b489d6036a88;hpb=ec54b303c5fd25ff95e6a819db2693acc6218b40;p=friendica.git diff --git a/src/App.php b/src/App.php index 378ddbc9de..a01a6bc6c8 100644 --- a/src/App.php +++ b/src/App.php @@ -63,8 +63,8 @@ use Psr\Log\LoggerInterface; class App { const PLATFORM = 'Friendica'; - const CODENAME = 'Giant Rhubarb'; - const VERSION = '2023.03-dev'; + const CODENAME = 'Yellow Archangel'; + const VERSION = '2023.12'; // Allow themes to control internal parameters // by changing App values in theme.php @@ -335,7 +335,13 @@ class App */ protected function load(DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition) { - set_time_limit(0); + if ($this->config->get('system', 'ini_max_execution_time') !== false) { + set_time_limit((int)$this->config->get('system', 'ini_max_execution_time')); + } + + if ($this->config->get('system', 'ini_pcre_backtrack_limit') !== false) { + ini_set('pcre.backtrack_limit', (int)$this->config->get('system', 'ini_pcre_backtrack_limit')); + } // Normally this constant is defined - but not if "pcntl" isn't installed if (!defined('SIGTERM')) { @@ -345,9 +351,6 @@ class App // Ensure that all "strtotime" operations do run timezone independent date_default_timezone_set('UTC'); - // This has to be quite large to deal with embedded private photos - ini_set('pcre.backtrack_limit', 500000); - set_include_path( get_include_path() . PATH_SEPARATOR . $this->getBasePath() . DIRECTORY_SEPARATOR . 'include' . PATH_SEPARATOR @@ -357,8 +360,6 @@ class App $this->profiler->reset(); if ($this->mode->has(App\Mode::DBAVAILABLE)) { - $this->profiler->update($this->config); - Core\Hook::loadHooks(); $loader = (new Config())->createConfigFileManager($this->getBasePath(), $_SERVER); Core\Hook::callAll('load_config', $loader); @@ -393,7 +394,7 @@ class App } /** - * Returns the current theme name. May be overriden by the mobile theme name. + * Returns the current theme name. May be overridden by the mobile theme name. * * @return string Current theme name or empty string in installation phase * @throws Exception @@ -534,7 +535,7 @@ class App /** * Provide a sane default if nothing is chosen or the specified theme does not exist. * - * @return string Current theme's stylsheet path + * @return string Current theme's stylesheet path * @throws Exception */ public function getCurrentThemeStylesheetPath(): string @@ -542,25 +543,6 @@ class App return Core\Theme::getStylesheetPath($this->getCurrentTheme()); } - /** - * Sets the base url for use in cmdline programs which don't have - * $_SERVER variables - */ - public function checkURL() - { - $url = $this->config->get('system', 'url'); - - // if the url isn't set or the stored url is radically different - // than the currently visited url, store the current value accordingly. - // "Radically different" ignores common variations such as http vs https - // and www.example.com vs example.com. - // We will only change the url to an ip address if there is no existing setting - - if (empty($url) || (!Util\Strings::compareLink($url, $this->baseURL->get())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $this->baseURL->getHostname()))) { - $this->config->set('system', 'url', $this->baseURL->get()); - } - } - /** * Frontend App script * @@ -576,12 +558,17 @@ class App * @param ModuleHTTPException $httpException The possible HTTP Exception container * @param HTTPInputData $httpInput A library for processing PHP input streams * @param float $start_time The start time of the overall script execution + * @param array $server The $_SERVER array * * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ - public function runFrontend(App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, Nav $nav, ModuleHTTPException $httpException, HTTPInputData $httpInput, float $start_time) + public function runFrontend(App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, Nav $nav, ModuleHTTPException $httpException, HTTPInputData $httpInput, float $start_time, array $server) { + $requeststring = ($_SERVER['REQUEST_METHOD'] ?? '') . ' ' . ($_SERVER['REQUEST_URI'] ?? '') . ' ' . ($_SERVER['SERVER_PROTOCOL'] ?? ''); + $this->logger->debug('Request received', ['address' => $_SERVER['REMOTE_ADDR'] ?? '', 'request' => $requeststring, 'referer' => $_SERVER['HTTP_REFERER'] ?? '', 'user-agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']); + $request_start = microtime(true); + $this->profiler->set($start_time, 'start'); $this->profiler->set(microtime(true), 'classinit'); @@ -596,10 +583,13 @@ class App if (!$this->mode->isInstall()) { // Force SSL redirection - if ($this->baseURL->checkRedirectHttps()) { - System::externalRedirect($this->baseURL->get() . '/' . $this->args->getQueryString()); + if ($this->config->get('system', 'force_ssl') && + (empty($server['HTTPS']) || $server['HTTPS'] === 'off') && + (empty($server['HTTP_X_FORWARDED_PROTO']) || $server['HTTP_X_FORWARDED_PROTO'] === 'http') && + !empty($server['REQUEST_METHOD']) && + $server['REQUEST_METHOD'] === 'GET') { + System::externalRedirect($this->baseURL . '/' . $this->args->getQueryString()); } - Core\Hook::callAll('init_1'); } @@ -659,7 +649,6 @@ class App if ($this->mode->isInstall() && $moduleName !== 'install') { $this->baseURL->redirect('install'); } else { - $this->checkURL(); Core\Update::check($this->getBasePath(), false); Core\Addon::loadAddons(); Core\Hook::loadHooks(); @@ -710,6 +699,9 @@ class App $module = $router->getModule(); } + // Display can change depending on the requested language, so it shouldn't be cached whole + header('Vary: Accept-Language', false); + // Processes data from GET requests $httpinput = $httpInput->process(); $input = array_merge($httpinput['variables'], $httpinput['files'], $request ?? $_REQUEST); @@ -718,12 +710,16 @@ class App $timestamp = microtime(true); $response = $module->run($httpException, $input); $this->profiler->set(microtime(true) - $timestamp, 'content'); + + // Wrapping HTML responses in the theme template if ($response->getHeaderLine(ICanCreateResponses::X_HEADER) === ICanCreateResponses::TYPE_HTML) { - $page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig, $nav, $this->session->getLocalUserId()); - } else { - $page->exit($response); + $response = $page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig, $nav, $this->session->getLocalUserId()); } + + $this->logger->debug('Request processed sucessfully', ['response' => $response->getStatusCode(), 'address' => $_SERVER['REMOTE_ADDR'] ?? '', 'request' => $requeststring, 'referer' => $_SERVER['HTTP_REFERER'] ?? '', 'user-agent' => $_SERVER['HTTP_USER_AGENT'] ?? '', 'duration' => number_format(microtime(true) - $request_start, 3)]); + System::echoResponse($response); } catch (HTTPException $e) { + $this->logger->debug('Request processed with exception', ['response' => $e->getCode(), 'address' => $_SERVER['REMOTE_ADDR'] ?? '', 'request' => $requeststring, 'referer' => $_SERVER['HTTP_REFERER'] ?? '', 'user-agent' => $_SERVER['HTTP_USER_AGENT'] ?? '', 'duration' => number_format(microtime(true) - $request_start, 3)]); $httpException->rawContent($e); } $page->logRuntime($this->config, 'runFrontend');