Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 08:27:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

#89 added OpenPGP.js encrypt HTML

Browse source
This commit is contained in:
the-djmaze 2022-02-03 23:36:12 +01:00
parent 6df9aaae43
commit 983a2db418
1 changed files with 35 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

48
dev/View/Popup/Compose.js
View file

@ -47,6 +47,8 @@ import { ContactsPopupView } from 'View/Popup/Contacts';
import { ThemeStore } from 'Stores/Theme'; import { ThemeStore } from 'Stores/Theme';
const const
base64_encode = text => btoa(text).match(/.{1,76}/g),
/** /**
* @param {string} prefix * @param {string} prefix
* @param {string} subject * @param {string} subject
@ -459,25 +461,45 @@ class ComposePopupView extends AbstractViewPopup {
send(); send();
}); });
} else if (encrypt) { } else if (encrypt) {
if (params.Html) {
throw 'Encrypt HTML with ' + encrypt + ' not yet implemented';
}
if ('openpgp' != encrypt) { if ('openpgp' != encrypt) {
throw 'Encryption with ' + encrypt + ' not yet implemented'; throw 'Encryption with ' + encrypt + ' not yet implemented';
} }
if (sign && 'openpgp' != sign[0]) { if (sign && 'openpgp' != sign[0]) {
throw 'Signing with ' + sign[0] + ' not yet implemented'; throw 'Signing with ' + sign[0] + ' not yet implemented';
} }
OpenPGPUserStore.encrypt(params.Text, this.allRecipients(), sign && sign[1]).then(text => { if (sign && sign[1]) {
if (text) { if (params.Html) {
params.Text = text; throw 'Encrypt HTML with ' + encrypt + ' not yet implemented';
send();
} else {
this.sendError(true);
this.sendErrorDesc(i18n('PGP_NOTIFICATIONS/PGP_ERROR', { ERROR: 'Encryption failed' }));
this.sending(false);
} }
}); OpenPGPUserStore.encrypt(params.Text, this.allRecipients(), sign[1]).then(armored => {
if (armored) {
params.Text = armored;
send();
} else {
this.sendError(true);
this.sendErrorDesc(i18n('PGP_NOTIFICATIONS/PGP_ERROR', { ERROR: 'Encryption failed' }));
this.sending(false);
}
});
} else {
let data = [
'Content-Transfer-Encoding: base64',
'Content-Type: text/'+(params.Html?'html':'plain')+'; charset="utf-8"',
'',
base64_encode(params.Html || params.Text)
].join("\r\n");
OpenPGPUserStore.encrypt(data, this.allRecipients(), sign && sign[1]).then(armored => {
if (armored) {
params.Text = params.Html = '';
params.Encrypted = armored;
send();
} else {
this.sendError(true);
this.sendErrorDesc(i18n('PGP_NOTIFICATIONS/PGP_ERROR', { ERROR: 'Encryption failed' }));
this.sending(false);
}
});
}
} else if (sign) { } else if (sign) {
if (params.Html) { if (params.Html) {
throw 'Signing HTML with ' + sign[0] + ' not yet implemented'; throw 'Signing HTML with ' + sign[0] + ' not yet implemented';
@ -497,7 +519,7 @@ class ComposePopupView extends AbstractViewPopup {
'' ''
] ]
// Now the body in base64 // Now the body in base64
.concat(btoa(params.Text).match(/.{1,76}/g)) .concat(base64_encode(params.Text))
.join("\r\n"); .join("\r\n");
} }
OpenPGPUserStore.sign(params.Text, sign[1]).then(text => { OpenPGPUserStore.sign(params.Text, sign[1]).then(text => {