[keyserver] Convert websocket input
ClosedPublic
Actions

Authored by michal on May 9 2023, 1:43 AM.

Details

Reviewers

kamil
tomek

Commits

rCOMMd5d2636c589e: [keyserver] Convert websocket input

Summary

Changes the websocket validation logic to convert the ids (after enabling the flag).

Depends D7749

Test Plan

Check if any of the input validators needed to be updated to mark the IDs (they were all using validators which have been marked in previous diffs).
Check if web and ios app work fine, and there aren't any errors.

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

michal created this revision.May 9 2023, 1:43 AM

Herald added subscribers: atul, ashoat. · View Herald TranscriptMay 9 2023, 1:43 AM

Harbormaster completed remote builds in B19161: Diff 26242.May 9 2023, 2:01 AM

michal requested review of this revision.May 9 2023, 2:01 AM

Are you sure this is correct? Shouldn't we also convert a response from the server?

This revision now requires changes to proceed.May 10 2023, 1:09 AM

michal added a parent revision: D7749: [keyserver] Validate websocket output.May 10 2023, 6:54 AM

Are you sure this is correct? Shouldn't we also convert a response from the server?

If I'm not misunderstanding, the responses are validated in D7749.

michal added a child revision: D7783: [lib] Split thread-types.May 11 2023, 2:14 AM

tomek accepted this revision.May 15 2023, 2:04 AM

This revision is now accepted and ready to land.May 15 2023, 2:04 AM

Closed by commit rCOMMd5d2636c589e: [keyserver] Convert websocket input (authored by Michal Gniadek <michal.gniadek@swmansion.com>). · Explain WhyMay 15 2023, 5:00 AM

This revision was automatically updated to reflect the committed changes.

Michal Gniadek <michal.gniadek@swmansion.com> added a commit: rCOMMd5d2636c589e: [keyserver] Convert websocket input.

Revision Contents
Changeset List

Path

Size

keyserver/

src/

socket/

socket.js

9 lines

Diff 26242

View Options

keyserver/src/socket/socket.js

Show First 20 Lines • Show All 97 Lines • ▼ Show 20 Lines	[
identityClient,		identityClient,
primaryDeviceRequestedLogOut,		primaryDeviceRequestedLogOut,
],		],
);		);
}		}

function usePeerToPeerMessageHandler(): (		function usePeerToPeerMessageHandler(): (
message: PeerToPeerMessage,		message: PeerToPeerMessage,
messageID: string,
) => Promise<void> {		) => Promise<void> {
const { olmAPI, sqliteAPI } = getConfig();		const { olmAPI, sqliteAPI } = getConfig();

const identityContext = React.useContext(IdentityClientContext);		const identityContext = React.useContext(IdentityClientContext);
invariant(identityContext, 'Identity context should be set');		invariant(identityContext, 'Identity context should be set');
const { identityClient, getAuthMetadata } = identityContext;		const { identityClient, getAuthMetadata } = identityContext;

const foreignPeerDevices = useSelector(getForeignPeerDevices);		const foreignPeerDevices = useSelector(getForeignPeerDevices);
const broadcastDeviceListUpdates = useBroadcastDeviceListUpdates();		const broadcastDeviceListUpdates = useBroadcastDeviceListUpdates();
const getAndUpdateDeviceListsForUsers = useGetAndUpdateDeviceListsForUsers();		const getAndUpdateDeviceListsForUsers = useGetAndUpdateDeviceListsForUsers();

const handleOlmMessageToDevice = useHandleOlmMessageToDevice();		const handleOlmMessageToDevice = useHandleOlmMessageToDevice();

return React.useCallback(		return React.useCallback(
async (message: PeerToPeerMessage, messageID: string) => {		async (message: PeerToPeerMessage) => {
if (message.type === peerToPeerMessageTypes.OUTBOUND_SESSION_CREATION) {		if (message.type === peerToPeerMessageTypes.OUTBOUND_SESSION_CREATION) {
const { senderInfo, encryptedData, sessionVersion } = message;		const { senderInfo, encryptedData, sessionVersion } = message;
const { userID: senderUserID, deviceID: senderDeviceID } = senderInfo;		const { userID: senderUserID, deviceID: senderDeviceID } = senderInfo;

let deviceKeys: ?DeviceOlmInboundKeys = null;		let deviceKeys: ?DeviceOlmInboundKeys = null;
try {		try {
const { keys } =		const { keys } =
await identityClient.getInboundKeysForUser(senderUserID);		await identityClient.getInboundKeysForUser(senderUserID);
▲ Show 20 Lines • Show All 59 Lines • ▼ Show 20 Lines	async (message: PeerToPeerMessage) => {
`${senderDeviceID}: ${e.message}, ` +		`${senderDeviceID}: ${e.message}, ` +
`session version: ${sessionVersion}`,		`session version: ${sessionVersion}`,
);		);
}		}
}		}
} else if (message.type === peerToPeerMessageTypes.ENCRYPTED_MESSAGE) {		} else if (message.type === peerToPeerMessageTypes.ENCRYPTED_MESSAGE) {
try {		try {
await olmAPI.initializeCryptoAccount();		await olmAPI.initializeCryptoAccount();
const decrypted = await olmAPI.decryptSequentialAndPersist(		const decrypted = await olmAPI.decrypt(
message.encryptedData,		message.encryptedData,
message.senderInfo.deviceID,		message.senderInfo.deviceID,
messageID,
);		);
console.log(		console.log(
'Decrypted message from device ' +		'Decrypted message from device ' +
`${message.senderInfo.deviceID}: ${decrypted}`,		`${message.senderInfo.deviceID}: ${decrypted}`,
);		);

try {		try {
await handleOlmMessageToDevice(decrypted, message.senderInfo);		await handleOlmMessageToDevice(decrypted, message.senderInfo);
▲ Show 20 Lines • Show All 119 Lines • Show Last 20 Lines

[keyserver] Convert websocket inputClosedPublicActions