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

#89 Improved handling of OpenPGP.js stored keys

Browse source
This commit is contained in:
the-djmaze 2022-01-27 20:54:27 +01:00
parent ff7e41ad08
commit 9ab72e7a34
6 changed files with 73 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

53
dev/Model/OpenPgpKey.js
View file

@ -1,53 +0,0 @@
import ko from 'ko';
import { arrayLength } from 'Common/Utils';
import { AbstractModel } from 'Knoin/AbstractModel';
export class OpenPgpKeyModel extends AbstractModel {
/**
* @param {string} guID
* @param {string} ID
* @param {array} IDs
* @param {array} userIDs
* @param {array} emails
* @param {string} armor
* @param {string} userID
*/
constructor(guID, ID, IDs, userIDs, emails, armor, userID) {
super();
this.id = ID;
this.ids = arrayLength(IDs) ? IDs : [ID];
this.guid = guID;
this.user = '';
this.users = userIDs;
this.email = '';
this.emails = emails;
this.armor = armor;
if (this.users) {
const index = this.users.indexOf(userID);
if (-1 !== index) {
this.user = this.users[index];
this.email = this.emails[index];
}
}
this.deleteAccess = ko.observable(false);
}
/**
* OpenPGP.js
*/
getNativeKeys() {
try {
let key = openpgp.key.readArmored(this.armor);
if (key && !key.err && key.keys && key.keys[0]) {
return key.keys;
}
} catch (e) {
console.error(e);
}
return null;
}
}

18
dev/Settings/User/OpenPgp.js
View file

@ -9,7 +9,6 @@ import { showScreenPopup } from 'Knoin/Knoin';
import { OpenPgpImportPopupView } from 'View/Popup/OpenPgpImport';
import { OpenPgpGeneratePopupView } from 'View/Popup/OpenPgpGenerate';
import { ViewOpenPgpKeyPopupView } from 'View/Popup/ViewOpenPgpKey';
import { Capa } from 'Common/Enums';
import { Settings } from 'Common/Globals';
@ -39,12 +38,6 @@ export class OpenPgpUserSettings /*extends AbstractViewSettings*/ {
showScreenPopup(OpenPgpGeneratePopupView);
}
viewOpenPgpKey(openPgpKey) {
if (openPgpKey) {
showScreenPopup(ViewOpenPgpKeyPopupView, [openPgpKey]);
}
}
onBuild() {
/**
* Create an iframe to display the Mailvelope keyring settings.
@ -52,15 +45,4 @@ export class OpenPgpUserSettings /*extends AbstractViewSettings*/ {
*/
window.mailvelope && mailvelope.createSettingsContainer('#mailvelope-settings'/*[, keyring], options*/);
}
/**
* @param {OpenPgpKeyModel} openPgpKeyToRemove
* @returns {void}
*/
deleteOpenPgpKey(openPgpKeyToRemove) {
if (openPgpKeyToRemove && openPgpKeyToRemove.deleteAccess()) {
this.openPgpKeyForDeletion(null);
PgpUserStore.deleteKey(openPgpKeyToRemove);
}
}
}

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

@ -15,6 +15,9 @@ import { delegateRunOnDestroy } from 'Common/UtilsUser';
import Remote from 'Remote/User/Fetch';
import { showScreenPopup } from 'Knoin/Knoin';
import { ViewOpenPgpKeyPopupView } from 'View/Popup/ViewOpenPgpKey';
const
findKeyByHex = (keys, hash) =>
keys.find(item => item && (hash === item.id || item.ids.includes(hash)));
@ -35,44 +38,62 @@ const
while (i--) {
key = await openpgp.readKey({armoredKey:armoredKeys[i]});
if (!key.err) {
const aEmails = [];
if (key.users) {
key.users.forEach(user => {
if (user.userID.email) {
aEmails.push(user.userID.email);
}
});
}
keys.push({
id: key.getKeyID().toHex(),
fingerprint: key.getFingerprint(),
can_encrypt: !!key.getEncryptionKey(),
can_sign: !!key.getSigningKey(),
emails: aEmails,
armor: armoredKeys[i],
deleteAccess: ko.observable(false)
});
// key.getUserIDs()
// key.getPrimaryUser()
keys.push(new OpenPgpKeyModel(armoredKeys[i], key));
}
}
}
return keys;
/*
},
storeKeys = async (itemname, keys) => {
let armoredKeys = [], i = arrayLength(keys);
if (i) {
while (i--) {
armoredKeys.push(await keys[i].armor());
}
storage.setItem(itemname, JSON.stringify(armoredKeys));
} else {
storage.removeItem(itemname);
}
*/
};
class OpenPgpKeyModel {
constructor(armor, key) {
this.key = key;
const aEmails = [];
if (key.users) {
key.users.forEach(user => {
if (user.userID.email) {
aEmails.push(user.userID.email);
}
});
}
this.id = key.getKeyID().toHex();
this.fingerprint = key.getFingerprint();
this.can_encrypt = !!key.getEncryptionKey();
this.can_sign = !!key.getSigningKey();
this.emails = aEmails;
this.armor = armor;
this.deleteAccess = ko.observable(false);
this.openForDeletion = ko.observable(null).deleteAccessHelper();
// key.getUserIDs()
// key.getPrimaryUser()
}
view() {
showScreenPopup(ViewOpenPgpKeyPopupView, [this]);
}
remove() {
if (this.deleteAccess()) {
this.openPgpKeyForDeletion(null);
let armoredKeys = [], itemname = publicKeysItem;
if (this.key.isPrivate()) {
itemname = privateKeysItem;
PgpUserStore.openpgpPrivateKeys.remove(this);
armoredKeys = PgpUserStore.openpgpPrivateKeys.map(item => item.armor);
} else {
PgpUserStore.openpgpPublicKeys.remove(this);
armoredKeys = PgpUserStore.openpgpPublicKeys.map(item => item.armor);
}
delegateRunOnDestroy(this);
if (armoredKeys.length) {
storage.setItem(itemname, JSON.stringify(armoredKeys));
} else {
storage.removeItem(itemname);
}
}
}
}
export const PgpUserStore = new class {
constructor() {
/**
@ -289,33 +310,6 @@ export const PgpUserStore = new class {
* OpenPGP.js
*/
/**
* @param {OpenPgpKeyModel} openPgpKeyToRemove
* @returns {void}
*/
deleteKey(openPgpKeyToRemove) {
const openpgpKeyring = this.openpgpKeyring;
if (openPgpKeyToRemove && openPgpKeyToRemove.deleteAccess() && openpgpKeyring) {
let items = [
this.openpgpPrivateKeys.find(key => openPgpKeyToRemove === key),
this.openpgpPublicKeys.find(key => openPgpKeyToRemove === key)
];
if (items[0]) {
this.openpgpPrivateKeys.remove(items[0]);
openpgpKeyring.privateKeys.removeForId(items[0].guid);
delegateRunOnDestroy(items[0]);
}
if (items[1]) {
this.openpgpPublicKeys.remove(items[1]);
openpgpKeyring.publicKeys.removeForId(items[1].guid);
delegateRunOnDestroy(items[1]);
}
if (items[0] || items[1]) {
openpgpKeyring.store();
}
}
}
/*
decryptMessage(message, recipients, fCallback) {
if (message && message.getEncryptionKeyIds) {
@ -385,7 +379,7 @@ export const PgpUserStore = new class {
// findPublicKeysBySigningKeyIds
const publicKeys = signingKeyIds.map(id => {
const key = id && id.toHex ? findKeyByHex(this.openpgpPublicKeys, id.toHex()) : null;
return key ? key.getNativeKeys() : [null];
return key ? key.key : [null];
}).flat().filter(v => v);
if (publicKeys && publicKeys.length) {
try {