Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F2983701
D13667.id45079.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
4 KB
Referenced Files
None
Subscribers
None
D13667.id45079.diff
View Options
diff --git a/keyserver/src/keyserver.js b/keyserver/src/keyserver.js
--- a/keyserver/src/keyserver.js
+++ b/keyserver/src/keyserver.js
@@ -48,9 +48,10 @@
} from './uploads/uploads.js';
import { createAuthoritativeKeyserverConfigFiles } from './user/create-configs.js';
import { fetchIdentityInfo } from './user/identity.js';
-import { verifyUserLoggedIn } from './user/login.js';
+import { authAndSaveIdentityInfo } from './user/login.js';
import { initENSCache } from './utils/ens-cache.js';
import { initFCCache } from './utils/fc-cache.js';
+import { syncPlatformDetails } from './utils/identity-utils.js';
import { getContentSigningKey } from './utils/olm-utils.js';
import {
isPrimaryNode,
@@ -180,39 +181,41 @@
console.log('Error generating QR code', e);
}
} else {
- // Allow login to be optional until staging environment is available
- try {
- await (async () => {
- // Should not be run by Landing or WebApp nodes
- if (!isPrimaryNode && !isSecondaryNode) {
- return;
- }
-
- // We await here to ensure that the keyserver has been provisioned a
- // commServicesAccessToken. In the future, this will be necessary for
- // many keyserver operations.
- const identityInfo = await verifyUserLoggedIn();
+ await (async () => {
+ // Should not be run by Landing or WebApp nodes
+ if (!isPrimaryNode && !isSecondaryNode) {
+ return;
+ }
- if (!isPrimaryNode) {
- return;
+ let identityInfo = await fetchIdentityInfo();
+ // Secondary nodes should not attempt identity auth. Instead, they
+ // should poll until the identity info is in the database
+ if (isSecondaryNode) {
+ while (!identityInfo) {
+ await sleep(5000);
+ identityInfo = await fetchIdentityInfo();
}
+ return;
+ }
+ // If the primary node is able to fetch persisted identity info, it
+ // should attempt to sync platform details with the identity service
+ if (identityInfo) {
+ ignorePromiseRejections(syncPlatformDetails(identityInfo));
+ } else {
+ identityInfo = await authAndSaveIdentityInfo();
+ }
- // We don't await here, as Tunnelbroker communication is not needed
- // for normal keyserver behavior yet. In addition, this doesn't
- // return information useful for other keyserver functions.
- ignorePromiseRejections(createAndMaintainTunnelbrokerWebsocket(null));
+ // We don't await here, as Tunnelbroker communication is not needed
+ // for normal keyserver behavior yet. In addition, this doesn't
+ // return information useful for other keyserver functions.
+ ignorePromiseRejections(createAndMaintainTunnelbrokerWebsocket(null));
- if (process.env.NODE_ENV !== 'development') {
- return;
- }
+ if (process.env.NODE_ENV !== 'development') {
+ return;
+ }
- await createAuthoritativeKeyserverConfigFiles(identityInfo.userId);
- })();
- } catch (e) {
- console.warn(
- 'Failed identity login. Login optional until staging environment is available',
- );
- }
+ await createAuthoritativeKeyserverConfigFiles(identityInfo.userId);
+ })();
}
if (!isCPUProfilingEnabled) {
diff --git a/keyserver/src/user/login.js b/keyserver/src/user/login.js
--- a/keyserver/src/user/login.js
+++ b/keyserver/src/user/login.js
@@ -258,4 +258,8 @@
}
}
-export { verifyUserLoggedIn, verifyUserLoggedInWithoutDB };
+export {
+ verifyUserLoggedIn,
+ verifyUserLoggedInWithoutDB,
+ authAndSaveIdentityInfo,
+};
diff --git a/keyserver/src/utils/identity-utils.js b/keyserver/src/utils/identity-utils.js
--- a/keyserver/src/utils/identity-utils.js
+++ b/keyserver/src/utils/identity-utils.js
@@ -5,6 +5,7 @@
import type { UserIdentitiesResponse } from 'lib/types/identity-service-types.js';
import { getContentSigningKey } from './olm-utils.js';
+import type { IdentityInfo } from '../user/identity.js';
import { verifyUserLoggedIn } from '../user/login.js';
async function findUserIdentities(
@@ -39,4 +40,16 @@
);
}
-export { findUserIdentities, privilegedDeleteUsers };
+async function syncPlatformDetails(identityInfo: IdentityInfo): Promise<void> {
+ const [rustAPI, deviceID] = await Promise.all([
+ getRustAPI(),
+ getContentSigningKey(),
+ ]);
+ return rustAPI.syncPlatformDetails(
+ identityInfo.userId,
+ deviceID,
+ identityInfo.accessToken,
+ );
+}
+
+export { findUserIdentities, privilegedDeleteUsers, syncPlatformDetails };
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Oct 17, 10:16 AM (20 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2290165
Default Alt Text
D13667.id45079.diff (4 KB)
Attached To
Mode
D13667: [keyserver] sync platform details on keyserver start
Attached
Detach File
Event Timeline
Log In to Comment