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

Properly load keyrings of Mailvelope, OpenPGP.js and GnuPG

Browse source
This commit is contained in:
the-djmaze 2022-01-19 20:14:21 +01:00
parent 9f0b872839
commit c2e162b01b
8 changed files with 98 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dev/Common/Enums.js
View file

@ -4,6 +4,7 @@
* @enum {string}
*/
export const Capa = {
GnuPGP: 'GNUGP',
OpenPGP: 'OPEN_PGP',
Prefetch: 'PREFETCH',
Contacts: 'CONTACTS',

2
dev/Screen/User/Settings.js
View file

@ -57,7 +57,7 @@ export class SettingsUserScreen extends AbstractSettingsScreen {
settingsAddViewModel(ThemesUserSettings, 'SettingsThemes', 'SETTINGS_LABELS/LABEL_THEMES_NAME', 'themes');
}
if (Settings.capa(Capa.OpenPGP)) {
if (Settings.capa(Capa.OpenPGP) || Settings.capa(Capa.GnuPGP)) {
settingsAddViewModel(OpenPgpUserSettings, 'SettingsOpenPGP', 'OpenPGP', 'openpgp');
}

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

@ -40,31 +40,34 @@ export const PgpUserStore = new class {
}
init() {
if (Settings.capa(Capa.OpenPGP)) {
if (window.crypto && crypto.getRandomValues) {
const script = createElement('script', {src:openPgpJs()});
script.onload = () => {
if (window.Worker) {
try {
openpgp.initWorker({ path: openPgpWorkerJs() });
} catch (e) {
console.error(e);
}
if (Settings.capa(Capa.OpenPGP) && window.crypto && crypto.getRandomValues) {
const script = createElement('script', {src:openPgpJs()});
script.onload = () => {
if (window.Worker) {
try {
openpgp.initWorker({ path: openPgpWorkerJs() });
} catch (e) {
console.error(e);
}
this.loadKeyrings();
};
script.onerror = () => console.error(script.src);
doc.head.append(script);
} else {
}
this.loadKeyrings();
};
script.onerror = () => {
this.loadKeyrings();
console.error(script.src);
}
doc.head.append(script);
} else {
this.loadKeyrings();
}
}
loadKeyrings(identifier) {
if (window.mailvelope) {
console.log('mailvelope ready');
var fn = keyring => this.mailvelopeKeyring = keyring;
var fn = keyring => {
this.mailvelopeKeyring = keyring;
console.log('mailvelope ready');
};
mailvelope.getKeyring().then(fn, err => {
if (identifier) {
// attempt to create a new keyring for this app/user
@ -79,18 +82,23 @@ export const PgpUserStore = new class {
} else {
addEventListener('mailvelope', () => this.loadKeyrings(identifier));
}
if (openpgp) {
console.log('openpgp.js ready');
this.openpgpKeyring = new openpgp.Keyring();
this.reloadOpenPgpKeys();
}
this.gnupgkeys = [];
Remote.request('PgpGetKeysEmails',
(iError, oData) => {
console.dir(oData);
}
);
if (Settings.capa(Capa.GnuPGP)) {
this.gnupgkeys = [];
Remote.request('GnupgGetKeysEmails',
(iError, oData) => {
if (oData.Result) {
this.gnupgkeys = oData.Result;
console.log('gnupg ready');
}
}
);
}
}
reloadOpenPgpKeys() {
@ -148,6 +156,7 @@ export const PgpUserStore = new class {
delegateRunOnDestroy(this.openpgpkeys());
this.openpgpkeys(keys);
console.log('openpgp.js ready');
}
}
@ -213,6 +222,13 @@ export const PgpUserStore = new class {
this.openpgpkeys.find(item => item && !item.isPrivate && item.emails.includes(email))
);
if (this.gnupgkeys) {
let length = recipients.filter(email => this.gnupgkeys[email] && this.gnupgkeys[email].can_encrypt).length;
if (length && (!all || length === count)) {
return 'gnupg';
}
}
if (openpgp && openpgp.length && (!all || openpgp.length === count)) {
return 'openpgp';
}
@ -234,6 +250,10 @@ export const PgpUserStore = new class {
* Returns the first library that can.
*/
async hasPrivateKeyForEmail(email) {
if (this.gnupgkeys && this.gnupgkeys[email] && this.gnupgkeys[email].can_sign) {
return 'gnupg';
}
if (this.openpgpkeys && this.openpgpkeys.find(item => item && item.isPrivate && item.emails.includes(email))) {
return 'openpgp';
}