Differential D13227

[tunnelbroker] Close WS session when received special AMQP message
ClosedPublic
Actions

Authored by bartek on Sep 2 2024, 11:46 PM.

Details

Reviewers

kamil

Commits

rCOMM407963823a72: [tunnelbroker] Close WS session when received special AMQP message

Summary

Address ENG-8256.

Added a special AMQP message, that when received by consumer for given device ID, the websocket session is closed.

Test Plan

Modified SendMessageToDevice to send this message instead. Confirmed that the device is disconnected.

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

bartek created this revision.Sep 2 2024, 11:46 PM

bartek held this revision as a draft.

Herald added subscribers: tomek, ashoat. · View Herald TranscriptSep 2 2024, 11:46 PM

bartek added a child revision: D13228: [tunnelbroker] Add RPC for closing WebSocket sessions.Sep 2 2024, 11:49 PM

Harbormaster completed remote builds in B31403: Diff 43849.Sep 3 2024, 12:02 AM

I also considered using an enum

enum AMQPMessage {
  MessageToDevice(MessageToDevice),
  SessionClose
}

but again I had weird issues with serde when trying to make it backwards compatible with existing format.

For now I sticked to simple "special message" constant.

One note: This is safe because of serialization here and the malicious device will not be able to close other devices sessions.

This revision is now accepted and ready to land.Sep 6 2024, 6:08 AM

Closed by commit rCOMM407963823a72: [tunnelbroker] Close WS session when received special AMQP message (authored by bartek). · Explain WhySep 9 2024, 6:15 AM

This revision was automatically updated to reflect the committed changes.

bartek added a commit: rCOMM407963823a72: [tunnelbroker] Close WS session when received special AMQP message.

Revision Contents
Changeset List

Path

Size

services/

tunnelbroker/

src/

constants.rs

1 line

websockets/

mod.rs

9 lines

Diff 43982

View Options

services/tunnelbroker/src/constants.rs

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines	const mediaID =
request.type === 'image' \|\| request.type === 'encrypted_image'		request.type === 'image' \|\| request.type === 'encrypted_image'
? request.uploadID		? request.uploadID
: null;		: null;

const query = SQL`		const query = SQL`
START TRANSACTION;		START TRANSACTION;

UPDATE uploads		UPDATE uploads
SET container = NULL		SET user_container = NULL
WHERE uploader = ${viewer.userID}		WHERE uploader = ${viewer.userID}
AND container = ${viewer.userID}		AND user_container = ${viewer.userID}
AND (		AND (
${mediaID} IS NULL		${mediaID} IS NULL
OR EXISTS (		OR EXISTS (
SELECT 1		SELECT 1
FROM uploads		FROM uploads
WHERE id = ${mediaID}		WHERE id = ${mediaID}
AND uploader = ${viewer.userID}		AND uploader = ${viewer.userID}
AND container IS NULL		AND container IS NULL
		AND user_container IS NULL
AND thread IS NULL		AND thread IS NULL
)		)
);		);

UPDATE uploads		UPDATE uploads
SET container = ${viewer.userID}		SET user_container = ${viewer.userID}
WHERE id = ${mediaID}		WHERE id = ${mediaID}
AND uploader = ${viewer.userID}		AND uploader = ${viewer.userID}
AND container IS NULL		AND container IS NULL
		AND user_container IS NULL
AND thread IS NULL;		AND thread IS NULL;

UPDATE users		UPDATE users
SET avatar = ${newAvatarValue}		SET avatar = ${newAvatarValue}
WHERE id = ${viewer.userID}		WHERE id = ${viewer.userID}
AND (		AND (
${mediaID} IS NULL		${mediaID} IS NULL
OR EXISTS (		OR EXISTS (
SELECT 1		SELECT 1
FROM uploads		FROM uploads
WHERE id = ${mediaID}		WHERE id = ${mediaID}
AND uploader = ${viewer.userID}		AND uploader = ${viewer.userID}
AND container = ${viewer.userID}		AND user_container = ${viewer.userID}
AND thread IS NULL		AND thread IS NULL
)		)
);		);

COMMIT;		COMMIT;

SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra		SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra
FROM uploads		FROM uploads
WHERE id = ${mediaID}		WHERE id = ${mediaID}
AND uploader = ${viewer.userID}		AND uploader = ${viewer.userID}
AND container = ${viewer.userID};		AND user_container = ${viewer.userID};
`;		`;

const [resultSet] = await dbQuery(query, { multipleStatements: true });		const [resultSet] = await dbQuery(query, { multipleStatements: true });
const selectResult = resultSet.pop();		const selectResult = resultSet.pop();

const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer);		const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer);
const updates: CreateUpdatesResult = await createUserAvatarUpdates(		const updates: CreateUpdatesResult = await createUserAvatarUpdates(
viewer,		viewer,
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines