FEATURE: 3334 Resource targets without space tunnels

Neos.Flow/Classes/ResourceManagement/ResourceManager.php

@@ -12,16 +12,19 @@
  */
 
 use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Http\BaseUriProvider;
 use Neos\Flow\Log\Utility\LogEnvironment;
 use Neos\Flow\ObjectManagement\ObjectManagerInterface;
 use Neos\Flow\Persistence\PersistenceManagerInterface;
+use Neos\Flow\ResourceManagement\Target\AbsoluteBaseUriAwareTarget;
 use Neos\Utility\ObjectAccess;
 use Neos\Flow\ResourceManagement\Storage\StorageInterface;
 use Neos\Flow\ResourceManagement\Storage\WritableStorageInterface;
 use Neos\Flow\ResourceManagement\Target\TargetInterface;
 use Neos\Flow\Utility\Algorithms;
 use Neos\Flow\Utility\Environment;
 use Neos\Utility\Unicode\Functions as UnicodeFunctions;
+use Psr\Http\Message\UriInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -64,6 +67,12 @@ class ResourceManager
      */
     protected $persistenceManager;
 
+    /**
+     * @Flow\Inject
+     * @var BaseUriProvider
+     */
+    protected $baseUriProvider;
+
     /**
      * @var array
      */
@@ -373,7 +382,7 @@ public function deleteResource(PersistentResource $resource, $unpublishResource
      * @return string|false A URI as a string or false if the collection of the resource is not found
      * @api
      */
-    public function getPublicPersistentResourceUri(PersistentResource $resource)
+    public function getPublicPersistentResourceUri(PersistentResource $resource, ?UriInterface $baseUri = null)
     {
         $this->initialize();
 
@@ -382,7 +391,9 @@ public function getPublicPersistentResourceUri(PersistentResource $resource)
         }
         /** @var TargetInterface $target */
         $target = $this->collections[$resource->getCollectionName()]->getTarget();
-
+        if ($target instanceof AbsoluteBaseUriAwareTarget) {
+            $target->setAbsoluteBaseUri($baseUri ?? $this->baseUriProvider->getConfiguredBaseUriOrFallbackToCurrentRequest());
+        }
         return $target->getPublicPersistentResourceUri($resource);
     }
 
@@ -396,7 +407,7 @@ public function getPublicPersistentResourceUri(PersistentResource $resource)
      * @throws Exception
      * @api
      */
-    public function getPublicPersistentResourceUriByHash($resourceHash, $collectionName = self::DEFAULT_PERSISTENT_COLLECTION_NAME)
+    public function getPublicPersistentResourceUriByHash($resourceHash, $collectionName = self::DEFAULT_PERSISTENT_COLLECTION_NAME, ?UriInterface $baseUri = null)
     {
         $this->initialize();
 
@@ -409,7 +420,9 @@ public function getPublicPersistentResourceUriByHash($resourceHash, $collectionN
         if ($resource === null) {
             throw new Exception(sprintf('Could not determine persistent resource URI for "%s" because no PersistentResource object with that SHA1 hash could be found.', $resourceHash), 1375347691);
         }
-
+        if ($target instanceof AbsoluteBaseUriAwareTarget) {
+            $target->setAbsoluteBaseUri($baseUri ?? $this->baseUriProvider->getConfiguredBaseUriOrFallbackToCurrentRequest());
+        }
         return $target->getPublicPersistentResourceUri($resource);
     }
 
@@ -422,12 +435,15 @@ public function getPublicPersistentResourceUriByHash($resourceHash, $collectionN
      * @return string
      * @api
      */
-    public function getPublicPackageResourceUri($packageKey, $relativePathAndFilename)
+    public function getPublicPackageResourceUri($packageKey, $relativePathAndFilename, ?UriInterface $baseUri = null)
     {
         $this->initialize();
 
         /** @var TargetInterface $target */
         $target = $this->collections[self::DEFAULT_STATIC_COLLECTION_NAME]->getTarget();
+        if ($target instanceof AbsoluteBaseUriAwareTarget) {
+            $target->setAbsoluteBaseUri($baseUri ?? $this->baseUriProvider->getConfiguredBaseUriOrFallbackToCurrentRequest());
+        }
         return $target->getPublicStaticResourceUri($packageKey . '/' . $relativePathAndFilename);
     }
 
@@ -438,11 +454,11 @@ public function getPublicPackageResourceUri($packageKey, $relativePathAndFilenam
      * @return string
      * @api
      */
-    public function getPublicPackageResourceUriByPath($path)
+    public function getPublicPackageResourceUriByPath($path, ?UriInterface $baseUri = null)
     {
         $this->initialize();
         list($packageKey, $relativePathAndFilename) = $this->getPackageAndPathByPublicPath($path);
-        return $this->getPublicPackageResourceUri($packageKey, $relativePathAndFilename);
+        return $this->getPublicPackageResourceUri($packageKey, $relativePathAndFilename, $baseUri);
     }
 
     /**

Neos.Flow/Classes/ResourceManagement/Target/AbsoluteBaseUriAwareTarget.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Neos\Flow\ResourceManagement\Target;
+
+/*
+ * This file is part of the Neos.Flow package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+use Psr\Http\Message\UriInterface;
+
+/**
+ * Allows resource uris to be built with and absolute uri
+ *
+ * For targets implementing this interface, setAbsoluteBaseUri() must be invoked getting a resource uri
+ *
+ * - {@see TargetInterface::getPublicStaticResourceUri}
+ * - {@see TargetInterface::getPublicPersistentResourceUri}
+ */
+interface AbsoluteBaseUriAwareTarget
+{
+    public function setAbsoluteBaseUri(UriInterface $baseUri): void;
+}

Neos.Flow/Classes/ResourceManagement/Target/FileSystemTarget.php

@@ -25,12 +25,13 @@
 use Neos\Utility\Files;
 use Neos\Utility\Unicode\Functions as UnicodeFunctions;
 use Neos\Flow\ResourceManagement\Target\Exception as TargetException;
+use Psr\Http\Message\UriInterface;
 use Psr\Log\LoggerInterface;
 
 /**
  * A target which publishes resources to a specific directory in a file system.
  */
-class FileSystemTarget implements TargetInterface
+class FileSystemTarget implements TargetInterface, AbsoluteBaseUriAwareTarget
 {
     /**
      * @var array
@@ -71,7 +72,7 @@ class FileSystemTarget implements TargetInterface
      *
      * @var string
      */
-    protected $absoluteBaseUri;
+    protected string $absoluteBaseUri;
 
     /**
      * If the generated URI path segment containing the sha1 should be divided into multiple segments
@@ -105,12 +106,6 @@ class FileSystemTarget implements TargetInterface
      */
     protected $messageCollector;
 
-    /**
-     * @Flow\Inject
-     * @var BaseUriProvider
-     */
-    protected $baseUriProvider;
-
     /**
      * Constructor
      *
@@ -123,6 +118,15 @@ public function __construct($name, array $options = [])
         $this->options = $options;
     }
 
+    public function setAbsoluteBaseUri(UriInterface $baseUri): void
+    {
+        if (($this->baseUri[0] ?? '') === '/' || str_contains($this->baseUri, '://')) {
+            $this->absoluteBaseUri = $this->baseUri;
+            return;
+        }
+        $this->absoluteBaseUri = (string)$baseUri . $this->baseUri;
+    }
+
     /**
      * Injects the (system) logger based on PSR-3.
      *
@@ -286,7 +290,7 @@ public function unpublishResource(PersistentResource $resource)
      */
     public function getPublicStaticResourceUri($relativePathAndFilename)
     {
-        return $this->getResourcesBaseUri() . $this->encodeRelativePathAndFilenameForUri($relativePathAndFilename);
+        return $this->absoluteBaseUri . $this->encodeRelativePathAndFilenameForUri($relativePathAndFilename);
     }
 
     /**
@@ -298,7 +302,7 @@ public function getPublicStaticResourceUri($relativePathAndFilename)
      */
     public function getPublicPersistentResourceUri(PersistentResource $resource)
     {
-        return $this->getResourcesBaseUri() . $this->encodeRelativePathAndFilenameForUri($this->getRelativePublicationPathAndFilename($resource));
+        return $this->absoluteBaseUri . $this->encodeRelativePathAndFilenameForUri($this->getRelativePublicationPathAndFilename($resource));
     }
 
     /**
@@ -387,36 +391,6 @@ protected function unpublishFile($relativeTargetPathAndFilename)
         Files::removeEmptyDirectoriesOnPath(dirname($targetPathAndFilename));
     }
 
-    /**
-     * Returns the resolved absolute base URI for resources of this target.
-     *
-     * @return string The absolute base URI for resources in this target
-     */
-    protected function getResourcesBaseUri()
-    {
-        if ($this->absoluteBaseUri === null) {
-            $this->absoluteBaseUri = $this->detectResourcesBaseUri();
-        }
-
-        return $this->absoluteBaseUri;
-    }
-
-    /**
-     * Detects and returns the website's absolute base URI
-     *
-     * @return string The resolved resource base URI, @see getResourcesBaseUri()
-     * @throws \Neos\Flow\Http\Exception
-     */
-    protected function detectResourcesBaseUri()
-    {
-        if ($this->baseUri !== '' && ($this->baseUri[0] === '/' || strpos($this->baseUri, '://') !== false)) {
-            return $this->baseUri;
-        }
-
-        $httpBaseUri = (string)$this->baseUriProvider->getConfiguredBaseUriOrFallbackToCurrentRequest();
-        return $httpBaseUri . $this->baseUri;
-    }
-
     /**
      * Determines and returns the relative path and filename for the given Storage Object or PersistentResource. If the given
      * object represents a persistent resource, its own relative publication path will be empty. If the given object

Neos.Flow/Classes/ResourceManagement/Target/TargetInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Neos\Flow\ResourceManagement\Target;
 
 /*
@@ -11,12 +12,12 @@
  * source code.
  */
 
-/**
- * Interface for a resource publishing target
- */
 use Neos\Flow\ResourceManagement\CollectionInterface;
 use Neos\Flow\ResourceManagement\PersistentResource;
 
+/**
+ * Interface for a resource publishing target
+ */
 interface TargetInterface
 {
     /**