Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync firewall options #37957

Merged
merged 6 commits into from
Jul 26, 2024
Merged

Sync firewall options #37957

merged 6 commits into from
Jul 26, 2024

Conversation

nateweller
Copy link
Contributor

@nateweller nateweller commented Jun 19, 2024 •
edited
Loading

Proposed changes:

Adds necessary supports for managing Jetpack firewall's automatic rules setting from WPCOM:

  • Syncs the WAF options with WPCOM.
  • Adds the WAF options to the wpcom settings endpoint.

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

Related to https://github.com/Automattic/jetpack-scan-team/issues/1228

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

Yes – syncs the setting that determines whether the site has the Jetpack firewall configured to use our automatic rules.

Testing instructions:

** Set up your sandbox**

  • Sandbox public-api.wordpress.com
  • Check out this branch in your local development environment
  • Build the plugin: jetpack build --production plugins/jetpack
  • Sync the plugin to your sandbox with jetpack rsync jetpack (see docs: PCYsg-eg0-p2)
  • Ensure you have define( 'JETPACK_AUTOLOAD_DEV', true ); in a mu-plugin on your sandbox (i.e. 0-sandbox).

** Set up a test site**

@nateweller nateweller self-assigned this Jun 19, 2024
@github-actions github-actions bot added [Feature] WPCOM API [Package] Sync [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Tests] Includes Tests labels Jun 19, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 19, 2024 •
edited
Loading

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/sync-waf-options 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/sync-waf-options

    bin/jetpack-downloader test jetpack-mu-wpcom-plugin add/sync-waf-options

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

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 19, 2024 •
edited
Loading

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

Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team Review" label and ask someone from your team review the code. Once reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.

Jetpack plugin:

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

  • WordPress.com Simple releases happen daily.
  • WoA releases happen weekly.
  • Releases to self-hosted sites happen monthly. The next release is scheduled for August 6, 2024 (scheduled code freeze on August 5, 2024).

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

Backup plugin:

  • Next scheduled release: none scheduled.

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

Boost plugin:

  • Next scheduled release: none scheduled.

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

Search plugin:

  • Next scheduled release: none scheduled.

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

Social plugin:

  • Next scheduled release: none scheduled.

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

Starter Plugin plugin:

  • Next scheduled release: none scheduled.

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.

Videopress plugin:

  • Next scheduled release: none scheduled.

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

Migration plugin:

  • Next scheduled release: none scheduled.

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

Mu Wpcom plugin:

  • Next scheduled release: WordPress.com Simple releases happen daily.

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

Wpcomsh plugin:

  • Next scheduled release: on demand (usually Mondays if not sooner).

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

Automattic For agencies client plugin:

  • Next scheduled release: none scheduled.

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

@nateweller nateweller force-pushed the add/sync-waf-options branch 2 times, most recently from 1b74fc2 to 6ff84ba Compare June 20, 2024 20:13
@github-actions github-actions bot added [Plugin] Automattic For Agencies Client [Plugin] Backup A plugin that allows users to save every change and get back online quickly with one-click restores. [Plugin] Boost A feature to speed up the site and improve performance. [Plugin] Migration [Plugin] mu wpcom jetpack-mu-wpcom plugin [Plugin] Protect A plugin with features to protect a site: brute force protection, security scanning, and a WAF. [Plugin] Search A plugin to add an instant search modal to your site to help visitors find content faster. [Plugin] Social Issues about the Jetpack Social plugin [Plugin] Starter Plugin [Plugin] VideoPress A standalone plugin to add high-quality VideoPress videos to your site. [Plugin] Wpcomsh labels Jun 20, 2024
@nateweller nateweller requested a review from a team June 21, 2024 18:33
@nateweller nateweller force-pushed the add/sync-waf-options branch from 6ff84ba to d3cbdf7 Compare June 21, 2024 18:37
@nateweller nateweller marked this pull request as ready for review June 21, 2024 18:39
@nateweller nateweller force-pushed the add/sync-waf-options branch 2 times, most recently from dfb1fff to 424f2df Compare June 24, 2024 16:38
@github-actions github-actions bot added [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Plugin] Migration [Plugin] mu wpcom jetpack-mu-wpcom plugin [Plugin] Protect A plugin with features to protect a site: brute force protection, security scanning, and a WAF. [Plugin] Search A plugin to add an instant search modal to your site to help visitors find content faster. [Plugin] Social Issues about the Jetpack Social plugin [Plugin] Starter Plugin [Plugin] VideoPress A standalone plugin to add high-quality VideoPress videos to your site. [Plugin] Wpcomsh [Tests] Includes Tests labels Jul 22, 2024
@nateweller nateweller force-pushed the add/sync-waf-options branch 2 times, most recently from aaad6ca to a402b45 Compare July 24, 2024 21:33
dkmyta
dkmyta previously approved these changes Jul 24, 2024
View reviewed changes
Copy link
Contributor

@dkmyta dkmyta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see nothing wrong with the code written here. Added one comment and a nitpick, but otherwise will mark this approved and continue with testing things further down the line that make use of these changes.

projects/packages/sync/src/class-defaults.php Show resolved Hide resolved
projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php Show resolved Hide resolved
@nateweller nateweller force-pushed the add/sync-waf-options branch from 9595b40 to fd3b4f4 Compare July 26, 2024 19:34
@nateweller nateweller requested a review from dkmyta July 26, 2024 19:34
@nateweller nateweller mentioned this pull request Jul 26, 2024
Merged
7 tasks
@nateweller nateweller force-pushed the add/sync-waf-options branch from fd3b4f4 to a978b45 Compare July 26, 2024 19:59
dkmyta
dkmyta approved these changes Jul 26, 2024
View reviewed changes
Copy link
Contributor

@dkmyta dkmyta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@nateweller nateweller merged commit fa559b8 into trunk Jul 26, 2024
72 of 74 checks passed
@nateweller nateweller deleted the add/sync-waf-options branch July 26, 2024 23:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dkmyta dkmyta dkmyta approved these changes

Assignees

@nateweller nateweller

Labels
[Feature] WPCOM API [Package] Sync [Plugin] Automattic For Agencies Client [Plugin] Backup A plugin that allows users to save every change and get back online quickly with one-click restores. [Plugin] Boost A feature to speed up the site and improve performance. [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Plugin] Migration [Plugin] mu wpcom jetpack-mu-wpcom plugin [Plugin] Protect A plugin with features to protect a site: brute force protection, security scanning, and a WAF. [Plugin] Search A plugin to add an instant search modal to your site to help visitors find content faster. [Plugin] Social Issues about the Jetpack Social plugin [Plugin] Starter Plugin [Plugin] VideoPress A standalone plugin to add high-quality VideoPress videos to your site. [Plugin] Wpcomsh [Tests] Includes Tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nateweller @dkmyta