Merge remote-tracking branch 'upstream/develop' into MC-32830

Author: hwyu@adobe.com

ReCaptchaVersion2Checkbox/etc/csp_whitelist.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="frame-src">
+            <values>
+                <value id="google_com" type="host">https://www.google.com/recaptcha/</value>
+            </values>
+        </policy>
+        <policy id="script-src">
+            <values>
+                <value id="gstatic_com" type="host">https://www.gstatic.com/recaptcha/</value>
+                <value id="google_com" type="host">https://www.google.com/recaptcha/</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
+

ReCaptchaVersion2Invisible/etc/csp_whitelist.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="frame-src">
+            <values>
+                <value id="google_com" type="host">https://www.google.com/recaptcha/</value>
+            </values>
+        </policy>
+        <policy id="script-src">
+            <values>
+                <value id="gstatic_com" type="host">https://www.gstatic.com/recaptcha/</value>
+                <value id="google_com" type="host">https://www.google.com/recaptcha/</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
+

ReCaptchaVersion3Invisible/etc/csp_whitelist.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="frame-src">
+            <values>
+                <value id="google_com" type="host">https://www.google.com/recaptcha/</value>
+            </values>
+        </policy>
+        <policy id="script-src">
+            <values>
+                <value id="gstatic_com" type="host">https://www.gstatic.com/recaptcha/</value>
+                <value id="google_com" type="host">https://www.google.com/recaptcha/</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
+

TwoFactorAuth/Test/Integration/UserConfigManagerTest.php

@@ -170,8 +170,8 @@ public function testShouldEncryptConfiguration(): void
         $encryptor = Bootstrap::getObjectManager()->create(EncryptorInterface::class);
 
         /** @var ResourceConnection $resourceConnection */
-        $connection = Bootstrap::getObjectManager()->get(ResourceConnection::class)
-            ->getConnection(ResourceConnection::DEFAULT_CONNECTION);
+        $resourceConnection = Bootstrap::getObjectManager()->get(ResourceConnection::class);
+        $connection = $resourceConnection->getConnection(ResourceConnection::DEFAULT_CONNECTION);
 
         $configPayload = ['a' => 1, 'b' => 2];
 
@@ -181,8 +181,10 @@ public function testShouldEncryptConfiguration(): void
             $configPayload
         );
 
+        $tfaUserConfig = $resourceConnection->getTableName('tfa_user_config');
+
         $qry = $connection->select()
-            ->from('tfa_user_config', 'encoded_config')
+            ->from($tfaUserConfig, 'encoded_config')
             ->where('user_id = ?', (int)$dummyUser->getId());
 
         $res = $connection->fetchOne($qry);