Jetpack: Account Protection #40925

dkmyta · 2025-01-09T13:43:37Z

Project branch for the Account Protection project based off of #40923.

Proposed changes:

Other information:

Have you written new tests for your changes, if applicable?
Have you checked the E2E test CI results, and verified that your changes do not break them?
Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

https://github.com/Automattic/jetpack-scan-team/issues/1628
peb6dq-3o9-p2

Does this pull request change what data or activity we track or use?

TBD

Testing instructions:

TBD

github-actions · 2025-01-09T13:44:33Z

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

✅ Include a description of your PR changes.
✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
🔴 Add a "[Type]" label (Bug, Enhancement, Janitorial, Task).
✅ Add testing instructions.
✅ Specify whether this PR includes any changes to data or privacy.
✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.

Follow this PR Review Process:

Ensure all required checks appearing at the bottom of this PR are passing.
Choose a review path based on your changes:
- A. Team Review: add the "[Status] Needs Team Review" label
  - For most changes, including minor cross-team impacts.
  - Example: Updating a team-specific component or a small change to a shared library.
- B. Crew Review: add the "[Status] Needs Review" label
  - For significant changes to core functionality.
  - Example: Major updates to a shared library or complex features.
- C. Both: Start with Team, then request Crew
  - For complex changes or when you need extra confidence.
  - Example: Refactor affecting multiple systems.
Get at least one approval before merging.

Still unsure? Reach out in #jetpack-developers for guidance!

Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

WordPress.com Simple releases happen semi-continuously (PCYsg-Jjm-p2).
WoA releases happen weekly.
Releases to self-hosted sites happen monthly. The next release is scheduled for none scheduled (scheduled code freeze on undefined).

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Protect plugin:

Next scheduled release: none scheduled.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

…ction

@Package

* Add Account Protection toggle to Jetpack security settings * Import package and run activation/deactivation on module toggle * changelog * Update changelog * Make account protection class init static * Remove user cxn req and banner * Do not enabled module by default * Add strict mode option and settings toggle * changelog * Use dynamic classes * Update class dependencies * Fix copy * Revert unrelated changes * Fix phan errors * Changelog * Update composer deps * Update lock files, add constructor method * Fix php warning * Update @Package * Enable module by default

github-actions · 2025-01-24T19:58:44Z

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the add/account-protection branch.
- For jetpack-mu-wpcom changes, also add define( 'JETPACK_MU_WPCOM_LOAD_VIA_BETA_PLUGIN', true ); to your wp-config.php file.

To test on Simple, run the following command on your sandbox:

bin/jetpack-downloader test jetpack add/account-protection

bin/jetpack-downloader test jetpack-mu-wpcom-plugin add/account-protection

Interested in more tips and information?

In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
Read more about our development workflow here: PCYsg-eg0-p2
Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

@Package

* Add Account Protection toggle to Jetpack security settings * Import package and run activation/deactivation on module toggle * changelog * Add Protect Settings page and hook up Account Protection toggle * changelog * Update changelog * Register modules on plugin activation * Ensure package is initialized on plugin activation * Make account protection class init static * Remove user cxn req and banner * Do not enabled module by default * Add strict mode option and settings toggle * changelog * Add strict mode toggle * Add strict mode toggle and endpoints * Use dynamic classes * Update class dependencies * Fix copy * Revert unrelated changes * Revert unrelated changes * Fix method calls * Do not activate by default * Fix phan errors * Changelog * Update composer deps * Update lock files, add constructor method * Fix php warning * Update lock file * Changelog * Update @Package * Enable module by default * Enable module by default * Update projects/plugins/protect/src/js/data/account-protection/use-account-protection-mutation.ts Co-authored-by: Kolja Zuelsdorf <[email protected]> * Update lock files --------- Co-authored-by: Kolja Zuelsdorf <[email protected]>

@Package

* Add Account Protection toggle to Jetpack security settings * Import package and run activation/deactivation on module toggle * changelog * Add Protect Settings page and hook up Account Protection toggle * changelog * Update changelog * Register modules on plugin activation * Ensure package is initialized on plugin activation * Make account protection class init static * Add auth hooks, redirect and a custom login action template * Reorg, add Password_Detection class * Remove user cxn req and banner * Do not enabled module by default * Add strict mode option and settings toggle * changelog * Add strict mode toggle * Add strict mode toggle and endpoints * Reorg and add kill switch and is supported check * Add testing infrastructure * Add email handlings, resend AJAX action, and attempt limitations * Add nonces, checks and template error handling * Use method over template to avoid lint errors * Improve render_password_detection_template, update SVG file ext * Remove template file and include * Prep for validation endpoints * Update classes to be dynamic * Add constructors * Reorg user meta methods * Add type declarations and hinting * Simplify method naming * Use dynamic classes * Update class dependencies * Fix copy * Revert unrelated changes * Revert unrelated changes * Fix method calls * Do not activate by default * Fix phan errors * Changelog * Update composer deps * Update lock files, add constructor method * Fix php warning * Update lock file * Changelog * Fix Password_Detection constructor * Changelog * More changelogs * Remove comments * Fix static analysis errors * Remove top level phpunit.xml.dist * Remove never return type * Revert tests dir changes in favour of a dedicated task * Add tests dir * Reapply default test infrastructure * Reorg and rename * Update @Package * Use never phpdoc return type as per static analysis error * Enable module by default * Enable module by default * Update projects/plugins/protect/src/js/data/account-protection/use-account-protection-mutation.ts Co-authored-by: Kolja Zuelsdorf <[email protected]> * Update lock files --------- Co-authored-by: Kolja Zuelsdorf <[email protected]>

@Package

* Add Account Protection toggle to Jetpack security settings * Import package and run activation/deactivation on module toggle * changelog * Add Protect Settings page and hook up Account Protection toggle * changelog * Update changelog * Register modules on plugin activation * Ensure package is initialized on plugin activation * Make account protection class init static * Add auth hooks, redirect and a custom login action template * Reorg, add Password_Detection class * Remove user cxn req and banner * Do not enabled module by default * Add strict mode option and settings toggle * changelog * Add strict mode toggle * Add strict mode toggle and endpoints * Reorg and add kill switch and is supported check * Add testing infrastructure * Add email handlings, resend AJAX action, and attempt limitations * Add nonces, checks and template error handling * Use method over template to avoid lint errors * Improve render_password_detection_template, update SVG file ext * Remove template file and include * Prep for validation endpoints * Update classes to be dynamic * Add constructors * Reorg user meta methods * Add type declarations and hinting * Simplify method naming * Use dynamic classes * Update class dependencies * Fix copy * Revert unrelated changes * Revert unrelated changes * Fix method calls * Do not activate by default * Fix phan errors * Changelog * Update composer deps * Update lock files, add constructor method * Fix php warning * Update lock file * Changelog * Fix Password_Detection constructor * Changelog * More changelogs * Remove comments * Fix static analysis errors * Remove top level phpunit.xml.dist * Remove never return type * Revert tests dir changes in favour of a dedicated task * Add tests dir * Reapply default test infrastructure * Reorg and rename * Update @Package * Use never phpdoc return type as per static analysis error * Enable module by default * Enable module by default * Remove all reference to and functionality of strict mode * Remove unneeded strict mode code, update Protect settings UI * Updates/fixes * Fix import * Update placeholder content * Revert unrelated changes * Remove missed code

@Package

* Add Account Protection toggle to Jetpack security settings * Import package and run activation/deactivation on module toggle * changelog * Add Protect Settings page and hook up Account Protection toggle * changelog * Update changelog * Register modules on plugin activation * Ensure package is initialized on plugin activation * Make account protection class init static * Add auth hooks, redirect and a custom login action template * Reorg, add Password_Detection class * Remove user cxn req and banner * Do not enabled module by default * Add strict mode option and settings toggle * changelog * Add strict mode toggle * Add strict mode toggle and endpoints * Reorg and add kill switch and is supported check * Add testing infrastructure * Add email handlings, resend AJAX action, and attempt limitations * Add nonces, checks and template error handling * Use method over template to avoid lint errors * Improve render_password_detection_template, update SVG file ext * Remove template file and include * Prep for validation endpoints * Update classes to be dynamic * Add constructors * Reorg user meta methods * Add type declarations and hinting * Simplify method naming * Use dynamic classes * Update class dependencies * Fix copy * Revert unrelated changes * Revert unrelated changes * Fix method calls * Do not activate by default * Fix phan errors * Changelog * Update composer deps * Update lock files, add constructor method * Fix php warning * Update lock file * Changelog * Fix Password_Detection constructor * Changelog * More changelogs * Remove comments * Fix static analysis errors * Remove top level phpunit.xml.dist * Remove never return type * Revert tests dir changes in favour of a dedicated task * Add tests dir * Reapply default test infrastructure * Reorg and rename * Update @Package * Use never phpdoc return type as per static analysis error * Enable module by default * Enable module by default * Remove all reference to and functionality of strict mode * Remove unneeded strict mode code, update Protect settings UI * Updates/fixes * Fix import * Update placeholder content * Revert unrelated changes * Remove missed code * Update reset email to two factor auth email * Updates and improvements * Reorg * Optimizations and reorganizations * Hook up email service * Update error handling todos, fix weak password check * Test * Localize text content * Fix lint warnings/errors * Update todos * Add error handling, enforce input restrictions * Move main constants back entry file * Fix package version check * Optimize setting error transient * Add nonce check for resend email action * Fix spacing * Fix resend nonce handling * Email service fixes * Fixes, improvements to doc consistency * Fix phan errors * Revert prior change * Send auth code via wpcom only * Update method name

* Created new branch with cherrypicked changes from tests because something to screwed up with the base branch. * Added tests for email service. * Added tests for account protection module class. * Added tests for password detection class. * Added changelog entry. * Fix PHP 8 consistency issue in test. * Fixed phan issues.

* Update description copy * Update copy

* Update copy as per design input * Fix typo * Remove learn more copy to maintain consistency with Jetpack * Update copy * Optimize css

github-actions · 2025-01-31T23:26:27Z

Code Coverage Summary

Coverage changed in 6 files. Only the first 5 are listed here.

File	Coverage	Δ%	Δ Uncovered
projects/plugins/protect/src/class-rest-controller.php	0/286 (0.00%)	0.00%	41 💔
projects/plugins/jetpack/modules/module-headings.php	210/1022 (20.55%)	0.03%	18 💔
projects/packages/account-protection/src/class-account-protection.php	23/35 (65.71%)	-34.29%	12 💔
projects/plugins/protect/src/class-jetpack-protect.php	0/176 (0.00%)	0.00%	4 💔
projects/plugins/jetpack/_inc/client/security/index.jsx	0/30 (0.00%)	0.00%	1 ❤️‍🩹

7 files are newly checked for coverage. Only the first 5 are listed here.

File	Coverage
projects/plugins/jetpack/_inc/client/components/data/query-account-protection-settings/index.jsx	0/8 (0.00%) 💔
projects/plugins/jetpack/_inc/client/security/account-protection.jsx	0/5 (0.00%) 💔
projects/packages/account-protection/src/class-validation-service.php	16/23 (69.57%) 💚
projects/packages/account-protection/src/class-email-service.php	30/41 (73.17%) 💚
projects/packages/account-protection/src/class-password-detection.php	113/129 (87.60%) 💚

Full summary · PHP report · JS report

_{Add label

I don't care about code coverage for this PR
Use this label to ignore the check for insufficient code coveage.
to override the failing coverage check.}

* Remove early return after auth code validation to render error * Fix tests * Improve tests * Reapply return type and type hints * Fix spacing

* Restore JetpackTestEnvironment * Update lock files

dkmyta added 2 commits January 9, 2025 05:33

Add account protection package

d20732c

Initialize project branch

f8b11f6

dkmyta self-assigned this Jan 9, 2025

github-actions bot added the [Status] In Progress label Jan 9, 2025

github-actions bot added the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Jan 9, 2025

dkmyta added 2 commits January 17, 2025 15:41

Update lock files

50d7e71

Fix versions

716a6b0

dkmyta marked this pull request as ready for review January 20, 2025 17:56

dkmyta added 4 commits January 20, 2025 09:56

Merge branch 'trunk' into add/packages/account-protection

09fd9d2

Merge branch 'add/packages/account-protection' into add/account-prote…

dde199a

…ction

Update phan baseline

4b5550a

Merge branch 'add/packages/account-protection' into add/account-prote…

2c9a0e8

…ction

Base automatically changed from add/packages/account-protection to trunk January 24, 2025 18:44

github-actions bot added [Package] Account Protection [Tests] Includes Tests Docs labels Jan 24, 2025

dkmyta and others added 2 commits January 24, 2025 10:54

Merge branch 'trunk' into add/account-protection

ce55671

github-actions bot added [Feature] WPCOM API [JS Package] API [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ Admin Page React-powered dashboard under the Jetpack menu RNA labels Jan 24, 2025

github-actions bot added the [Plugin] Protect A plugin with features to protect a site: brute force protection, security scanning, and a WAF. label Jan 24, 2025

dkmyta and others added 2 commits January 24, 2025 12:22

dkmyta force-pushed the add/account-protection branch from a4b2f4a to 639a306 Compare January 29, 2025 21:06

dkmyta and others added 6 commits January 30, 2025 10:01

Jetpack: Update Account Protection copy (#41404)

e4c9b48

* Update description copy * Update copy

Protect: Update Account Protection copy (#41402)

90f3e8a

* Update copy as per design input * Fix typo * Remove learn more copy to maintain consistency with Jetpack * Update copy * Optimize css

Rebase

22326bf

Merge branch 'trunk' into add/account-protection

22e369e

dkmyta and others added 7 commits February 2, 2025 13:07

Add wordbless dep, update consumer lock files

7c669bf

Allow core installer

73c5326

Update lock files

cdf66ba

Account Protection: Fix invalid auth early return (#41652)

9435aa8

* Remove early return after auth code validation to render error * Fix tests * Improve tests * Reapply return type and type hints * Fix spacing

Reset to base (#41691)

e03a3f1

Merge branch 'trunk' into add/account-protection

95f80c1

Account Protection: Restore JetpackTestEnvironment (#41736)

9032fde

* Restore JetpackTestEnvironment * Update lock files

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Jetpack: Account Protection #40925

Jetpack: Account Protection #40925

dkmyta commented Jan 9, 2025 •

edited

Loading

github-actions bot commented Jan 9, 2025 •

edited

Loading

github-actions bot commented Jan 24, 2025 •

edited

Loading

github-actions bot commented Jan 31, 2025 •

edited

Loading

Jetpack: Account Protection #40925

Are you sure you want to change the base?

Jetpack: Account Protection #40925

Conversation

dkmyta commented Jan 9, 2025 • edited Loading

Proposed changes:

Other information:

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

github-actions bot commented Jan 9, 2025 • edited Loading

github-actions bot commented Jan 24, 2025 • edited Loading

github-actions bot commented Jan 31, 2025 • edited Loading

Code Coverage Summary

dkmyta commented Jan 9, 2025 •

edited

Loading

github-actions bot commented Jan 9, 2025 •

edited

Loading

github-actions bot commented Jan 24, 2025 •

edited

Loading

github-actions bot commented Jan 31, 2025 •

edited

Loading