Skip to content

Conversation

tbradsha
Copy link
Contributor

@tbradsha tbradsha commented Jul 29, 2025

Closes MONOREP-47

If bad data was passed to the robots_txt filter (e.g. null) we'd get a fatal, since the data should be a string. This resets the param to an empty string if it isn't already a string.

I recently became aware of another set of logs to monitor, and this popped up as an easy but important one to fix.

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

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

Testing instructions:

You can probably reproduce with by adding filter, but the code should be pretty straightforward.

@tbradsha tbradsha requested a review from a team July 29, 2025 19:58
@tbradsha tbradsha self-assigned this Jul 29, 2025
@tbradsha tbradsha added [Status] Needs Review This PR is ready for review. [Type] Janitorial labels Jul 29, 2025
Copy link
Contributor

github-actions bot commented Jul 29, 2025

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 WoA dev 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 (WordPress.com Site Helper), and enable the fix/robots_fatal branch.
  • To test on Simple, run the following command on your sandbox:
bin/jetpack-downloader test jetpack-mu-wpcom-plugin fix/robots_fatal

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

Copy link
Contributor

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


Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Make sure to test your changes on all platforms that it applies to. You're responsible for the quality of the code you ship.
  3. You can use GitHub's Reviewers functionality to request a review.
  4. When it's reviewed and merged, you will be pinged in Slack to deploy the changes to WordPress.com simple once the build is done.

If you have questions about anything, reach out in #jetpack-developers for guidance!

Copy link

jp-launch-control bot commented Jul 29, 2025

Code Coverage Summary

Coverage changed in 1 file.

File Coverage Δ% Δ Uncovered
projects/packages/jetpack-mu-wpcom/src/features/blog-privacy/blog-privacy.php 27/35 (77.14%) 1.39% 0 💚

Full summary · PHP report

if ( ! is_string( $output ) ) {
$output = '';
}

$public = (int) $public;
Copy link
Contributor

Choose a reason for hiding this comment

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

Instead of this, we may have to do like

$public = (int) get_option( 'blog_public' );

WordPress 6.8 started casting the value to bool before calling the hook (see WordPress/wordpress-develop@f01e8109), and wpcom picked that up too (see Automattic/wpcom@d84b7196). If we still want to handle the non-Core "-1" case (treating it as "extra-false" rather than true as will be passed) in this hook, we'll need to refetch it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch! Addressed in 49cf5f4.

tbradsha and others added 3 commits July 30, 2025 09:01
Co-authored-by: Brad Jorsch <anomiex@users.noreply.github.com>
Co-authored-by: Brad Jorsch <anomiex@users.noreply.github.com>
anomiex
anomiex previously approved these changes Jul 30, 2025
Copy link
Contributor

@anomiex anomiex left a comment

Choose a reason for hiding this comment

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

Looks reasonable, haven't tested though.

One suggestion for a comment inline

Co-authored-by: Brad Jorsch <anomiex@users.noreply.github.com>
anomiex
anomiex previously approved these changes Jul 30, 2025
@anomiex
Copy link
Contributor

anomiex commented Jul 30, 2025

Looks like there's tests for this code that will need updating now that we re-fetch the option.

@tbradsha tbradsha merged commit ce9d9b5 into trunk Jul 30, 2025
66 checks passed
@tbradsha tbradsha deleted the fix/robots_fatal branch July 30, 2025 19:14
@github-actions github-actions bot removed the [Status] Needs Review This PR is ready for review. label Jul 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants