mirrors
/
keeweb
mirror of https://github.com/keeweb/keeweb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

closing browser extension connections

pull/1856/head
antelle 2021-04-11 12:48:58 +02:00
parent dcc477acbc
commit b48f3746bc
No known key found for this signature in database
GPG Key ID: 63C9777AAB7C563C
1 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
app/scripts/comp/app/browser-extension-connector.js
View File

@ -13,7 +13,7 @@ import { Logger } from 'util/logger';
const logger = new Logger('browser-extension-connector');
let appModel;
const connectedClients = {};
const connectedClients = new Map();
const MaxIncomingDataLength = 10000;
function incrementNonce(nonce) {
@ -31,7 +31,7 @@ function getClient(request) {
if (!request.clientID) {
throw new Error('Empty clientID');
}
const client = connectedClients[request.clientID];
const client = connectedClients.get(request.clientID);
if (!client) {
throw new Error(`Client not connected: ${request.clientID}`);
}
@ -104,18 +104,23 @@ const ProtocolHandlers = {
},
'change-public-keys'(request) {
let { publicKey, extensionName, clientID: clientId } = request;
let { publicKey, extensionName, version, clientID: clientId } = request;
if (connectedClients[clientId]) {
if (connectedClients.has(clientId)) {
throw new Error('Changing keys is not allowed');
}
if (!Launcher) {
// on web there can be only one connected client
connectedClients.clear();
}
const keys = tweetnaclBox.keyPair();
publicKey = kdbxweb.ByteUtils.base64ToBytes(publicKey);
connectedClients[clientId] = { publicKey, extensionName, keys };
connectedClients.set(clientId, { publicKey, extensionName, version, keys });
logger.info('New client key', clientId, extensionName);
logger.info('New client key created', clientId, extensionName, version);
return {
action: 'change-public-keys',
@ -282,10 +287,15 @@ const BrowserExtensionConnector = {
},
onSocketClose(socket) {
logger.info('Connection closed');
// TODO: remove the client
this.connectedSockets = this.connectedSockets.filter((s) => s !== socket);
const state = this.connectedSocketState.get(socket);
if (state?.clientId) {
connectedClients.delete(state.clientId);
}
this.connectedSocketState.delete(socket);
this.connectedSockets = this.connectedSockets.filter((s) => s !== socket);
logger.info('Connection closed', state?.clientId);
},
onSocketData(socket, data) {
@ -349,6 +359,21 @@ const BrowserExtensionConnector = {
return;
}
const clientId = request?.clientID;
if (!clientId) {
logger.warn('Empty client ID in request', request);
socket.destroy();
return;
}
if (!state.clientId) {
state.clientId = clientId;
} else if (state.clientId !== clientId) {
logger.warn(`Changing client ID is not allowed: ${state.clientId} => ${clientId}`);
socket.destroy();
return;
}
let response;
try {
const handler = ProtocolHandlers[request.action];