fix: normalize email addresses when retrieving from server #11055
Conversation
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
SebastianKrupinski
force-pushed
the
fix/issue-noid-normalize-email-addresses
branch
from
744f0b3 to
7659ee1
Compare
Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>
SebastianKrupinski
force-pushed
the
fix/issue-noid-normalize-email-addresses
branch
from
a7f06b2 to
24b0191
Compare
SebastianKrupinski
requested review from
ChristophWurst,
kesselb and
GretaD
as code owners
kesselb
requested changes
May 9, 2025
| // user1@example.com | ||
| // 'user1@example.com' | ||
| // ' user1@example.com' | ||
| return strtolower(trim(trim($address, "'"))); |
There was a problem hiding this comment.
As mentioned at #10980 (comment).
'test@example.orgis a valid email address.- The current normalizer incorrectly changes it to
test@example.org
Example:
if (str_starts_with($address, "'") && str_ends_with($address, "'")) {
$address = substr($address, 1, -1); // or trim($address, "'"); whatever you prefer
}
return strtolower(trim($address));Given that we need the same logic in the repair job, I'd suggest moving the normalization to a small helper or utility service to make it reusable and more testable.
| $select->expr()->like('email', $select->createNamedParameter('\'%\'', IQueryBuilder::PARAM_STR)) | ||
| ) | ||
| ->setMaxResults(1000); | ||
| $recipients = $select->executeQuery()->fetchAll(); |
There was a problem hiding this comment.
Suggested change
| $recipients = $select->executeQuery()->fetchAll(); | |
| $result = $select->executeQuery(); | |
| $recipients = $result->fetchAll(); | |
| $result->closeCursor(); |
| foreach ($recipients as $recipient) { | ||
| $id = $recipient['id']; | ||
| $email = $recipient['email']; | ||
| $email = trim(str_replace('\'', '', (string)$email)); |
There was a problem hiding this comment.
Suggested change
| $email = trim(str_replace('\'', '', (string)$email)); | |
| $email = trim(trim($email, "'")); |
The best approach would be to reuse the logic from the address class. If we don't go with the helper/utility, we should still use trim to remove the first and last character (even if we can be very sure, due to the query, that we're only dealing with emails starting and ending with a ').
2 tasks
|
/backport to stable5.2 |
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.
resolves: client ticket - issue with email addresses being wrapped in single quotes