manuel/foundryvtt-socketlib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore responses from users that aren't recipients of the original request

Browse Source
This commit is contained in:
Manuel Vögele
2021-04-26 12:31:54 +02:00
parent 6a5190b0a8
commit 971c92b21a
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/socketlib.js
View File

@@ -161,7 +161,7 @@ class SocketlibSocket {
const message = {handlerName, args, recipient}; const message = {handlerName, args, recipient};
message.id = randomID(); message.id = randomID();
message.type = MESSAGE_TYPES.REQUEST; message.type = MESSAGE_TYPES.REQUEST;
const promise = new Promise((resolve, reject) => this.pendingRequests.set(message.id, {handlerName, resolve, reject})); const promise = new Promise((resolve, reject) => this.pendingRequests.set(message.id, {handlerName, resolve, reject, recipient}));
game.socket.emit(this.socketName, message); game.socket.emit(this.socketName, message);
return promise; return promise;
} }
@@ -270,7 +270,11 @@ class SocketlibSocket {
const request = this.pendingRequests.get(id); const request = this.pendingRequests.get(id);
if (!request) if (!request)
return; return;
// TODO Verify if the response comes from the correct sender, discard otherwise if (!this._isResponseSenderValid(senderId, request.recipient)) {
console.warn("socketlib | Dropped a response that was received from the wrong user. This means that either someone is inserting messages into the socket or this is a socketlib issue. If the latter is the case please file a bug report in the socketlib repository.")
console.info(senderId, request.recipient);
return;
}
switch (type) { switch (type) {
case MESSAGE_TYPES.RESULT: case MESSAGE_TYPES.RESULT:
request.resolve(result); request.resolve(result);
@@ -287,6 +291,14 @@ class SocketlibSocket {
} }
this.pendingRequests.delete(id); this.pendingRequests.delete(id);
} }
_isResponseSenderValid(senderId, recipients) {
if (recipients === RECIPIENT_TYPES.ONE_GM && game.users.get(senderId).isGM)
return true;
if (recipients instanceof Array && recipients.includes(senderId))
return true;
return false;
}
} }
function isResponsibleGM() { function isResponsibleGM() {