Page MenuHomePhabricator
Differential D14028

[keyserver] Extract getInboundKeys to a separate function
ClosedPublic
Actions

Authored by bartek on Nov 24 2024, 11:31 PM.
Tags
None
Referenced Files
F6182972: D14028.id.diff
Wed, Apr 23, 8:25 AM
F6171037: D14028.id46145.diff
Wed, Apr 23, 2:10 AM
F6167930: D14028.id46063.diff
Wed, Apr 23, 1:04 AM
F6166149: D14028.id45982.diff
Tue, Apr 22, 11:51 PM
Unknown Object (File)
Tue, Apr 22, 5:18 AM
Unknown Object (File)
Thu, Mar 27, 2:02 PM
Unknown Object (File)
Mar 24 2025, 2:15 AM
Unknown Object (File)
Mar 5 2025, 8:29 PM
View All 46 Files
Subscribers
ashoat
tomek

Details

Reviewers
varun
kamil
Commits
rCOMMd6994b2823f0: [keyserver] Extract getInboundKeys to a separate function
Summary

Needed for ENG-6544 to handle invalid auth from one place

Depends on D14027

Test Plan

Flow, ran keyserver locally

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
responders/
28 lines
utils/
30 lines

Diff 46145

View Options

keyserver/src/responders/user-responders.js

Show All 36 Lines ): Promise<string> {
return commCoreModule.initializeContentInboundSession( return commCoreModule.initializeContentInboundSession(
identityKeys, identityKeys,
initialEncryptedData, initialEncryptedData,
contentIdentityKeys.ed25519, contentIdentityKeys.ed25519,
sessionVersion, sessionVersion,
overwrite, overwrite,
); );
}, },
isContentSessionInitialized: commCoreModule.isContentSessionInitialized,
async contentOutboundSessionCreator( async contentOutboundSessionCreator(
contentIdentityKeys: OLMIdentityKeys, contentIdentityKeys: OLMIdentityKeys,
contentInitializationInfo: OlmSessionInitializationInfo, contentInitializationInfo: OlmSessionInitializationInfo,
): Promise<OutboundSessionCreationResult> { ): Promise<OutboundSessionCreationResult> {
const { prekey, prekeySignature, oneTimeKey } = contentInitializationInfo; const { prekey, prekeySignature, oneTimeKey } = contentInitializationInfo;
const identityKeys = JSON.stringify({ const identityKeys = JSON.stringify({
curve25519: contentIdentityKeys.curve25519, curve25519: contentIdentityKeys.curve25519,
ed25519: contentIdentityKeys.ed25519, ed25519: contentIdentityKeys.ed25519,
Show All 37 Lines ): Promise<EncryptedData> {
return commCoreModule.initializeNotificationsOutboundSession( return commCoreModule.initializeNotificationsOutboundSession(
identityKeys, identityKeys,
prekey, prekey,
prekeySignature, prekeySignature,
oneTimeKey, oneTimeKey,
deviceID, deviceID,
); );
}, },
isPeerNotificationsSessionInitialized:
commCoreModule.isPeerNotificationsSessionInitialized,
async getOneTimeKeys(numberOfKeys: number): Promise<OneTimeKeysResultValues> { async getOneTimeKeys(numberOfKeys: number): Promise<OneTimeKeysResultValues> {
const { contentOneTimeKeys, notificationsOneTimeKeys } = const { contentOneTimeKeys, notificationsOneTimeKeys } =
await commCoreModule.getOneTimeKeys(numberOfKeys); await commCoreModule.getOneTimeKeys(numberOfKeys);
return { return {
contentOneTimeKeys: getOneTimeKeyValues(contentOneTimeKeys), contentOneTimeKeys: getOneTimeKeyValues(contentOneTimeKeys),
notificationsOneTimeKeys: getOneTimeKeyValues(notificationsOneTimeKeys), notificationsOneTimeKeys: getOneTimeKeyValues(notificationsOneTimeKeys),
}; };
}, },
Show All 37 Lines
View Options

keyserver/src/utils/identity-utils.js

Show All 36 Lines ): Promise<string> {
return commCoreModule.initializeContentInboundSession( return commCoreModule.initializeContentInboundSession(
identityKeys, identityKeys,
initialEncryptedData, initialEncryptedData,
contentIdentityKeys.ed25519, contentIdentityKeys.ed25519,
sessionVersion, sessionVersion,
overwrite, overwrite,
); );
}, },
isContentSessionInitialized: commCoreModule.isContentSessionInitialized,
async contentOutboundSessionCreator( async contentOutboundSessionCreator(
contentIdentityKeys: OLMIdentityKeys, contentIdentityKeys: OLMIdentityKeys,
contentInitializationInfo: OlmSessionInitializationInfo, contentInitializationInfo: OlmSessionInitializationInfo,
): Promise<OutboundSessionCreationResult> { ): Promise<OutboundSessionCreationResult> {
const { prekey, prekeySignature, oneTimeKey } = contentInitializationInfo; const { prekey, prekeySignature, oneTimeKey } = contentInitializationInfo;
const identityKeys = JSON.stringify({ const identityKeys = JSON.stringify({
curve25519: contentIdentityKeys.curve25519, curve25519: contentIdentityKeys.curve25519,
ed25519: contentIdentityKeys.ed25519, ed25519: contentIdentityKeys.ed25519,
Show All 37 Lines ): Promise<EncryptedData> {
return commCoreModule.initializeNotificationsOutboundSession( return commCoreModule.initializeNotificationsOutboundSession(
identityKeys, identityKeys,
prekey, prekey,
prekeySignature, prekeySignature,
oneTimeKey, oneTimeKey,
deviceID, deviceID,
); );
}, },
isPeerNotificationsSessionInitialized:
commCoreModule.isPeerNotificationsSessionInitialized,
async getOneTimeKeys(numberOfKeys: number): Promise<OneTimeKeysResultValues> { async getOneTimeKeys(numberOfKeys: number): Promise<OneTimeKeysResultValues> {
const { contentOneTimeKeys, notificationsOneTimeKeys } = const { contentOneTimeKeys, notificationsOneTimeKeys } =
await commCoreModule.getOneTimeKeys(numberOfKeys); await commCoreModule.getOneTimeKeys(numberOfKeys);
return { return {
contentOneTimeKeys: getOneTimeKeyValues(contentOneTimeKeys), contentOneTimeKeys: getOneTimeKeyValues(contentOneTimeKeys),
notificationsOneTimeKeys: getOneTimeKeyValues(notificationsOneTimeKeys), notificationsOneTimeKeys: getOneTimeKeyValues(notificationsOneTimeKeys),
}; };
}, },
Show All 37 Lines