Skip to content

#5979 Better detection for emails with noname attachments #5980

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 9 commits into from
May 2, 2025
Merged

#5979 Better detection for emails with noname attachments #5980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
789f010
refactor: add pre-check for email body before continuing to other con…
martgil Apr 21, 2025
bac250c
chore: add code comments
martgil Apr 21, 2025
973f119
test: split test in two
martgil Apr 26, 2025
6c2b75b
test: update test detection for test with an expired key
martgil Apr 27, 2025
fcd336a
refactor: rename variables
martgil Apr 27, 2025
b26688e
refactor: group similar tests
martgil Apr 27, 2025
3081ea6
test: add test for case application/pdf
martgil May 1, 2025
34ab2c0
Merge remote-tracking branch 'origin/master' into issue-5979-better-d…
martgil May 1, 2025
feb5b12
refactor: revert changes
martgil May 1, 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: 5 additions & 1 deletion extension/js/common/core/attachment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,11 @@ export class Attachment {
return 'signature';
} else if (this.inline && this.isImage()) {
return 'inlineImage';
} else if (!this.name && !this.isImage() && !['application/octet-stream', 'multipart/mixed', 'message/global'].includes(this.type)) {
} else if (!this.name && !['application/octet-stream', 'multipart/mixed', 'message/global'].includes(this.type)) {
// this is a noname attachment, but treat them as 'plainFile' if body is not empty. therefore, the attachment can't be concluded as pgp message
if (!isBodyEmpty) {
return 'plainFile';
}
// this.name may be '' or undefined - catch either
return this.length < 100 ? 'hidden' : 'encryptedMsg';
} else if (this.name === 'msg.asc' && this.length < 100 && this.type === 'application/pgp-encrypted') {
Expand Down
Loading