CringeStudios/element-desktop
5
0
Fork 0
mirror of https://github.com/CringeStudios/element-desktop.git synced 2025-01-31 13:39:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove change passphrase logic and rely on keytar

Browse Source
This commit is contained in:
Germain Souquet 2021-04-23 15:17:50 +01:00
parent 3f9495f19d
commit 1fa6671a17
1 changed files with 47 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
src/electron-main.js
View File

@ -62,8 +62,6 @@ let Seshat;
let SeshatRecovery; let SeshatRecovery;
let ReindexError; let ReindexError;
const seshatDefaultPassphrase = "DEFAULT_PASSPHRASE";
try { try {
const seshatModule = require('matrix-seshat'); const seshatModule = require('matrix-seshat');
Seshat = seshatModule.Seshat; Seshat = seshatModule.Seshat;
@ -501,6 +499,25 @@ ipcMain.on('ipcCall', async function(ev, payload) {
}); });
}); });
const seshatDefaultPassphrase = "DEFAULT_PASSPHRASE";
async function getOrCreatePassphrase(key) {
if (keytar) {
try {
const storedPassphrase = await keytar.getPassword("element.io", key);
if (storedPassphrase !== null) {
return storedPassphrase;
} else {
return await randomArray(32);
}
} catch (e) {
console.log("Error getting the event index passphrase out of the secret store", e);
}
} else {
return seshatDefaultPassphrase;
}
}
ipcMain.on('seshat', async function(ev, payload) { ipcMain.on('seshat', async function(ev, payload) {
if (!mainWindow) return; if (!mainWindow) return;
@ -529,89 +546,38 @@ ipcMain.on('seshat', async function(ev, payload) {
const deviceId = args[1]; const deviceId = args[1];
const passphraseKey = `seshat|${userId}|${deviceId}`; const passphraseKey = `seshat|${userId}|${deviceId}`;
let changePassphrase = false; const passphrase = await getOrCreatePassphrase(passphraseKey);
let passphrase = seshatDefaultPassphrase;
if (keytar) {
try {
// Try to get a passphrase for seshat.
const storedPassphrase = await keytar.getPassword("element.io", passphraseKey);
// If no passphrase was found mark that we should change
// it, if one is found, use that one.
if (storedPassphrase === null) {
changePassphrase = true;
} else {
passphrase = storedPassphrase;
}
} catch (e) {
console.log("Error getting the event index passphrase out of the secret store", e);
}
}
const openSeshat = async () => {
try {
await afs.mkdir(eventStorePath, {recursive: true});
return new Seshat(eventStorePath, {passphrase});
} catch (e) {
if (e instanceof ReindexError) {
// If this is a reindex error, the index schema
// changed. Try to open the database in recovery mode,
// reindex the database and finally try to open the
// database again.
const recoveryIndex = new SeshatRecovery(eventStorePath, {
passphrase,
});
const userVersion = await recoveryIndex.getUserVersion();
// If our user version is 0 we'll delete the db
// anyways so reindexing it is a waste of time.
if (userVersion === 0) {
await recoveryIndex.shutdown();
try {
await deleteContents(eventStorePath);
} catch (e) {
}
} else {
await recoveryIndex.reindex();
}
return new Seshat(eventStorePath, {passphrase});
} else {
throw (e);
}
}
};
try { try {
eventIndex = await openSeshat(); await afs.mkdir(eventStorePath, {recursive: true});
eventIndex = new Seshat(eventStorePath, {passphrase});
} catch (e) { } catch (e) {
sendError(payload.id, e); if (e instanceof ReindexError) {
return; // If this is a reindex error, the index schema
} // changed. Try to open the database in recovery mode,
// reindex the database and finally try to open the
if (changePassphrase) { // database again.
try { const recoveryIndex = new SeshatRecovery(eventStorePath, {
// Generate a new random passphrase. passphrase,
const newPassphrase = await randomArray(32);
await keytar.setPassword("element.io", passphraseKey, newPassphrase);
// Set the new passphrase, this will close the event
// index.
await eventIndex.changePassphrase(newPassphrase);
// Keep this delay to avoid race conditions where the DB
// lock has not been released properly when trying to
// create a new event index
await delay(500);
// Re-open the event index with the new passphrase.
eventIndex = new Seshat(eventStorePath, {
passphrase: newPassphrase,
}); });
} catch (e) {
const userVersion = await recoveryIndex.getUserVersion();
// If our user version is 0 we'll delete the db
// anyways so reindexing it is a waste of time.
if (userVersion === 0) {
await recoveryIndex.shutdown();
try {
await deleteContents(eventStorePath);
} catch (e) {
}
} else {
await recoveryIndex.reindex();
}
eventIndex = new Seshat(eventStorePath, {passphrase});
} else {
sendError(payload.id, e); sendError(payload.id, e);
return; return;
} }