X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp%2FRouter.php;h=70e31687eeeae13a45354d77936e684737b51f18;hb=e56a53647bd5469551bf4f9ef2df50a5dd16b943;hp=dfe890fb968809fc0fc429aadf48576fd073a088;hpb=1d0cd7328b10875f5b6bb0fa23153f338df18461;p=friendica.git diff --git a/src/App/Router.php b/src/App/Router.php index dfe890fb96..70e31687ee 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -1,6 +1,6 @@ baseRoutesFilepath = $baseRoutesFilepath; $this->l10n = $l10n; $this->cache = $cache; + $this->lock = $lock; + $this->args = $args; + $this->config = $config; + $this->dice = $dice; + $this->server = $server; + + $httpMethod = $this->server['REQUEST_METHOD'] ?? self::GET; + + // @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/OPTIONS + // @todo Check allowed methods per requested path + if ($httpMethod === static::OPTIONS) { + header('Allow: ' . implode(',', Router::ALLOWED_METHODS)); + throw new NoContentException(); + } - $httpMethod = $server['REQUEST_METHOD'] ?? self::GET; $this->httpMethod = in_array($httpMethod, self::ALLOWED_METHODS) ? $httpMethod : self::GET; $this->routeCollector = isset($routeCollector) ? $routeCollector : new RouteCollector(new Std(), new GroupCountBased()); + + if ($this->baseRoutesFilepath && !file_exists($this->baseRoutesFilepath)) { + throw new HTTPException\InternalServerErrorException('Routes file path does\'n exist.'); + } } /** @@ -199,21 +253,19 @@ class Router /** * Returns the relevant module class name for the given page URI or NULL if no route rule matched. * - * @param string $cmd The path component of the request URL without the query string - * * @return string A Friendica\BaseModule-extending class name if a route rule matched * * @throws HTTPException\InternalServerErrorException * @throws HTTPException\MethodNotAllowedException If a rule matched but the method didn't * @throws HTTPException\NotFoundException If no rule matched */ - public function getModuleClass($cmd) + private function getModuleClass() { + $cmd = $this->args->getCommand(); $cmd = '/' . ltrim($cmd, '/'); $dispatcher = new Dispatcher\GroupCountBased($this->getCachedDispatchData()); - $moduleClass = null; $this->parameters = []; $routeInfo = $dispatcher->dispatch($this->httpMethod, $cmd); @@ -229,14 +281,50 @@ class Router return $moduleClass; } - /** - * Returns the module parameters. - * - * @return array parameters - */ - public function getModuleParameters() + public function getModule(?string $module_class = null): ICanHandleRequests { - return $this->parameters; + $module_parameters = [$this->server]; + /** + * ROUTING + * + * From the request URL, routing consists of obtaining the name of a BaseModule-extending class of which the + * post() and/or content() static methods can be respectively called to produce a data change or an output. + **/ + try { + $module_class = $module_class ?? $this->getModuleClass(); + $module_parameters[] = $this->parameters; + } catch (MethodNotAllowedException $e) { + $module_class = MethodNotAllowed::class; + } catch (NotFoundException $e) { + $moduleName = $this->args->getModuleName(); + // Then we try addon-provided modules that we wrap in the LegacyModule class + if (Addon::isEnabled($moduleName) && file_exists("addon/{$moduleName}/{$moduleName}.php")) { + //Check if module is an app and if public access to apps is allowed or not + $privateapps = $this->config->get('config', 'private_addons', false); + if ((!local_user()) && Hook::isAddonApp($moduleName) && $privateapps) { + throw new MethodNotAllowedException($this->l10n->t("You must be logged in to use addons. ")); + } else { + include_once "addon/{$moduleName}/{$moduleName}.php"; + if (function_exists($moduleName . '_module')) { + $module_parameters[] = "addon/{$moduleName}/{$moduleName}.php"; + $module_class = LegacyModule::class; + } + } + } + + /* Finally, we look for a 'standard' program module in the 'mod' directory + * We emulate a Module class through the LegacyModule class + */ + if (!$module_class && file_exists("mod/{$moduleName}.php")) { + $module_parameters[] = "mod/{$moduleName}.php"; + $module_class = LegacyModule::class; + } + + $module_class = $module_class ?: PageNotFound::class; + } + + /** @var ICanHandleRequests $module */ + return $this->dice->create($module_class, $module_parameters); } /** @@ -249,7 +337,7 @@ class Router { $dispatchData = []; - if ($this->baseRoutesFilepath && file_exists($this->baseRoutesFilepath)) { + if ($this->baseRoutesFilepath) { $dispatchData = require $this->baseRoutesFilepath; if (!is_array($dispatchData)) { throw new HTTPException\InternalServerErrorException('Invalid base routes file'); @@ -268,20 +356,42 @@ class Router * The cached "routerDispatchData" lasts for a day, and must be cleared manually when there * is any changes in the enabled addons list. * + * Additionally, we check for the base routes file last modification time to automatically + * trigger re-computing the dispatch data. + * * @return array|mixed * @throws HTTPException\InternalServerErrorException */ private function getCachedDispatchData() { $routerDispatchData = $this->cache->get('routerDispatchData'); + $lastRoutesFileModifiedTime = $this->cache->get('lastRoutesFileModifiedTime'); + $forceRecompute = false; - if ($routerDispatchData) { + if ($this->baseRoutesFilepath) { + $routesFileModifiedTime = filemtime($this->baseRoutesFilepath); + $forceRecompute = $lastRoutesFileModifiedTime != $routesFileModifiedTime; + } + + if (!$forceRecompute && $routerDispatchData) { return $routerDispatchData; } + if (!$this->lock->acquire('getCachedDispatchData', 0)) { + // Immediately return uncached data when we can't aquire a lock + return $this->getDispatchData(); + } + $routerDispatchData = $this->getDispatchData(); $this->cache->set('routerDispatchData', $routerDispatchData, Duration::DAY); + if (!empty($routesFileModifiedTime)) { + $this->cache->set('lastRoutesFileModifiedTime', $routesFileModifiedTime, Duration::MONTH); + } + + if ($this->lock->isLocked('getCachedDispatchData')) { + $this->lock->release('getCachedDispatchData'); + } return $routerDispatchData; }