Skip to content

#5896 Propose hotfix in extension when sending password messages #5897

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

Merged
merged 5 commits into from
Jan 17, 2025
Merged

#5896 Propose hotfix in extension when sending password messages #5897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a606d5
add reference comment
martgil Jan 9, 2025
68537f3
Merge remote-tracking branch 'origin/master' into issue-5896-bad-reci…
martgil Jan 14, 2025
9b58e7c
revert changes
martgil Jan 14, 2025
b2e767d
add working hotfix
martgil Jan 14, 2025
5b33256
pr reviews: apply fix with appropriate approach
martgil Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions extension/js/common/api/account-servers/external-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ export class ExternalService extends Api {
JSON.stringify({
associateReplyToken,
from,
to: (recipients.to || []).map(Str.formatEmailWithOptionalName).map(Xss.stripEmojis),
cc: (recipients.cc || []).map(Str.formatEmailWithOptionalName).map(Xss.stripEmojis),
bcc: (recipients.bcc || []).map(Str.formatEmailWithOptionalName).map(Xss.stripEmojis),
to: (recipients.to || []).map(Str.formatEmailWithOptionalName).map(Xss.stripEmojis).map(Str.replaceAccentedChars),
cc: (recipients.cc || []).map(Str.formatEmailWithOptionalName).map(Xss.stripEmojis).map(Str.replaceAccentedChars),
bcc: (recipients.bcc || []).map(Str.formatEmailWithOptionalName).map(Xss.stripEmojis).map(Str.replaceAccentedChars),
})
),
});
Expand Down
8 changes: 8 additions & 0 deletions extension/js/common/core/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,13 @@ export class Str {
return str.replace(/[.~!$%^*=?]/gi, '');
};

public static replaceAccentedChars = (str: string) => {
/*
* hotfix for issue https://github.com/FlowCrypt/enterprise-server/issues/6264
*/
return str.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
};

public static formatEmailWithOptionalName = (emailParts: EmailParts): string => {
return Str.formatEmailWithOptionalNameEx(emailParts);
};
Expand Down Expand Up @@ -281,6 +288,7 @@ export class Str {
public static stripPgpOrGpgExtensionIfPresent = (filename: string) => {
return filename.replace(/\.(pgp|gpg)$/i, '');
};

private static formatEmailWithOptionalNameEx = ({ email, name }: EmailParts, forceBrackets?: boolean): string => {
if (name) {
return `${Str.rmSpecialCharsKeepUtf(name, 'ALLOW-SOME')} <${email}>`;
Expand Down
Loading