Merge branch 'AC-9913' into cia-2.4.8-beta1-develop-bugfix-09022024

pawan-adobe-security · pawan-adobe-security · commit a73c84211b47 · 2024-09-02T10:49:38.000+05:30
diff --git a/app/code/Magento/Usps/Model/Config/Backend/UspsUrl.php b/app/code/Magento/Usps/Model/Config/Backend/UspsUrl.php
@@ -66,7 +66,7 @@ public function beforeSave()
             // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $host = parse_url((string)$this->getValue(), \PHP_URL_HOST);
 
-            if (!empty($host) && !preg_match("/(?:.+\.|^)usps|shippingapis\.com$/i", $host)) {
+            if (!empty($host) && !preg_match("/(?:.+\.|^)(usps|shippingapis)\.com$/i", $host)) {
                 throw new ValidatorException(__('USPS API endpoint URL\'s must use usps.com or shippingapis.com'));
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function beforeSave()`
`66`	`66`	`// phpcs:ignore Magento2.Functions.DiscouragedFunction`
`67`	`67`	`$host = parse_url((string)$this->getValue(), \PHP_URL_HOST);`
`68`	`68`
`69`		`- if (!empty($host) && !preg_match("/(?:.+\.\|^)usps\|shippingapis\.com$/i", $host)) {`
	`69`	`+ if (!empty($host) && !preg_match("/(?:.+\.\|^)(usps\|shippingapis)\.com$/i", $host)) {`
`70`	`70`	`throw new ValidatorException(__('USPS API endpoint URL\'s must use usps.com or shippingapis.com'));`
`71`	`71`	`}`
`72`	`72`	`}`