Page MenuHomePhabricator
Differential D11708

[keyserver] Use keyserverID instead of userID when creating invite link blobs
ClosedPublic
Actions

Authored by tomek on Apr 22 2024, 4:49 AM.
Tags
None
Referenced Files
F5283030: D11708.diff
Mon, Apr 7, 9:46 AM
Unknown Object (File)
Feb 27 2025, 7:25 PM
Unknown Object (File)
Feb 27 2025, 7:25 PM
Unknown Object (File)
Feb 26 2025, 8:09 AM
Unknown Object (File)
Feb 26 2025, 8:00 AM
Unknown Object (File)
Feb 17 2025, 11:14 PM
Unknown Object (File)
Jan 20 2025, 2:23 AM
Unknown Object (File)
Jan 20 2025, 2:23 AM
View All 88 Files
Subscribers
ashoat

Details

Reviewers
inka
Commits
rCOMM5f36d95f2311: [keyserver] Use keyserverID instead of userID when creating invite link blobs
Summary

For each link we create a blob that contains a keyserver ID that is later used as a part of the override on the client side. In a single-keyserver world, this value should be equal to 256 because this is the ID a client uses as a keyserver ID. Instead of using the correct value, we were using the ID of a user, taken from Identity - so it was a multi-keyserver keyserver ID.

This issue wasn't affecting prod because the ID of the keyserver on prod Identity is equal to 256.

https://linear.app/comm/issue/ENG-7789/invite-links-in-single-keyserver-world-fail

Test Plan

Tested if creating a new link and accepting it works with both single- and multi-keyserver IDs. (testing multi-keyserver ID was performed by having a client with usingCommservicesAccessToken set to false, and a keyserver with usingIdentityCredentials set to true).

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
creators/
8 lines

Diff 39340

View Options

keyserver/src/creators/invite-link-creator.js

Show First 20 Lines • Show All 255 Lines • ▼ Show 20 Lines connectionChangePromise.current = (async () => {
} }
} else if ( } else if (
message.type === tunnelbrokerMessageTypes.MESSAGE_TO_DEVICE message.type === tunnelbrokerMessageTypes.MESSAGE_TO_DEVICE
) { ) {
const confirmation: MessageReceiveConfirmation = { const confirmation: MessageReceiveConfirmation = {
type: tunnelbrokerMessageTypes.MESSAGE_RECEIVE_CONFIRMATION, type: tunnelbrokerMessageTypes.MESSAGE_RECEIVE_CONFIRMATION,
messageIDs: [message.messageID], messageIDs: [message.messageID],
}; };
socket.current?.send(JSON.stringify(confirmation));
let rawPeerToPeerMessage; let rawPeerToPeerMessage;
try { try {
rawPeerToPeerMessage = JSON.parse(message.payload); rawPeerToPeerMessage = JSON.parse(message.payload);
} catch (e) { } catch (e) {
console.log( console.log(
'error while parsing Tunnelbroker peer-to-peer message:', 'error while parsing Tunnelbroker peer-to-peer message:',
e.message, e.message,
); );
// Client received incorrect message, confirm to remove from
// Tunnelbroker queue.
socket.current?.send(JSON.stringify(confirmation));
return; return;
} }
if (!peerToPeerMessageValidator.is(rawPeerToPeerMessage)) { if (!peerToPeerMessageValidator.is(rawPeerToPeerMessage)) {
console.log('invalid Tunnelbroker PeerToPeerMessage'); console.log('invalid Tunnelbroker PeerToPeerMessage');
// The client received an invalid Tunnelbroker message,
// and cannot process this type of request.
socket.current?.send(JSON.stringify(confirmation));
return; return;
} }
const peerToPeerMessage: PeerToPeerMessage = rawPeerToPeerMessage; const peerToPeerMessage: PeerToPeerMessage = rawPeerToPeerMessage;
currentlyProcessedMessage.current = (async () => { currentlyProcessedMessage.current = (async () => {
const localSocketSessionCounter = socketSessionCounter.current; const localSocketSessionCounter = socketSessionCounter.current;
await currentlyProcessedMessage.current; await currentlyProcessedMessage.current;
// Since scheduling processing this message socket is closed // Since scheduling processing this message socket is closed
// or was closed and reopened, we have to stop processing // or was closed and reopened, we have to stop processing
Show All 9 Lines connectionChangePromise.current = (async () => {
try { try {
await peerToPeerMessageHandler( await peerToPeerMessageHandler(
peerToPeerMessage, peerToPeerMessage,
identityClient, identityClient,
message.messageID, message.messageID,
); );
} catch (e) { } catch (e) {
console.log(e.message); console.log(e.message);
} finally {
if (
localSocketSessionCounter === socketSessionCounter.current &&
socket.current
) {
// We confirm regardless of success or error while processing.
socket.current.send(JSON.stringify(confirmation));
}
} }
})(); })();
} else if ( } else if (
message.type === message.type ===
tunnelbrokerMessageTypes.MESSAGE_TO_DEVICE_REQUEST_STATUS tunnelbrokerMessageTypes.MESSAGE_TO_DEVICE_REQUEST_STATUS
) { ) {
for (const status: MessageSentStatus of message.clientMessageIDs) { for (const status: MessageSentStatus of message.clientMessageIDs) {
if (status.type === 'Success') { if (status.type === 'Success') {
▲ Show 20 Lines • Show All 158 Lines • Show Last 20 Lines