Improve support for special characters in blognames #7
Conversation
This file contains 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
<img width="235" alt="image" src="https://user-images.githubusercontent.com/442115/199106435-f82bc6d7-51ea-45fe-970d-a62c18a334b7.png"> The emails sent by this plugin mangle the site name of blogs with non-english special characters. I am not confident this fully resolves the issue, because running these two strings via `wp shell` on an environment with a Japanese or accented-french blog name renders the same output, but there is a definite issue with how special characters are handled when sending these emails, and this change mirrors how the wordpress/two-factor plugin does things upstream: https://github.com/WordPress/two-factor/blob/master/providers/class-two-factor-email.php#L227
roborourke
approved these changes
Jan 16, 2023
| @@ -148,7 +148,7 @@ public function generate_and_email_token( $user ) { | |||
| $token = $this->generate_token( $user->ID ); | |||
|
|
|||
| /* translators: %s: site name */ | |||
| $subject = wp_strip_all_tags( sprintf( __( 'Your login confirmation code for %s', 'two-factor' ), get_bloginfo( 'name' ) ) ); | |||
| $subject = wp_strip_all_tags( sprintf( __( 'Your login confirmation code for %s', 'two-factor' ), mb_encode_mimeheader( get_option( 'blogname' ), ENT_QUOTES ) ) ); | |||
There was a problem hiding this comment.
What about html_entity_decode()? Looks fine if it works as expected though.
There was a problem hiding this comment.
I'd defer to @ajvillegas on whether that was tried or not. wp_specialchars_decode which the upstream uses definitely does not fix it, so I would guess that the more specific function here is likely necessary.
|
@roborourke This had worked locally but when I installed on a dev stack just now, I got this fatal when trying to initiate an email code resend: I recommend we untag and un-publish 0.3.1 for now |
|
@kadamwhite The |
|
Reverted in 59b577a and will open a new PR to iterate |
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.
I actually think that this patch doesn't fix my problem, but to report the problem: special characters in the blog name are not properly escaped in the sender field of the email dispatched by this plugin. Example,
The attached change mirrors how the wordpress/two-factor plugin does things upstream:
https://github.com/WordPress/two-factor/blob/master/providers/class-two-factor-email.php#L227
but I assume it would not impact how the blog name is rendered in what I am guessing is the sender name field. So possibly something that needs to be fixed outside of this plugin.