Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 16 additions & 2 deletions extension/js/common/core/attachment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -254,19 +254,24 @@ export class Attachment {
'cpl',
'diagcab',
'diagcfg',
'diagpack',
'diagpkg',
'dll',
'dmg',
'docm',
'ex',
'ex_',
'exe',
'gadget',
'hta',
'htm',
'html',
'img',
'ins',
'iso',
'isp',
'jar',
'jnlp',
'mjs',
'js',
'jse',
'lib',
Expand All @@ -279,8 +284,13 @@ export class Attachment {
'msp',
'mst',
'nsh',
'one',
'pif',
'pptm',
'ps1',
'pub',
'rar',
'rtf',
'scr',
'sct',
'shb',
Expand All @@ -289,12 +299,16 @@ export class Attachment {
'vbe',
'vbs',
'vhd',
'vhdx',
'vxd',
'wsc',
'wsf',
'wsh',
'xll',
].some(exeFileExtension => this.name.endsWith('.' + exeFileExtension));
'xlsm',
'7z',
'ace',
].some(exeFileExtension => this.name.toLowerCase().endsWith('.' + exeFileExtension));
Comment thread
martgil marked this conversation as resolved.
};

private isPrivateKey = (): boolean => {
Expand Down
3 changes: 2 additions & 1 deletion extension/js/common/lang.ts
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ export const Lang = {
deleteKeyConfirm: (fingerprint: string) => `Are you sure you want to remove encryption key with fingerprint ${fingerprint}?`,
},
attachment: {
executableFileWarning: 'This executable file was not checked for viruses, and may be dangerous to download or run. Proceed anyway?', // xss-escaped
executableFileWarning:
'This attachment may be unsafe and has not been checked for viruses. Only proceed if you trust the sender and were expecting this file.', // xss-escaped
},
};
Loading
Loading