Merge pull request #4574 from magento-obsessive-owls/MC-17700-squashed

[owls] MC-17700: Add more hosts from more scopes

Author: danmooney2

app/code/Magento/Downloadable/Setup/Patch/Data/AddDownloadableHostsConfig.php

@@ -7,9 +7,13 @@
 
 namespace Magento\Downloadable\Setup\Patch\Data;
 
+use Magento\Config\Model\Config\Backend\Admin\Custom;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\UrlInterface;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
 use Zend\Uri\Uri as UriHandler;
 use Magento\Framework\Url\ScopeResolverInterface;
 use Magento\Downloadable\Api\DomainManagerInterface as DomainManager;
@@ -79,8 +83,12 @@ public function __construct(
      */
     public function apply()
     {
-        foreach ($this->scopeResolver->getScopes() as $scope) {
-            $this->addHost($scope->getBaseUrl());
+        $customStoreScope = $this->scopeResolver->getScope(Custom::CONFIG_SCOPE_ID);
+        $storeScopes = $this->scopeResolver->getScopes();
+        $allStoreScopes = array_merge($storeScopes, [$customStoreScope]);
+
+        foreach ($allStoreScopes as $scope) {
+            $this->addStoreAndWebsiteUrlsFromScope($scope);
         }
 
         $customAdminUrl = $this->scopeConfig->getValue(
@@ -135,13 +143,56 @@ public function apply()
         $this->domainManager->addDomains($this->whitelist);
     }
 
+    /**
+     * Add stores and website urls from store scope
+     *
+     * @param Store $scope
+     */
+    private function addStoreAndWebsiteUrlsFromScope(Store $scope)
+    {
+        $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_WEB, false));
+        $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_WEB, true));
+        $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_LINK, false));
+        $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_LINK, true));
+        $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_DIRECT_LINK, false));
+        $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_DIRECT_LINK, true));
+        $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_MEDIA, false));
+        $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_MEDIA, true));
+
+        try {
+            $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_STATIC, false));
+            $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_STATIC, true));
+        } catch (\UnexpectedValueException $e) {} //@codingStandardsIgnoreLine
+
+        try {
+            $website = $scope->getWebsite();
+        } catch (NoSuchEntityException $e) {
+            return;
+        }
+
+        if ($website) {
+            $this->addHost($website->getConfig(Store::XML_PATH_SECURE_BASE_URL));
+            $this->addHost($website->getConfig(Store::XML_PATH_UNSECURE_BASE_URL));
+            $this->addHost($website->getConfig(Store::XML_PATH_SECURE_BASE_LINK_URL));
+            $this->addHost($website->getConfig(Store::XML_PATH_UNSECURE_BASE_LINK_URL));
+            $this->addHost($website->getConfig(Store::XML_PATH_SECURE_BASE_MEDIA_URL));
+            $this->addHost($website->getConfig(Store::XML_PATH_UNSECURE_BASE_MEDIA_URL));
+            $this->addHost($website->getConfig(Store::XML_PATH_SECURE_BASE_STATIC_URL));
+            $this->addHost($website->getConfig(Store::XML_PATH_UNSECURE_BASE_STATIC_URL));
+        }
+    }
+
     /**
      * Add host to whitelist
      *
      * @param string $url
      */
     private function addHost($url)
     {
+        if (!is_string($url)) {
+            return;
+        }
+
         $host = $this->uriHandler->parse($url)->getHost();
         if ($host && !in_array($host, $this->whitelist)) {
             $this->whitelist[] = $host;