cthrace/collabvm-1.2.ts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- move auth announcement to on socket open

Browse Source 
- don't send system message to a user without a username since it was likely an automated attempt by the webapp
This commit is contained in:
Elijah R
2024-04-07 14:33:43 -04:00
committed by Elijah R
parent f89492cfcd
commit 0821ac89e8
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/WSServer.ts
View File

@@ -218,6 +218,9 @@ export default class WSServer {
} }
this.onMessage(user, msg); this.onMessage(user, msg);
}); });
if (this.Config.auth.enabled) {
user.sendMsg(guacutils.encode("auth", this.Config.auth.apiEndpoint));
}
user.sendMsg(this.getAdduserMsg()); user.sendMsg(this.getAdduserMsg());
log("INFO", `Connect from ${user.IP.address}`); log("INFO", `Connect from ${user.IP.address}`);
}; };
@@ -284,9 +287,6 @@ export default class WSServer {
} }
client.connectedToNode = true; client.connectedToNode = true;
client.sendMsg(guacutils.encode("connect", "1", "1", this.Config.vm.snapshots ? "1" : "0", "0")); client.sendMsg(guacutils.encode("connect", "1", "1", this.Config.vm.snapshots ? "1" : "0", "0"));
if (this.Config.auth.enabled) {
client.sendMsg(guacutils.encode("auth", this.Config.auth.apiEndpoint));
}
if (this.ChatHistory.size !== 0) client.sendMsg(this.getChatHistoryMsg()); if (this.ChatHistory.size !== 0) client.sendMsg(this.getChatHistoryMsg());
if (this.Config.collabvm.motd) client.sendMsg(guacutils.encode("chat", "", this.Config.collabvm.motd)); if (this.Config.collabvm.motd) client.sendMsg(guacutils.encode("chat", "", this.Config.collabvm.motd));
if (this.screenHidden) { if (this.screenHidden) {
@@ -350,7 +350,8 @@ export default class WSServer {
return; return;
} }
if (this.Config.auth.enabled && msgArr[1] !== undefined) { if (this.Config.auth.enabled && msgArr[1] !== undefined) {
client.sendMsg(guacutils.encode("chat", "", "You need to log in to do that.")); // Don't send system message to a user without a username since it was likely an automated attempt by the webapp
if (client.username) client.sendMsg(guacutils.encode("chat", "", "You need to log in to do that."));
if (client.rank !== Rank.Unregistered) return; if (client.rank !== Rank.Unregistered) return;
this.renameUser(client, undefined); this.renameUser(client, undefined);
return; return;