Merge branch 'magento:develop' into develop

Author: basvanpoppel

.github/.metadata.json

@@ -0,0 +1,32 @@
+{
+  "templateVersion": "0.1",
+  "product": {
+    "name": "Security Package",
+    "description": "Provides a set of security-related features including two-factor authentication for admins, Google ReCAPTCHA support for various forms, and Security.txt to support vulnerability disclosure practices."
+  },
+  "contacts": {
+    "team": {
+      "name": "CIA",
+      "DL": "magento-commerce-team-cia",
+      "slackChannel": "cia-team"
+    }
+  },
+  "ticketTracker": {
+    "functionalJiraQueue": {
+      "projectKey": "AC",
+      "component": ""
+    },
+    "securityJiraQueue": {
+      "projectKey": "MAGREQ",
+      "component": "Commerce M2"
+    }
+  },
+  "staticScan": {
+    "enable": true,
+    "frequency": "monthly",
+    "customName": "",
+    "branchesToScan": [
+      "develop"
+    ]
+  }
+}

README.md

@@ -1,69 +1,23 @@
-<h2>Welcome</h2>
-Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
+# Magento Security Package
 
-## Magento System Requirements
-*   [Magento System Requirements](https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements.html)
+Welcome to the Magento Security Package community project!
 
-## Install Magento
+## Overview
 
-*	[Installation Guide](https://devdocs.magento.com/guides/v2.4/install-gde/bk-install-guide.html)
+Magento security package provides a set of security-related features including two-factor authentication for admins, Google ReCAPTCHA support for various forms, and Security.txt to support vulnerability
+disclosure practices. 
 
-<h2>Contributing to the Magento 2 Code Base</h2>
-Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
+## Documentation
 
-To learn about how to make a contribution, click [here][1].
-
-To learn about issues, click [here][2].
-
-To open an issue, click [here][3].
-
-To suggest documentation improvements, click [here][4].
-
-[1]: https://devdocs.magento.com/contributor-guide/contributing.html
-[2]: https://devdocs.magento.com/contributor-guide/contributing.html#report
-[3]: https://github.com/magento/security-package/issues
-[4]: <https://devdocs.magento.com>
-
-<h3>Community Maintainers</h3>
-The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.
-
-<a href="https://magento.com/magento-contributors#maintainers">
-    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png"/>
-</a>
-
-<h3>Top Contributors</h3>
-Magento is thankful for any contribution that can improve our code base, documentation or increase test coverage. We always recognize our most active members, as their contributions are the foundation of the Magento Open Source platform.
-<a href="https://magento.com/magento-contributors">
-    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
-</a>
-
-### Labels Applied by the Magento Team
-We apply labels to public Pull Requests and Issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more.
-Please review the [Code Contributions guide](https://devdocs.magento.com/contributor-guide/contributing.html#labels) for detailed information on labels used in Magento 2 repositories.
-
-## Reporting Security Issues
-
-To report security vulnerabilities or learn more about reporting security issues in Magento software or web sites visit the [Magento Bug Bounty Program](https://hackerone.com/magento) on hackerone. Please create a hackerone account [there](https://hackerone.com/magento) to submit and follow-up your issue.
-
-Stay up-to-date on the latest security news and patches for Magento by signing up for [Security Alert Notifications](https://magento.com/security/sign-up).
-
-## License
-
-Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license.
-
-[Open Software License (OSL 3.0)](https://opensource.org/licenses/osl-3.0.php).
-Please see [LICENSE.txt](https://github.com/magento/security-package/blob/develop/LICENSE.txt) for the full text of the OSL 3.0 license or contact [email protected] for a copy.
-
-Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
-Please see LICENSE_EE.txt for the full text of the MEE License or visit https://magento.com/legal/terms/enterprise.
+- Complete documentation located on the project [wiki pages](https://github.com/magento/security-package/wiki):
+    - How to start local development described in the [installation guide](https://github.com/magento/security-package/wiki/Metapackage-Installation-Guide)
+    - Two-factor authentication [user guide](https://docs.magento.com/user-guide/stores/security-two-factor-authentication.html) and [technical guide](https://devdocs.magento.com/guides/v2.4/security/two-factor-authentication.html).
+    - Google ReCAPTCHA [user guide](https://docs.magento.com/user-guide/stores/security-google-recaptcha.html) and [technical guide](https://devdocs.magento.com/guides/v2.4/security/google-recaptcha.html).
+    - Security.txt [user guide](https://docs.magento.com/user-guide/configuration/security/security-txt.html) and [technical guide](https://devdocs.magento.com/guides/v2.4/security/security-txt.html).
 
 ## Community Engineering Slack
 
-To connect with Magento and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com). If you are interested in joining Slack, or a specific channel, send us request at [[email protected]](mailto:[email protected]) or [self signup](https://tinyurl.com/engcom-slack).
-
-
-We have channels for each project. These channels are recommended for new members:
+To connect with Magento team and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com).
+If you are interested in joining Slack, or a specific channel, use our [self signup](https://opensource.magento.com/slack) link.
 
-- [general](https://magentocommeng.slack.com/archives/C4YS78WE6): Open chat for introductions and Magento 2 questions
-- [github](https://magentocommeng.slack.com/archives/C7KB93M32): Support for GitHub issues, pull requests, and processes
-- [public-backlog](https://magentocommeng.slack.com/archives/CCV3J3RV5): Discussions of the Magento 2 backlog
+Magento security Slack channel: [#security](https://magentocommeng.slack.com/archives/CANPJTBC5)

ReCaptchaAdminUi/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-admin-ui",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.3.0||~7.4.0",
+        "php": "~7.4.0||~8.0.0",
         "magento/framework": "*",
         "magento/module-config": "*",
         "magento/module-re-captcha-ui": "*",

ReCaptchaCheckout/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-checkout",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.3.0||~7.4.0",
+        "php": "~7.4.0||~8.0.0",
         "magento/framework": "*",
         "magento/module-checkout": "*",
         "magento/module-re-captcha-ui": "*",

ReCaptchaCheckout/view/frontend/web/template/payment-recaptcha-container.html

@@ -5,6 +5,6 @@
  */
  -->
 <div>
-    <each args="data: getRegion('place-order-recaptcha'), as: 'recaptcha'" render=""/>
+    <each args="data: getRegion('place-order-recaptcha'), as: 'recaptcha'" render=""></each>
 </div>
 <hr />

ReCaptchaContact/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-contact",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.3.0||~7.4.0",
+        "php": "~7.4.0||~8.0.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*"
     },

ReCaptchaCustomer/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-customer",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.3.0||~7.4.0",
+        "php": "~7.4.0||~8.0.0",
         "magento/framework": "*",
         "magento/module-customer": "*",
         "magento/module-re-captcha-ui": "*",

ReCaptchaFrontendUi/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-frontend-ui",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.3.0||~7.4.0",
+        "php": "~7.4.0||~8.0.0",
         "magento/framework": "*",
         "magento/module-store": "*",
         "magento/module-re-captcha-ui": "*"

ReCaptchaFrontendUi/view/frontend/web/js/reCaptcha.js

@@ -59,6 +59,13 @@ define(
              * @returns {Boolean}
              */
             getIsInvisibleRecaptcha: function () {
+
+                if (this.settings ===
+
+                    void 0) {
+                    return false;
+                }
+
                 return this.settings.invisible;
             },
 
@@ -83,7 +90,9 @@ define(
                     widgetId,
                     parameters;
 
-                if (this.captchaInitialized) {
+                if (this.captchaInitialized || this.settings ===
+
+                    void 0) {
                     return;
                 }
 

ReCaptchaMigration/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-migration",
     "description": "Google reCAPTCHA config migration for Magento2",
     "require": {
-        "php": "~7.3.0||~7.4.0",
+        "php": "~7.4.0||~8.0.0",
         "magento/framework": "*",
         "magento/module-config": "*"
     },