Page MenuHomePhabricator
Files F3515291

D8476.id28595.diff
No OneTemporary
Actions

D8476.id28595.diff
View Options

diff --git a/keyserver/src/cron/cron.js b/keyserver/src/cron/cron.js
--- a/keyserver/src/cron/cron.js
+++ b/keyserver/src/cron/cron.js
@@ -1,5 +1,6 @@
// @flow
+import type { Account as OlmAccount } from '@commapp/olm';
import cluster from 'cluster';
import schedule from 'node-schedule';
@@ -25,7 +26,7 @@
import { deleteExpiredUpdates } from '../deleters/update-deleters.js';
import { deleteUnassignedUploads } from '../deleters/upload-deleters.js';
import { fetchCallUpdateOlmAccount } from '../updaters/olm-account-updater.js';
-import { validateAccountPrekey } from '../utils/olm-utils.js';
+import { revalidateAccountPrekeys } from '../utils/olm-utils.js';
if (cluster.isMaster) {
schedule.scheduleJob(
@@ -111,8 +112,17 @@
'0 0 * * *', // every day at midnight in the keyserver's timezone
async () => {
try {
- await fetchCallUpdateOlmAccount('content', validateAccountPrekey);
- await fetchCallUpdateOlmAccount('notifications', validateAccountPrekey);
+ await fetchCallUpdateOlmAccount(
+ 'content',
+ async (content_account: OlmAccount) => {
+ await fetchCallUpdateOlmAccount(
+ 'notifications',
+ async (notif_account: OlmAccount) => {
+ await revalidateAccountPrekeys(content_account, notif_account);
+ },
+ );
+ },
+ );
} catch (e) {
console.warn('encountered error while trying to validate prekeys', e);
}
diff --git a/keyserver/src/utils/olm-utils.js b/keyserver/src/utils/olm-utils.js
--- a/keyserver/src/utils/olm-utils.js
+++ b/keyserver/src/utils/olm-utils.js
@@ -6,9 +6,13 @@
Utility as OlmUtility,
Session as OlmSession,
} from '@commapp/olm';
+import { getRustAPI } from 'rust-node-addon';
import uuid from 'uuid';
import { olmEncryptedMessageTypes } from 'lib/types/crypto-types.js';
+import { values } from 'lib/utils/objects.js';
+
+import { fetchIdentityInfo } from '../user/identity.js';
type PickledOlmAccount = {
+picklingKey: string,
@@ -100,6 +104,70 @@
return shouldForget;
}
+async function revalidateAccountPrekeys(
+ content_account: OlmAccount,
+ notif_account: OlmAccount,
+): Promise<void> {
+ // Since keys are rotated synchronously, only check validity of one
+ if (shouldRotatePrekey(content_account)) {
+ await publishNewPrekeys(content_account, notif_account);
+ }
+ if (shouldForgetPrekey(content_account)) {
+ content_account.forget_old_prekey();
+ notif_account.forget_old_prekey();
+ }
+}
+
+async function publishNewPrekeys(
+ content_account: OlmAccount,
+ notif_account: OlmAccount,
+): Promise<void> {
+ const rustAPIPromise = getRustAPI();
+ const fetchIdentityInfoPromise = fetchIdentityInfo();
+
+ content_account.generate_prekey();
+ notif_account.generate_prekey();
+ const device_id = JSON.parse(content_account.identity_keys()).curve25519;
+
+ const content_prekeyMap = JSON.parse(content_account.prekey()).curve25519;
+ const [content_prekey] = values(content_prekeyMap);
+ const content_prekeySignature = content_account.prekey_signature();
+
+ const notif_prekeyMap = JSON.parse(notif_account.prekey()).curve25519;
+ const [notif_prekey] = values(notif_prekeyMap);
+ const notif_prekeySignature = notif_account.prekey_signature();
+
+ if (!content_prekeySignature || !notif_prekeySignature) {
+ console.log('Warning: Unable to create valid signature for a prekey');
+ return;
+ }
+
+ const [rustAPI, identityInfo] = await Promise.all([
+ rustAPIPromise,
+ fetchIdentityInfoPromise,
+ ]);
+
+ if (!identityInfo) {
+ console.log(
+ 'Warning: Attempted to refresh prekeys before registering with identity service',
+ );
+ return;
+ }
+
+ await rustAPI.publish_prekeys(
+ identityInfo.userId,
+ device_id,
+ identityInfo.accessToken,
+ content_prekey,
+ content_prekeySignature,
+ notif_prekey,
+ notif_prekeySignature,
+ );
+
+ content_account.mark_prekey_as_published();
+ notif_account.mark_prekey_as_published();
+}
+
function validateAccountPrekey(account: OlmAccount) {
if (shouldRotatePrekey(account)) {
// If there is no prekey or the current prekey is older than month
@@ -119,4 +187,6 @@
unpickleOlmAccount,
unpickleOlmSession,
validateAccountPrekey,
+ revalidateAccountPrekeys,
+ publishNewPrekeys,
};

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 23, 8:19 AM (14 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2694116
Default Alt Text
D8476.id28595.diff (4 KB)

Event Timeline