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?

No

Testing instructions:

peb6dq-3yG-p2

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.
To test on Simple, run the following command on your sandbox:
```
bin/jetpack-downloader test jetpack 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

* 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

@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 * Add remaining password validation * Update weak password check returns * Fix phan errors * Revert prior change * Fix meta key * Add process for add/updating recent pass list * Send auth code via wpcom only * Update method name * Optimize validation * Fix key, remove testing code * Fix docs * Fix tests * Improve matches user data logic * Remove password reset nonce verification code * Updates and fixes * Include tests for new validation methods * Include tests for new validation methods * Add password manager class tests * Remove custom nonce, add core create-user nonce check * Remove todos - always run server side validation * Update constant naming * Translate error message * Ensure styles are enqueued when viewing the password detection page * Use global page now and action check to enqueue styles * Skip recent password checks during create user action * Additional skips, and comment clarification * Revert skips of user specific reset form validation, hook provides access to this * Revert unintended additions * Return early if update is irrelevant * Only verify nonce if pass is set * Skip validation if bypass enabled * Fix test * Update methods, removes nonce checks, fix tests * Fix test * Remove comment

…41699) * Invalidate account protection query on connection * Ensure account protection query exists before invalidating

@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 * Add remaining password validation * Update weak password check returns * Fix phan errors * Revert prior change * Fix meta key * Add process for add/updating recent pass list * Send auth code via wpcom only * Update method name * Optimize validation * Fix key, remove testing code * Fix docs * Add foundation for the custom password strength meter * Fix tests * Add ajax request for password validation * Improve matches user data logic * Remove password reset nonce verification code * Updates and fixes * Updates and improvements * Include tests for new validation methods * Include tests for new validation methods * Add password manager class tests * Add password validation status handling and hook up ajax callback * Update variables names * Add loading state * Remove todos * Add nonce to ajax request * Remove custom nonce, add core create-user nonce check * Remove todos - always run server side validation * Update constant naming * Translate error message * Ensure styles are enqueued when viewing the password detection page * Use global page now and action check to enqueue styles * Skip recent password checks during create user action * Additional skips, and comment clarification * Revert skips of user specific reset form validation, hook provides access to this * Revert unintended additions * Return early if update is irrelevant * Only verify nonce if pass is set * Skip validation if bypass enabled * Improve logic * Improvements and reorg * Add info popovers * Add core req to initial validation state * Generalize core info popover message * Fix core strength meter status * Remove testing code * Ensure save enabled when appropriate * Update todos * Center validation items * Fix tests * Save alt approach * Fix styling, centralize core references * Reorg * Use global pagenow for context, restrict user specific check to profile updates * Compartmentalize generating and appending validation meter and status initial states * Optimization and reorg improvements * Remove todos * Remove unneeded comments * Ensure info popover fits in all form views * Fix test * Fix test * Update methods, removes nonce checks, fix tests * Fix test * Remove comment * Fix bindEvents * Correct colors * Add aria-live attr to strength-meter * Remove core input mods and use custom selectors to apply strength meter margins * Update core validation item message, and display only on failure * Add clarifying comment * Remove unnecessary user->ID check, and redundant method

…#41692)

jp-launch-control · 2025-02-15T18:59:09Z

Code Coverage Summary

Coverage changed in 5 files.

File	Coverage	Δ%	Δ Uncovered
projects/plugins/protect/src/class-rest-controller.php	0/286 (0.00%)	0.00%	41 💔
projects/packages/account-protection/src/class-account-protection.php	29/49 (59.18%)	-40.82%	20 💔
projects/plugins/jetpack/modules/module-headings.php	210/1022 (20.55%)	0.03%	18 💔
projects/plugins/protect/src/class-jetpack-protect.php	0/176 (0.00%)	0.00%	4 💔
projects/plugins/jetpack/_inc/client/lib/plans/constants.js	221/273 (80.95%)	0.07%	0 💚

10 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/6 (0.00%) 💔
projects/packages/account-protection/src/class-password-strength-meter.php	1/48 (2.08%) 💔
projects/packages/account-protection/src/class-validation-service.php	52/125 (41.60%) ❤️‍🩹
projects/packages/account-protection/src/class-password-manager.php	21/31 (67.74%) 💚

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.}

projects/plugins/jetpack/modules/account-protection.php

projects/js-packages/api/changelog/add-jetpack-account-protection-security-settings

projects/packages/account-protection/src/class-password-manager.php

Co-authored-by: Nate Weller <[email protected]>

…r.php Co-authored-by: Nate Weller <[email protected]>

dkmyta · 2025-02-16T12:22:41Z

projects/plugins/jetpack/modules/account-protection.php

+ * Module Name: Account protection
+ * Module Description: When enabled, users can only set passwords that meet strong security standards, helping protect their accounts and your site.
+ * Sort Order: 4
+ * First Introduced: $$next-version$$


Suggested change

* First Introduced: $$next-version$$

* First Introduced: 14.4

This caused build errors, reverted for now but this here as a reminder that this will need to be updated.

[plugins/jetpack 4.266] ::error file=projects/plugins/jetpack/modules/account-protection.php,line=6::Unexpected `$$next-version$$` token. [plugins/jetpack 5.382] Build failed: Error: Command failed with exit code 1: /home/runner/work/jetpack/jetpack/tools/replace-next-version-tag.sh -v plugins/jetpack 14.4-a.4

* Protect: use object for account protection settings, add isEnabled and isSupported * Add test for Settings class * Minor clean up

…ments (#41830) * Protect: use object for account protection settings, add isEnabled and isSupported * Protect: disable account protection toggle when not supported in current env * Adjust implementation * Remove custom class name for disabled case * Fix tests * Fix error * Align copy --------- Co-authored-by: dkmyta <[email protected]> Co-authored-by: dkmyta <[email protected]>

…ments (#41831) * Protect: use object for account protection settings, add isEnabled and isSupported * Jetpack: disable account protection toggle and show notice when in unsupported env * Use SimpleNotice and adjust position * Refactor --------- Co-authored-by: dkmyta <[email protected]>

* Protect: use object for account protection settings, add isEnabled and isSupported * Jetpack: disable account protection toggle and show notice when in unsupported env * Use SimpleNotice and adjust position * Refactor * Adjust account protection settings UI in Jetpack --------- Co-authored-by: dkmyta <[email protected]>

…41875)

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 13 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

Protect: Fix Account Protection initial toggle state on activation (#…

e3e192d

…41699) * Invalidate account protection query on connection * Ensure account protection query exists before invalidating

Fix BFP recovery process conflict (#41739)

b44b207

Improve the display of error notices on the password detection screen (…

132417b

…#41692)

Account Protection: Improve auth success flow (#41727)

547328a

nateweller reviewed Feb 15, 2025

View reviewed changes

projects/plugins/jetpack/modules/account-protection.php Outdated Show resolved Hide resolved

nateweller reviewed Feb 15, 2025

View reviewed changes

projects/js-packages/api/changelog/add-jetpack-account-protection-security-settings Outdated Show resolved Hide resolved

nateweller reviewed Feb 16, 2025

View reviewed changes

projects/packages/account-protection/src/class-password-manager.php Outdated Show resolved Hide resolved

nateweller mentioned this pull request Feb 16, 2025

Clean up changelogs in account protection branch #41833

Merged

3 tasks

Account Protection: clean up changelogs (#41833)

6d60099

dkmyta assigned nateweller Feb 16, 2025

dkmyta and others added 2 commits February 15, 2025 19:22

Update projects/plugins/jetpack/modules/account-protection.php

323bc99

Co-authored-by: Nate Weller <[email protected]>

Update projects/packages/account-protection/src/class-password-manage…

10f5295

…r.php Co-authored-by: Nate Weller <[email protected]>

dkmyta commented Feb 16, 2025

View reviewed changes

dkmyta and others added 7 commits February 16, 2025 04:23

Update projects/plugins/jetpack/modules/account-protection.php

fd2cb1c

Account Protection: Add Settings Class (#41829)

6478ee4

* Protect: use object for account protection settings, add isEnabled and isSupported * Add test for Settings class * Minor clean up

Protect: Fix unsupported environment notice display while toggling (#…

d507e5b

…41875)

Add optimistic update revert, remove async from sync function (#41878)

05491e7

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

jp-launch-control bot commented Feb 15, 2025 •

edited

Loading

dkmyta Feb 16, 2025 •

edited

Loading

	* First Introduced: $$next-version$$
	* First Introduced: 14.4

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

jp-launch-control bot commented Feb 15, 2025 • edited Loading

Code Coverage Summary

dkmyta Feb 16, 2025 • edited Loading

Choose a reason for hiding this comment

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

jp-launch-control bot commented Feb 15, 2025 •

edited

Loading

dkmyta Feb 16, 2025 •

edited

Loading