Skip to content

Improve encryption readability #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Improve encryption readability #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 55 additions & 45 deletions app/sagas/encryption.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,64 +22,74 @@ import log from '../utils/log';
const getServer = state => state.share.server.server || state.server.server;
const getE2eEnable = state => state.settings.E2E_Enable;

const handleEncryptionInit = function* handleEncryptionInit() {
function* isServerE2EActivated(server) {
const E2E_Enable = yield select(getE2eEnable);
const serversDB = database.servers;
const serversCollection = serversDB.collections.get('servers');

let serverInfo;
try {
const server = yield select(getServer);
const user = yield select(getUserSelector);
const E2E_Enable = yield select(getE2eEnable);

// Fetch server info to check E2E enable
const serversDB = database.servers;
const serversCollection = serversDB.collections.get('servers');
let serverInfo;
try {
serverInfo = yield serversCollection.find(server);
} catch {
// Server not found
}
serverInfo = yield serversCollection.find(server);
} catch {
return false;
}

// If E2E is disabled on server, skip
if (!serverInfo?.E2E_Enable && !E2E_Enable) {
return;
}
return !serverInfo?.E2E_Enable && !E2E_Enable;
}

// Fetch stored private e2e key for this server
const storedPrivateKey = yield UserPreferences.getStringAsync(`${ server }-${ E2E_PRIVATE_KEY }`);
function* showBannerToSaveLocalKey(storedServerE2EKey) {
const allStoredServerE2EKeys = yield RocketChat.e2eFetchMyKeys();

// Fetch server stored e2e keys
const keys = yield RocketChat.e2eFetchMyKeys();
if (!storedServerE2EKey && allStoredServerE2EKeys?.privateKey) {
yield put(encryptionSetBanner(E2E_BANNER_TYPE.REQUEST_PASSWORD));
}
}

function* saveUserPassword(server) {
const storedRandomPassword = yield UserPreferences.getStringAsync(`${ server }-${ E2E_RANDOM_PASSWORD_KEY }`);
if (storedRandomPassword) {
yield put(encryptionSetBanner(E2E_BANNER_TYPE.SAVE_PASSWORD));
}
}

// A private key was received from the server, but it's not saved locally yet
// Show the banner asking for the password
if (!storedPrivateKey && keys?.privateKey) {
yield put(encryptionSetBanner(E2E_BANNER_TYPE.REQUEST_PASSWORD));
function* getPublicE2EServerKey(server) {
const storedPublicKey = yield UserPreferences.getStringAsync(`${ server }-${ E2E_PUBLIC_KEY }`);
if (storedPublicKey) {
return EJSON.parse(storedPublicKey);
}
}

function* createNewUserE2EKey(userId, server) {
yield Encryption.createKeys(userId, server);
yield put(encryptionSetBanner(E2E_BANNER_TYPE.SAVE_PASSWORD));
}

function decryptAllPendingSubscriptions(userId) {
Encryption.initialize(userId);
}

const handleEncryptionInit = function* handleEncryptionInit() {
try {
const server = yield select(getServer);
const user = yield select(getUserSelector);

if (!isServerE2EActivated(server)) {
return;
}

// If the user has a private key stored, but never entered the password
const storedRandomPassword = yield UserPreferences.getStringAsync(`${ server }-${ E2E_RANDOM_PASSWORD_KEY }`);
if (storedRandomPassword) {
yield put(encryptionSetBanner(E2E_BANNER_TYPE.SAVE_PASSWORD));
}
const storedServerE2EKey = yield UserPreferences.getStringAsync(`${ server }-${ E2E_PRIVATE_KEY }`);
const storedPublicKey = getPublicE2EServerKey(server);

// Fetch stored public e2e key for this server
let storedPublicKey = yield UserPreferences.getStringAsync(`${ server }-${ E2E_PUBLIC_KEY }`);
// Prevent parse undefined
if (storedPublicKey) {
storedPublicKey = EJSON.parse(storedPublicKey);
}
showBannerToSaveLocalKey(storedServerE2EKey);
saveUserPassword(server);

if (storedPublicKey && storedPrivateKey) {
// Persist these keys
yield Encryption.persistKeys(server, storedPublicKey, storedPrivateKey);
if (storedPublicKey && storedServerE2EKey) {
yield Encryption.persistKeys(server, storedPublicKey, storedServerE2EKey);
} else {
// Create new keys since the user doesn't have any
yield Encryption.createKeys(user.id, server);
yield put(encryptionSetBanner(E2E_BANNER_TYPE.SAVE_PASSWORD));
createNewUserE2EKey(user.id, server);
}

// Decrypt all pending messages/subscriptions
Encryption.initialize(user.id);
decryptAllPendingSubscriptions(user.id);
} catch (e) {
log(e);
}
Expand Down