Added easy way to strip ingress prefixes from request path

Author: freost

CHANGELOG.md

@@ -1,3 +1,11 @@
+### 11.4.2, <small>(2025-09-16)</small>
+
+#### New
+
+* The request class can now strip a configurable prefix from the request path.
+
+--------------------------------------------------------
+
 ### 11.3.1, 11.4.1 <small>(2025-09-01)</small>
 
 #### Bugfixes

src/mako/Mako.php

@@ -15,7 +15,7 @@ final class Mako
 	/**
 	 * Mako version.
 	 */
-	public const string VERSION = '11.4.1';
+	public const string VERSION = '11.4.2';
 
 	/**
 	 * Mako major version.
@@ -30,5 +30,5 @@ final class Mako
 	/**
 	 * Mako patch version.
 	 */
-	public const int VERSION_PATCH = 1;
+	public const int VERSION_PATCH = 2;
 }

src/mako/application/services/HTTPService.php

@@ -44,7 +44,12 @@ public function register(): void
 		// Request
 
 		$this->container->registerSingleton([Request::class, 'request'], static function ($container) use ($config) {
-			$request = new Request(['languages' => $config['languages']], $container->get(Signer::class), $config['script_name'] ?? null);
+			$request = new Request(
+				['languages' => $config['languages']],
+				$container->get(Signer::class),
+				$config['script_name'] ?? null,
+				$config['ingress_prefix'] ?? null,
+			);
 
 			if (!empty($config['trusted_proxies'])) {
 				$request->setTrustedProxies($config['trusted_proxies']);

src/mako/http/Request.php

@@ -35,6 +35,7 @@
 use function rawurldecode;
 use function rtrim;
 use function str_replace;
+use function str_starts_with;
 use function stripos;
 use function strlen;
 use function strpos;
@@ -188,8 +189,12 @@ class Request
 	/**
 	 * Constructor.
 	 */
-	public function __construct(array $request = [], ?Signer $signer = null, ?string $scriptName = null)
-	{
+	public function __construct(
+		array $request = [],
+		?Signer $signer = null,
+		?string $scriptName = null,
+		protected ?string $ingressPrefix = null
+	) {
 		// Collect request data
 
 		$this->query   = new Parameters($request['get'] ?? $_GET);
@@ -217,6 +222,20 @@ public function __construct(array $request = [], ?Signer $signer = null, ?string
 		$this->method = $request['method'] ?? $this->determineMethod();
 	}
 
+	/**
+	 * Strips the ingress prefix from the path.
+	 */
+	protected function stripIngressPrefix(string $path): string
+	{
+		if ($this->ingressPrefix) {
+			if (str_starts_with($path, $this->ingressPrefix)) {
+				return mb_substr($path, mb_strlen($this->ingressPrefix));
+			}
+		}
+
+		return $path;
+	}
+
 	/**
 	 * Strips the locale segment from the path.
 	 */
@@ -271,7 +290,7 @@ protected function determinePath(array $languages): string
 			}
 		}
 
-		return $this->stripLocaleSegment($languages, $path);
+		return $this->stripLocaleSegment($languages, $this->stripIngressPrefix($path));
 	}
 
 	/**

tests/unit/http/RequestTest.php

@@ -473,6 +473,18 @@ public function testPath(): void
 		$this->assertEquals('/foo/bar', $request->getPath());
 	}
 
+	/**
+	 *
+	 */
+	public function testPathWithPrefix(): void
+	{
+		$server = ['PATH_INFO' => '/api/openapi/docs'];
+
+		$request = new Request(['server' => $server], ingressPrefix: '/api');
+
+		$this->assertEquals('/openapi/docs', $request->getPath());
+	}
+
 	/**
 	 *
 	 */