[MultiTenancy] ensure hostname ends with correct hostname

getparthenon · May 22, 2024 · bcab4d5 · bcab4d5
1 parent f67e60a
commit bcab4d5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/Parthenon/MultiTenancy/TenantProvider/CurrentTenantProvider.php b/src/Parthenon/MultiTenancy/TenantProvider/CurrentTenantProvider.php
@@ -38,6 +38,7 @@ public function __construct(
         private TenantRepositoryInterface $tenantRepository,
         private RequestStack $requestStack,
         private string $defaultDatabase,
+        private string $domain,
     ) {
     }
 
@@ -62,6 +63,10 @@ public function getCurrentTenant(bool $refresh = false): TenantInterface
         }
 
         $host = $request->getHost();
+        if (str_ends_with($host, $this->domain)) {
+            return Tenant::createWithSubdomainAndDatabase($this->defaultDatabase, 'dummy.subdomain');
+        }
+
         $subdomain = preg_replace('~^([a-z0-9-]+)(\..*)$~', '$1', $host);
 
         try {

diff --git a/src/Parthenon/Resources/config/services/multi_tenancy.xml b/src/Parthenon/Resources/config/services/multi_tenancy.xml
@@ -15,6 +15,7 @@
             <argument type="service" id="Parthenon\MultiTenancy\Repository\TenantRepositoryInterface" />
             <argument type="service" id="request_stack" />
             <argument>%parthenon_multi_tenancy_default_database%</argument>
+            <argument>%parthenon_multi_tenancy_domain%</argument>
         </service>
         <service id="Parthenon\MultiTenancy\TenantProvider\TenantProviderInterface" alias="Parthenon\MultiTenancy\TenantProvider\CurrentTenantProvider">
         </service>