Skip to content

Commit b1e82d0

Browse files
authored
Merge pull request #112 from magento-gl/pre-release-sync
AC-8794: Sync 2.4.7-beta1-develop with 2.4-develop
2 parents 216af65 + d8f70f8 commit b1e82d0

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Welcome to the Magento Security Package community project!
55
## Overview
66

77
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
8-
disclosure practices.
8+
disclosure practices.
99

1010
## Documentation
1111

ReCaptchaCheckoutSalesRule/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ Google reCAPTCHA ensures that a human being, rather than a computer (or “bot
33

44
This module provides the reCAPTCHA implementations related to coupon code apply action on checkout cart & payment.
55

6-
For more information please visit the Magento document for reCAPTCHA.
6+
For more information please visit the Magento document for reCAPTCHA.

ReCaptchaUser/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ This module provides the reCAPTCHA implementations related to user actions.
66

77
For more information please visit the [Magento document for reCAPTCHA](https://docs.magento.com/user-guide/stores/security-google-recaptcha.html).
88

9-
109
## Emergency commandline disable for Admin panel Login page:
1110

1211
Can disable Google reCAPTCHA for Admin Panel Login page from command-line:

Securitytxt/README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
11
# Security.txt
22

33
### Summary
4+
>
45
> When security vulnerabilities are discovered by researchers, proper reporting channels are often lacking. As a result, vulnerabilities may be left unreported. This document defines a format ("security.txt") to help organizations describe their vulnerability disclosure practices to make it easier for researchers to report vulnerabilities.
56
67
Source: https://tools.ietf.org/html/draft-foudil-securitytxt-09
78

8-
The Magento_Securitytxt module provides the following functionality:
9+
The Magento_Securitytxt module provides the following functionality:
10+
911
* allows to save the security configurations in the admin panel
1012
* contains a router to match application action class for requests to the `.well-known/security.txt` and `.well-known/security.txt.sig` files.
1113
* serves the content of the `.well-known/security.txt` and `.well-known/security.txt.sig` files.
1214

1315
A valid security.txt file could look like the following example:
1416

15-
```
17+
```txt
1618
Contact: mailto:[email protected]
1719
Contact: tel:+1-201-555-0123
1820
Encryption: https://example.com/pgp.asc
1921
Acknowledgement: https://example.com/security/hall-of-fame
2022
Policy: https://example.com/security-policy.html
2123
Signature: https://example.com/.well-known/security.txt.sig
2224
```
25+
2326
Security.txt can be accessed at below location:
2427
`https://example.com/.well-known/security.txt`
2528

@@ -29,4 +32,4 @@ To create security.txt signature (security.txt.sig) file:
2932

3033
To verify the security.txt file's signature:
3134

32-
`gpg --verify security.txt.sig security.txt`
35+
`gpg --verify security.txt.sig security.txt`

_metapackage/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
# Magento_SecurityPackage
2-

0 commit comments

Comments
 (0)