Page MenuHomePhabricator
Files F3509793

No OneTemporary
Actions

View Options

diff --git a/keyserver/src/cron/compare-users.js b/keyserver/src/cron/compare-users.js
index cca750238..7697275f7 100644
--- a/keyserver/src/cron/compare-users.js
+++ b/keyserver/src/cron/compare-users.js
@@ -1,30 +1,41 @@
// @flow
+import { getRustAPI } from 'rust-node-addon';
import { deleteCookies } from '../deleters/cookie-deleters.js';
import { fetchNativeCookieIDsForUserIDs } from '../fetchers/cookie-fetchers.js';
import { fetchAllUserIDs } from '../fetchers/user-fetchers.js';
async function compareMySQLUsersToIdentityService(): Promise<void> {
- // eslint-disable-next-line no-unused-vars
- const allUserIDs = await fetchAllUserIDs();
- // next we need to query identity service for two things:
- // 1. users in identity that aren't here
- // 2. users here that aren't in identity
- const userMissingFromKeyserver = [];
- const userMissingFromIdentity = [];
- if (userMissingFromKeyserver.length > 0) {
+ const [allUserIDs, rustAPI] = await Promise.all([
+ fetchAllUserIDs(),
+ getRustAPI(),
+ ]);
+ const userComparisonResult = await rustAPI.compareUsers(allUserIDs);
+ const { usersMissingFromKeyserver, usersMissingFromIdentity } =
+ userComparisonResult;
+
+ if (usersMissingFromKeyserver.length > 0) {
console.warn(
"found users in identity service that aren't in MySQL! " +
- JSON.stringify(userMissingFromKeyserver),
+ JSON.stringify(usersMissingFromKeyserver),
);
}
- if (userMissingFromIdentity.length === 0) {
+ if (usersMissingFromIdentity.length === 0) {
return;
}
const cookieIDs = await fetchNativeCookieIDsForUserIDs(
- userMissingFromIdentity,
+ usersMissingFromIdentity,
);
+ if (cookieIDs.length === 0) {
+ return;
+ }
+
+ // By deleting a cookie associated with a user's device, we trigger an
+ // auto-log-in from that device, which lets us access the user's password. We
+ // need the password in order to double-write user data to the identity
+ // service. We only delete cookies associated with native devices because we
+ // don't cache passwords on other platforms.
await deleteCookies(cookieIDs);
}
export { compareMySQLUsersToIdentityService };

File Metadata

Mime Type
text/x-diff
Expires
Mon, Dec 23, 8:16 AM (1 d, 7 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2690103
Default Alt Text
(2 KB)

Event Timeline