ACP2E-2015: Customizable Option Image link is broken

Author: bubasuma

app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\PageCache\Model\App\FrontController;
 
+use Magento\Framework\App\PageCache\NotCacheableInterface;
 use Magento\Framework\App\Response\Http as ResponseHttp;
 
 /**
@@ -73,7 +74,7 @@ public function aroundDispatch(
         $result = $this->kernel->load();
         if ($result === false) {
             $result = $proceed($request);
-            if ($result instanceof ResponseHttp) {
+            if ($result instanceof ResponseHttp && !$result instanceof NotCacheableInterface) {
                 $this->addDebugHeaders($result);
                 $this->kernel->process($result);
             }

app/code/Magento/PageCache/Test/Unit/Model/App/FrontController/BuiltinPluginTest.php

@@ -11,6 +11,7 @@
 use Laminas\Http\Header\GenericHeader;
 use Magento\Framework\App\FrontControllerInterface;
 use Magento\Framework\App\PageCache\Kernel;
+use Magento\Framework\App\PageCache\NotCacheableInterface;
 use Magento\Framework\App\PageCache\Version;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\Response\Http;
@@ -243,6 +244,41 @@ public function testAroundDispatchDisabled($state): void
         );
     }
 
+    /**
+     * @return void
+     */
+    public function testAroundNotCacheableResponse(): void
+    {
+        $this->configMock
+            ->expects($this->once())
+            ->method('getType')
+            ->willReturn(Config::BUILT_IN);
+        $this->configMock->expects($this->once())
+            ->method('isEnabled')
+            ->willReturn(true);
+        $this->versionMock
+            ->expects($this->once())
+            ->method('process');
+        $this->kernelMock->expects($this->once())
+            ->method('load')
+            ->willReturn(false);
+        $this->stateMock->expects($this->never())
+            ->method('getMode');
+        $this->kernelMock->expects($this->never())
+            ->method('process');
+        $this->responseMock->expects($this->never())
+            ->method('setHeader');
+        $notCacheableResponse = $this->createMock(NotCacheableInterface::class);
+        $this->assertSame(
+            $notCacheableResponse,
+            $this->plugin->aroundDispatch(
+                $this->frontControllerMock,
+                fn () => $notCacheableResponse,
+                $this->requestMock
+            )
+        );
+    }
+
     /**
      * @return array
      */

lib/internal/Magento/Framework/App/PageCache/Kernel.php

@@ -10,6 +10,8 @@
 
 /**
  * Builtin cache processor
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Kernel
 {
@@ -140,6 +142,7 @@ public function process(\Magento\Framework\App\Response\Http $response)
             $maxAge = $matches[1];
             $response->setNoCacheHeaders();
             if (($response->getHttpResponseCode() == 200 || $response->getHttpResponseCode() == 404)
+                && !$response instanceof NotCacheableInterface
                 && ($this->request->isGet() || $this->request->isHead())
             ) {
                 $tagsHeader = $response->getHeader('X-Magento-Tags');

lib/internal/Magento/Framework/App/Test/Unit/PageCache/KernelTest.php

@@ -14,6 +14,7 @@
 use Magento\Framework\App\PageCache\Cache;
 use Magento\Framework\App\PageCache\Identifier;
 use Magento\Framework\App\PageCache\Kernel;
+use Magento\Framework\App\PageCache\NotCacheableInterface;
 use Magento\Framework\App\Request\Http;
 use Magento\Framework\App\Response\HttpFactory;
 use Magento\Framework\Serialize\SerializerInterface;
@@ -328,4 +329,28 @@ public function processNotSaveCacheProvider(): array
             ['public, max-age=100, s-maxage=100', 200, false, true]
         ];
     }
+
+    public function testProcessNotSaveCacheForNotCacheableResponse(): void
+    {
+        $header = CacheControl::fromString("Cache-Control: public, max-age=100, s-maxage=100");
+        $notCacheableResponse = $this->getMockBuilder(\Magento\Framework\App\Response\File::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $notCacheableResponse->expects($this->once())
+            ->method('getHeader')
+            ->with('Cache-Control')
+            ->willReturn($header);
+        $notCacheableResponse->expects($this->any())
+            ->method('getHttpResponseCode')
+            ->willReturn(200);
+        $notCacheableResponse->expects($this->once())
+            ->method('setNoCacheHeaders');
+        $this->requestMock
+            ->expects($this->any())->method('isGet')
+            ->willReturn(true);
+        $this->fullPageCacheMock->expects($this->never())
+            ->method('save');
+        $this->kernel->process($notCacheableResponse);
+    }
 }