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

#89 OpenPGP.js encrypt (+ verify)

Browse source
This commit is contained in:
the-djmaze 2022-02-03 10:17:18 +01:00
parent 6b2311663b
commit 73fa215e22
7 changed files with 126 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

44
dev/Stores/User/OpenPGP.js
View file

@ -184,6 +184,7 @@ export const OpenPGPUserStore = new class {
const passphrase = prompt('OpenPGP.js Passphrase for ' + privateKey.id + ' ' + privateKey.emails[0]);
if (null !== passphrase) {
const
publicKey = findOpenPGPKey(this.publicKeys, sender/*, sign*/),
decryptedKey = await openpgp.decryptKey({
privateKey: privateKey.key,
passphrase
@ -191,7 +192,7 @@ export const OpenPGPUserStore = new class {
return await openpgp.decrypt({
message,
verificationKeys: this.getPublicKeyFor(sender),
verificationKeys: publicKey && publicKey.key,
// expectSigned: true,
// signature: '', // Detached signature
decryptionKeys: decryptedKey
@ -238,21 +239,52 @@ export const OpenPGPUserStore = new class {
}
}
async signCleartext(text, privateKey) {
/**
* https://docs.openpgpjs.org/global.html#sign
*/
async sign(text, privateKey, detached) {
const passphrase = prompt('OpenPGP.js Passphrase for ' + privateKey.id + ' ' + privateKey.emails[0]);
if (null !== passphrase) {
privateKey = await openpgp.decryptKey({
privateKey: privateKey.key,
passphrase
});
const unsignedMessage = await openpgp.createCleartextMessage({ text: text });
const message = detached
? await openpgp.createMessage({ text: text })
: await openpgp.createCleartextMessage({ text: text });
return await openpgp.sign({
message: unsignedMessage, // CleartextMessage or Message object
signingKeys: privateKey
// detached: false
message: message,
signingKeys: privateKey,
detached: !!detached
});
}
return false;
}
/**
* https://docs.openpgpjs.org/global.html#encrypt
*/
async encrypt(text, recipients, signPrivateKey) {
const count = recipients.length;
recipients = recipients.map(email => this.publicKeys().find(key => key.emails.includes(email))).filter(key => key);
if (count === recipients.length) {
if (signPrivateKey) {
const passphrase = prompt('OpenPGP.js Passphrase for ' + signPrivateKey.id + ' ' + signPrivateKey.emails[0]);
if (null === passphrase) {
return;
}
signPrivateKey = await openpgp.decryptKey({
privateKey: signPrivateKey.key,
passphrase
});
}
return await openpgp.encrypt({
message: await openpgp.createMessage({ text: text }),
encryptionKeys: recipients.map(pkey => pkey.key),
signingKeys: signPrivateKey
// signature
});
}
}
};

8
dev/Stores/User/Pgp.js
View file

@ -74,14 +74,14 @@ export const PgpUserStore = new class {
async hasPublicKeyForEmails(recipients, all) {
const count = recipients.length;
if (count) {
if (GnuPGUserStore.hasPublicKeyForEmails(recipients, all)) {
return 'gnupg';
}
if (OpenPGPUserStore.hasPublicKeyForEmails(recipients, all)) {
return 'openpgp';
}
if (GnuPGUserStore.hasPublicKeyForEmails(recipients, all)) {
return 'gnupg';
}
let keyring = this.mailvelopeKeyring,
mailvelope = keyring && await keyring.validKeyForAddress(recipients)
/*.then(LookupResult => Object.entries(LookupResult))*/;

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

@ -360,8 +360,8 @@ class ComposePopupView extends AbstractViewPopup {
Bcc: this.bcc(),
ReplyTo: this.replyTo(),
Subject: this.subject(),
TextIsHtml: TextIsHtml ? 1 : 0,
Text: Text,
Html: TextIsHtml ? Text : '',
Text: TextIsHtml ? '' : Text,
DraftInfo: this.aDraftInfo,
InReplyTo: this.sInReplyTo,
References: this.sReferences,
@ -453,16 +453,16 @@ class ComposePopupView extends AbstractViewPopup {
);
if (encrypt) {
throw 'Encryption not yet implemented';
}
if (sign && 'openpgp' != sign[0]) {
throw 'Signing with ' + sign[0] + ' not yet implemented';
}
if (sign && 'openpgp' == sign[0]) {
if (params.TextIsHtml) {
throw i18n('PGP_NOTIFICATIONS/PGP_ERROR', { ERROR: "Can't sign HTML" });
if (params.Html) {
throw 'Encrypt HTML with ' + encrypt + ' not yet implemented';
}
OpenPGPUserStore.signCleartext(params.Text, sign[1]).then(text => {
if ('openpgp' != encrypt) {
throw 'Encryption with ' + encrypt + ' not yet implemented';
}
if (sign && 'openpgp' != sign[0]) {
throw 'Signing with ' + sign[0] + ' not yet implemented';
}
OpenPGPUserStore.encrypt(params.Text, this.allRecipients(), sign && sign[1]).then(text => {
if (text) {
params.Text = text;
send();
@ -472,6 +472,42 @@ class ComposePopupView extends AbstractViewPopup {
this.sending(false);
}
});
} else if (sign) {
if (params.Html) {
throw 'Signing HTML with ' + sign[0] + ' not yet implemented';
}
if ('openpgp' != sign[0]) {
throw 'Signing with ' + sign[0] + ' not yet implemented';
}
const detached = false;
if (detached) {
// Append headers
params.Text = [
'Content-Transfer-Encoding: base64',
'Content-Type: text/plain; charset="utf-8"; protected-headers="v1"',
// 'From: Demo <demo@snappymail.eu>',
// 'To: Demo <demo@snappymail.eu>',
// 'Subject: text detached signed'
''
]
// Now the body in base64
.concat(btoa(params.Text).match(/.{1,76}/g))
.join("\r\n");
}
OpenPGPUserStore.sign(params.Text, sign[1]).then(text => {
if (text) {
if (detached) {
params.Signature = text;
} else {
params.Text = text;
}
send();
} else {
this.sendError(true);
this.sendErrorDesc(i18n('PGP_NOTIFICATIONS/PGP_ERROR', { ERROR: 'Signing failed' }));
this.sending(false);
}
});
} else {
send();
}

7
dev/View/User/MailBox/MessageView.js
View file

@ -634,6 +634,13 @@ export class MailMessageView extends AbstractViewRight {
PgpUserStore.decrypt(oMessage).then(result => {
if (result && result.data) {
mimeToMessage(result.data, oMessage);
if (result.signatures) {
oMessage.pgpSigned(true);
oMessage.pgpVerified({
signatures: result.signatures,
success: !!result.signatures.length
});
}
}
});
}