src/DownloadManager.php

@@ -15,6 +15,7 @@ use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Exception\GuzzleException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Download manager.
@@ -32,6 +33,7 @@ final class DownloadManager implements DownloadManagerInterface {
     protected LoggerInterface $logger,
     protected ConfigFactoryInterface $configFactory,
     protected LockBackendInterface $lock,
+    protected RequestStack $requestStack,
   ) {
   }
 
@@ -138,7 +140,9 @@ final class DownloadManager implements DownloadManagerInterface {
    * {@inheritdoc}
    */
   public function filePublicPath(): string {
-    return PublicStream::basePath();
+    $filesDir = PublicStream::baseUrl();
+    $host = $this->requestStack->getCurrentRequest()->getSchemeAndHttpHost();
+    return str_replace($host . '/', '', $filesDir);
   }
 
   /**

src/EventSubscriber/StageFileProxySubscriber.php

@@ -4,6 +4,7 @@ namespace Drupal\stage_file_proxy\EventSubscriber;
 
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\PageCache\ResponsePolicy\KillSwitch;
 use Drupal\Core\Routing\TrustedRedirectResponse;
 use Drupal\Core\StreamWrapper\StreamWrapperManager;
 use Drupal\Core\Url;
@@ -36,6 +37,8 @@ class StageFileProxySubscriber implements EventSubscriberInterface {
    *   The config factory.
    * @param \Symfony\Component\HttpFoundation\RequestStack $requestStack
    *   The request stack.
+   * @param \Drupal\Core\PageCache\ResponsePolicy\KillSwitch $pageCacheKillSwitch
+   *   The page cache kill switch.
    */
   public function __construct(
     protected DownloadManagerInterface $manager,
@@ -43,6 +46,7 @@ class StageFileProxySubscriber implements EventSubscriberInterface {
     protected EventDispatcherInterface $eventDispatcher,
     protected ConfigFactoryInterface $configFactory,
     protected RequestStack $requestStack,
+    protected KillSwitch $pageCacheKillSwitch,
   ) {
   }
 
@@ -162,6 +166,7 @@ class StageFileProxySubscriber implements EventSubscriberInterface {
       ];
 
       if ($config->get('hotlink')) {
+        $relative_path = UrlHelper::encodePath($relative_path);
         $location = Url::fromUri("$server/$remote_file_dir/$relative_path", [
           'query' => $query_parameters,
           'absolute' => TRUE,
@@ -176,6 +181,10 @@ class StageFileProxySubscriber implements EventSubscriberInterface {
           'query' => $query_parameters,
           'absolute' => TRUE,
         ])->toString();
+
+        // Ensure the redirect isn't cached by page_cache module.
+        $this->pageCacheKillSwitch->trigger();
+
         // Use default cache control: must-revalidate, no-cache, private.
         $event->setResponse(new RedirectResponse($location));
       }

stage_file_proxy.services.yml

@@ -8,12 +8,14 @@ services:
     arguments:
       $logger: '@logger.channel.stage_file_proxy'
       $lock: '@lock'
+      $requestStack: '@request_stack'
   Drupal\stage_file_proxy\DownloadManagerInterface: '@stage_file_proxy.download_manager'
 
   Drupal\stage_file_proxy\EventSubscriber\ImageDownloadControllerSubscriber: ~
   Drupal\stage_file_proxy\EventSubscriber\StageFileProxySubscriber:
     arguments:
       $logger: '@logger.channel.stage_file_proxy'
+      $pageCacheKillSwitch: '@page_cache_kill_switch'
 
   logger.channel.stage_file_proxy:
     parent: logger.channel_base

tests/src/Kernel/DownloadManagerTest.php

@@ -7,6 +7,7 @@ use Drupal\KernelTests\KernelTestBase;
 use Drupal\stage_file_proxy\DownloadManager;
 use GuzzleHttp\Client;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Test stage file proxy module.
@@ -59,6 +60,13 @@ class DownloadManagerTest extends KernelTestBase {
    */
   protected DownloadManager $downloadManager;
 
+  /**
+   * The request stack.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  protected RequestStack $requestStack;
+
   /**
    * Before a test method is run, setUp() is invoked.
    *
@@ -72,7 +80,8 @@ class DownloadManagerTest extends KernelTestBase {
     $this->client = new Client();
     $this->logger = \Drupal::logger('test_logger');
     $this->configFactory = $this->container->get('config.factory');
-    $this->downloadManager = new DownloadManager($this->client, $this->fileSystem, $this->logger, $this->configFactory, \Drupal::lock());
+    $this->requestStack = new RequestStack();
+    $this->downloadManager = new DownloadManager($this->client, $this->fileSystem, $this->logger, $this->configFactory, \Drupal::lock(), $this->requestStack);
   }
 
   /**