Forms: Validate field type format in get_field_type_icon#47965
Merged
Conversation
Add a format check at the top of get_field_type_icon(): the $field_type argument must be a non-empty string of lowercase letters, digits, and hyphens, starting with a letter. Anything else returns the same empty string the helper already returns when an icon file is missing, so the caller flow is unchanged for legitimate types. Tests cover the rejected formats (non-strings, uppercase, leading digits, leading hyphens, internal whitespace, empty string) and a positive set of legitimate field types including the hyphenated entries that go through the existing exception map. Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
Contributor
|
Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.
Interested in more tips and information?
|
Contributor
|
Thank you for your PR! When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:
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:
If you have questions about anything, reach out in #jetpack-developers for guidance! |
Code Coverage SummaryCoverage changed in 1 file.
|
enejb
approved these changes
Apr 8, 2026
Member
enejb
left a comment
There was a problem hiding this comment.
Nice fix. The fix make sense to me :)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes FORMS-656
Proposed changes
Contact_Form::get_field_type_icon()builds a filesystem path from the$field_typevalue before reading the correspondingicon.svgfile. The helper trusted whatever the caller passed in, so a non-conforming$field_typecould yield an unexpected file lookup. While the existing/icon.svgsuffix on the path significantly limits any practical impact (only files literally namedicon.svgcan ever be read, and the standard set of those in WordPress are public block/plugin icons), the absence of input validation on a value that drives a filesystem call is still worth tightening as a hardening / code-quality improvement.The fix is a strict format check at the top of the helper:
Valid types are non-empty strings of lowercase letters, digits, and hyphens, starting with a letter. Anything else returns the same empty string the helper already returns when an icon file is missing, so caller flow is unchanged for legitimate types.
Why a regex format check vs. a hardcoded allowlist:
blocks/field-*to build a runtime list)Other information
Related product discussion/links
Does this pull request change what data or activity we track or use?
No.
Testing instructions
phone,telephone,radio,checkbox-multiple) should all render their icons identically to before.