Differential D8052 Diff 27353 keyserver/src/socket/tunnelbroker.js

Changeset View

Standalone View

keyserver/src/socket/tunnelbroker.js

	// @flow			// @flow

	import WebSocket from 'ws';			import WebSocket from 'ws';

	import { type TBKeyserverConnectionInitializationMessage } from 'lib/types/tunnelbroker-messages.js';			import { type TBKeyserverConnectionInitializationMessage } from 'lib/types/tunnelbroker-messages.js';

				import { fetchOlmAccount } from '../updaters/olm-account-updater.js';

				async function getDeviceID(): Promise<string> {
				const info = await fetchOlmAccount('content');
				return JSON.parse(info.account.identity_keys()).curve25519;
				ashoatUnsubmitted Done Inline Actions Aren't we using the signing key (`ed25519`) for the "device ID", or did I get this wrong? Isn't that the key that is signing the rest of the keys, so it should be considered the "root of trust"? ashoat: Aren't we using the signing key (`ed25519`) for the "device ID", or did I get this wrong? Isn't…
				jonAuthorUnsubmitted Done Inline Actions no, you're right. Got confused jon: no, you're right. Got confused
				}

	function createTunnelbrokerWebsocket() {			function createTunnelbrokerWebsocket() {
				ashoatUnsubmitted Done Inline Actions I was wondering whether we really need to fetch the `deviceID` on every Tunnelbroker connection, so I spent some time thinking about what scenarios might lead to a reconnect I came up with two scenarios: If the `deviceID` changes for some reason If a connection error forces a reconnection Since we'll need some code to handle the first case anyways (forcing a disconnect and reconnecting to Tunnelbroker with the new device ID), I wonder if we can avoid having to `fetchOlmAccount` on every connection. Here's what I'm thinking: We have some function like `createAndMaintainTunnelbrokerSocket` that takes `deviceID` as input. This function internally handles reconnecting in the case of an error or a disconnect When the keyserver starts, we fetch the `deviceID` (just once) and call `createAndMaintainTunnelbrokerSocket` Separately, we'll add code to every place that might change the `deviceID` in the database, and make sure it forces a reconnection with the updated `deviceID` We'll need some way to kill the existing `createAndMaintainTunnelbrokerSocket` instance... either the function can return some sort of handle, or we can use a class instead of a function What do you think? ashoat: I was wondering whether we really need to fetch the `deviceID` on every Tunnelbroker connection…
				jonAuthorUnsubmitted Done Inline Actions Yea, sounds good, I'll refactor this. jon: Yea, sounds good, I'll refactor this.
	try {			try {
	const tunnelbrokerSocket = new WebSocket('ws://localhost:51001');			const tunnelbrokerSocket = new WebSocket('ws://localhost:51001');
	tunnelbrokerSocket.on('open', () => {			tunnelbrokerSocket.on('open', async () => {
	// TODO: Replace keyserver details with actual details			const [deviceID] = await Promise.all([getDeviceID()]);
				ashoatUnsubmitted Done Inline Actions `Promise.all` isn't doing anything here ashoat: `Promise.all` isn't doing anything here
				jonAuthorUnsubmitted Done Inline Actions I intended to extend this with grabbing the user_id and access token as well. I'll refactor this to have the local fetching done before attempting the session. jon: I intended to extend this with grabbing the user_id and access token as well. I'll refactor…

				// TODO: Replace accessToken and userID details with actual details
	const message: TBKeyserverConnectionInitializationMessage = {			const message: TBKeyserverConnectionInitializationMessage = {
	type: 'sessionRequest',			type: 'sessionRequest',
	accessToken: 'foobar',			accessToken: 'foobar',
	deviceID: 'foo',			deviceID,
	deviceType: 'keyserver',			deviceType: 'keyserver',
	userID: 'alice',			userID: 'alice',
	};			};
	console.log(			console.log(
	'Sending message to tunnelbroker: ' + JSON.stringify(message),			'Sending message to tunnelbroker: ' + JSON.stringify(message),
	);			);
	tunnelbrokerSocket.send(JSON.stringify(message));			tunnelbrokerSocket.send(JSON.stringify(message));
	});			});
	Show All 14 Lines