EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
throw bad request on uri starting with double slash
Yuri Kuznetsov929611f317ce
diff --git a/application/Espo/Core/Api/Starter.php b/application/Espo/Core/Api/Starter.phpindex c232130844..563538c259 100644--- a/application/Espo/Core/Api/Starter.php+++ b/application/Espo/Core/Api/Starter.php@@ -35,7 +35,9 @@ use Espo\Core\Utils\Route as RouteUtil;use Espo\Core\Utils\Log;use Psr\Container\ContainerInterface;+use Psr\Http\Server\RequestHandlerInterface as Psr7Handler;use Slim\App as SlimApp;+use Slim\Exception\HttpBadRequestException;use Slim\Factory\AppFactory as SlimAppFactory;use Psr\Http\Message\ResponseInterface as Psr7Response;@@ -64,6 +66,22 @@ class Starter{$slim = SlimAppFactory::create();+ if (RouteUtil::isBadUri()) {+ $slim->add(function (Psr7Request $request): Psr7Response {+ throw new HttpBadRequestException($request, 'Malformed request path: starts with `//`.');+ });++ $slim->addErrorMiddleware(+ displayErrorDetails: false,+ logErrors: false,+ logErrorDetails: false,+ );++ $slim->run();++ return;+ }+if ($this->systemConfig->useCache()) {$slim->getRouteCollector()->setCacheFile($this->routeCacheFile);}diff --git a/application/Espo/Core/Application/Runner.php b/application/Espo/Core/Application/Runner.phpindex 90fec9649c..8df785b39b 100644--- a/application/Espo/Core/Application/Runner.php+++ b/application/Espo/Core/Application/Runner.php@@ -29,10 +29,15 @@namespace Espo\Core\Application;+use Espo\Core\Application\Exceptions\RunnerException;+/*** Runs an application.*/interface Runner{+ /**+ * @throws RunnerException+ */public function run(): void;}diff --git a/application/Espo/Core/Utils/Route.php b/application/Espo/Core/Utils/Route.phpindex 2560b55d74..80e57256c1 100644--- a/application/Espo/Core/Utils/Route.php+++ b/application/Espo/Core/Utils/Route.php@@ -31,6 +31,7 @@ namespace Espo\Core\Utils;use Espo\Core\Api\Action;use Espo\Core\Api\Route as RouteItem;+use Espo\Core\Exceptions\BadRequest;use Espo\Core\Utils\Config\SystemConfig;use Espo\Core\Utils\File\Manager as FileManager;use Espo\Core\Utils\Resource\PathProvider;@@ -187,6 +188,22 @@ class Routereturn $pathFormatted;}+ /**+ * @internal+ * @since 9.1.7+ */+ public static function isBadUri(): bool+ {+ /** @var string $serverRequestUri */+ $serverRequestUri = $_SERVER['REQUEST_URI'];++ if (str_starts_with($serverRequestUri, '//')) {+ return true;+ }++ return false;+ }+public static function detectBasePath(): string{/** @var string $serverScriptName */