Skip to content

#5966 Add reliable checks for ambigious file extensions #5969

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 4 commits into from
Apr 7, 2025
Merged

#5966 Add reliable checks for ambigious file extensions #5969

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6601510
refactor: add reliable checks for ambigious file extensions
martgil Apr 3, 2025
b979553
Merge branch 'master' into issue-5966-fix-invalid-assumption-on-ambig…
martgil Apr 7, 2025
31e9213
test: add test
martgil Apr 7, 2025
fc628e9
refactor: update test material info
martgil Apr 7, 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
2 changes: 1 addition & 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 @@ -204,7 +204,7 @@ export class Attachment {
} else if (this.name === 'message' && isBodyEmpty) {
// treat message as encryptedMsg when empty body for the 'message' attachment
return 'encryptedMsg';
} else if (this.name.match(/(\.pgp$)|(\.gpg$)|(\.[a-zA-Z0-9]{3,4}\.asc$)/g)) {
} else if (this.name.match(/(\.pgp$)|(\.gpg$)|(\.[a-zA-Z0-9]{3,4}\.asc$)/g) && !this.isPublicKey() && !this.isPrivateKey()) {
// ends with one of .gpg, .pgp, .???.asc, .????.asc
return 'encryptedFile';
// todo: after #4906 is done we should "decrypt" the encryptedFile here to see if it's a binary 'publicKey' (as in message 1869220e0c8f16dd)
Expand Down