ACPT-1742

JacobBrownAustin · JacobBrownAustin · commit 547d3a50e735 · 2024-02-14T13:34:41.000-06:00
* Error\ProcessorFactory now uses existing ObjectManager when it exists
  This is required for compatiblity with ApplicationServer
  * Adding metadata to HTTP Response in Error Processor.
  * This new metadata is checked in
    Magento/PageCache/Model/App/Response/HttpPlugin to avoid caching
    errors, and avoid race condition
    * Changed usage of "require_once" to "require" in several places to
      make compatible with ApplicationServer
diff --git a/app/code/Magento/PageCache/Model/App/Response/HttpPlugin.php b/app/code/Magento/PageCache/Model/App/Response/HttpPlugin.php
@@ -22,10 +22,13 @@ class HttpPlugin
      */
     public function beforeSendResponse(HttpResponse $subject)
     {
-        if ($subject instanceof NotCacheableInterface || $subject->headersSent()) {
+        if (
+            $subject instanceof NotCacheableInterface
+            || $subject->headersSent()
+            || $subject->setMetadata("NotCacheable")
+        ) {
             return;
         }
-
         $subject->sendVary();
     }
 }
diff --git a/pub/errors/default/page.phtml b/pub/errors/default/page.phtml
@@ -19,7 +19,7 @@
 </head>
 <body>
     <main class="page-main">
-        <?php require_once $contentTemplate; ?>
+        <?php require $contentTemplate; ?>
     </main>
 </body>
 </html>
diff --git a/pub/errors/processor.php b/pub/errors/processor.php
@@ -188,25 +188,23 @@ public function __construct(
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
         $this->escaper = $escaper ?: ObjectManager::getInstance()->get(Escaper::class);
         $this->documentRoot = $documentRoot ?? ObjectManager::getInstance()->get(DocumentRoot::class);
-
         if (!empty($_SERVER['SCRIPT_NAME'])) {
             if (in_array(basename($_SERVER['SCRIPT_NAME'], '.php'), ['404', '503', 'report'])) {
                 $this->_scriptName = dirname($_SERVER['SCRIPT_NAME']);
             } else {
                 $this->_scriptName = $_SERVER['SCRIPT_NAME'];
             }
         }
-
         $this->_indexDir = $this->_getIndexDir();
         $this->_root  = is_dir($this->_indexDir . 'app');
-
         $this->_prepareConfig();
         if (isset($_GET['skin'])) {
             $this->_setSkin($_GET['skin']);
         }
         if (isset($_GET['id'])) {
             $this->loadReport($_GET['id']);
         }
+        $this->response->setMetadata("NotCacheable", true);
     }
 
     /**
@@ -449,7 +447,7 @@ protected function _renderPage($template)
         $html = '';
         if ($baseTemplate && $contentTemplate) {
             ob_start();
-            require_once $baseTemplate;
+            require $baseTemplate;
             $html = ob_get_clean();
         }
         return $html;
diff --git a/pub/errors/processorFactory.php b/pub/errors/processorFactory.php
@@ -20,9 +20,14 @@ class ProcessorFactory
      */
     public function createProcessor()
     {
-        $objectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
-        $objectManager = $objectManagerFactory->create($_SERVER);
-        $response = $objectManager->create(\Magento\Framework\App\Response\Http::class);
-        return new Processor($response);
+        try {
+            $objectManager = AppObjectManager::getInstance();
+            return $objectManager->create(Processor::class);
+        } catch (\RuntimeException $exception) {
+            $objectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
+            $objectManager = $objectManagerFactory->create($_SERVER);
+            $response = $objectManager->create(\Magento\Framework\App\Response\Http::class);
+            return new Processor($response);
+        }
     }
 }
diff --git a/pub/get.php b/pub/get.php
@@ -62,13 +62,13 @@
             $fileRelativePath = str_replace(rtrim($mediaDirectory, '/') . '/', '', $fileAbsolutePath);
 
             if (!$isAllowed($fileRelativePath, $allowedResources)) {
-                require_once 'errors/404.php';
+                require 'errors/404.php';
                 exit;
             }
 
             if (is_readable($fileAbsolutePath)) {
                 if (is_dir($fileAbsolutePath)) {
-                    require_once 'errors/404.php';
+                    require 'errors/404.php';
                     exit;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,13 @@ class HttpPlugin`
`22`	`22`	`*/`
`23`	`23`	`public function beforeSendResponse(HttpResponse $subject)`
`24`	`24`	`{`
`25`		`- if ($subject instanceof NotCacheableInterface \|\| $subject->headersSent()) {`
	`25`	`+ if (`
	`26`	`+ $subject instanceof NotCacheableInterface`
	`27`	`+ \|\| $subject->headersSent()`
	`28`	`+ \|\| $subject->setMetadata("NotCacheable")`
	`29`	`+ ) {`
`26`	`30`	`return;`
`27`	`31`	`}`
`28`		`-`
`29`	`32`	`$subject->sendVary();`
`30`	`33`	`}`
`31`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,25 +188,23 @@ public function __construct(`
`188`	`188`	`$this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);`
`189`	`189`	`$this->escaper = $escaper ?: ObjectManager::getInstance()->get(Escaper::class);`
`190`	`190`	`$this->documentRoot = $documentRoot ?? ObjectManager::getInstance()->get(DocumentRoot::class);`
`191`		`-`
`192`	`191`	`if (!empty($_SERVER['SCRIPT_NAME'])) {`
`193`	`192`	`if (in_array(basename($_SERVER['SCRIPT_NAME'], '.php'), ['404', '503', 'report'])) {`
`194`	`193`	`$this->_scriptName = dirname($_SERVER['SCRIPT_NAME']);`
`195`	`194`	`} else {`
`196`	`195`	`$this->_scriptName = $_SERVER['SCRIPT_NAME'];`
`197`	`196`	`}`
`198`	`197`	`}`
`199`		`-`
`200`	`198`	`$this->_indexDir = $this->_getIndexDir();`
`201`	`199`	`$this->_root = is_dir($this->_indexDir . 'app');`
`202`		`-`
`203`	`200`	`$this->_prepareConfig();`
`204`	`201`	`if (isset($_GET['skin'])) {`
`205`	`202`	`$this->_setSkin($_GET['skin']);`
`206`	`203`	`}`
`207`	`204`	`if (isset($_GET['id'])) {`
`208`	`205`	`$this->loadReport($_GET['id']);`
`209`	`206`	`}`
	`207`	`+ $this->response->setMetadata("NotCacheable", true);`
`210`	`208`	`}`
`211`	`209`
`212`	`210`	`/**`
`@@ -449,7 +447,7 @@ protected function _renderPage($template)`
`449`	`447`	`$html = '';`
`450`	`448`	`if ($baseTemplate && $contentTemplate) {`
`451`	`449`	`ob_start();`
`452`		`- require_once $baseTemplate;`
	`450`	`+ require $baseTemplate;`
`453`	`451`	`$html = ob_get_clean();`
`454`	`452`	`}`
`455`	`453`	`return $html;`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,14 @@ class ProcessorFactory`
`20`	`20`	`*/`
`21`	`21`	`public function createProcessor()`
`22`	`22`	`{`
`23`		`- $objectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);`
`24`		`- $objectManager = $objectManagerFactory->create($_SERVER);`
`25`		`- $response = $objectManager->create(\Magento\Framework\App\Response\Http::class);`
`26`		`- return new Processor($response);`
	`23`	`+ try {`
	`24`	`+ $objectManager = AppObjectManager::getInstance();`
	`25`	`+ return $objectManager->create(Processor::class);`
	`26`	`+ } catch (\RuntimeException $exception) {`
	`27`	`+ $objectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);`
	`28`	`+ $objectManager = $objectManagerFactory->create($_SERVER);`
	`29`	`+ $response = $objectManager->create(\Magento\Framework\App\Response\Http::class);`
	`30`	`+ return new Processor($response);`
	`31`	`+ }`
`27`	`32`	`}`
`28`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,13 +62,13 @@`
`62`	`62`	`$fileRelativePath = str_replace(rtrim($mediaDirectory, '/') . '/', '', $fileAbsolutePath);`
`63`	`63`
`64`	`64`	`if (!$isAllowed($fileRelativePath, $allowedResources)) {`
`65`		`- require_once 'errors/404.php';`
	`65`	`+ require 'errors/404.php';`
`66`	`66`	`exit;`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`if (is_readable($fileAbsolutePath)) {`
`70`	`70`	`if (is_dir($fileAbsolutePath)) {`
`71`		`- require_once 'errors/404.php';`
	`71`	`+ require 'errors/404.php';`
`72`	`72`	`exit;`
`73`	`73`	`}`
`74`	`74`