Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-24 06:49:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Forcefully disconnect the user from socketio on disconnect event

Browse Source
This commit is contained in:
Micah Lee 2024-03-07 19:07:22 -08:00
parent fe7bd43f04
commit 1b0979e6ed
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
cli/onionshare_cli/web/chat_mode.py
View File

@ -77,13 +77,17 @@ class ChatModeWeb:
self.web.add_request(self.web.REQUEST_LOAD, request.path)
return render_template(
"chat.html",
static_url_path=self.web.static_url_path,
username=session.get("name"),
title=self.web.settings.get("general", "title"),
"chat.html",
static_url_path=self.web.static_url_path,
username=session.get("name"),
title=self.web.settings.get("general", "title"),
)
@self.web.app.route("/update-session-username", methods=["POST"], provide_automatic_options=False)
@self.web.app.route(
"/update-session-username",
methods=["POST"],
provide_automatic_options=False,
)
def update_session_username():
history_id = self.cur_history_id
data = request.get_json()
@ -122,6 +126,8 @@ class ChatModeWeb:
A status message is broadcast to all people in the room."""
if self.validate_username(session.get("name")):
self.connected_users.append(session.get("name"))
# Store the session id for the user
session["socketio_session_id"] = request.sid
emit(
"status",
{
@ -133,7 +139,7 @@ class ChatModeWeb:
broadcast=True,
)
else:
raise ConnectionRefusedError('You are active from another session!')
raise ConnectionRefusedError("You are active from another session!")
@self.web.socketio.on("text", namespace="/chat")
def text(message):
@ -153,9 +159,9 @@ class ChatModeWeb:
new_name = message.get("username", "").strip()
if self.validate_username(new_name):
session["name"] = new_name
self.connected_users[
self.connected_users.index(current_name)
] = session.get("name")
self.connected_users[self.connected_users.index(current_name)] = (
session.get("name")
)
emit(
"status",
{
@ -178,13 +184,23 @@ class ChatModeWeb:
def disconnect():
"""Sent by clients when they disconnect.
A status message is broadcast to all people in the server."""
user_already_disconnected = False
if session.get("name") in self.connected_users:
self.connected_users.remove(session.get("name"))
emit(
"status",
{
"msg": "{} has left the room.".format(session.get("name")),
"connected_users": self.connected_users,
},
broadcast=True,
else:
user_already_disconnected = True
# Forcefully disconnect the user
self.web.socketio.server.disconnect(
sid=session.get("socketio_session_id"), namespace="/chat"
)
if not user_already_disconnected:
emit(
"status",
{
"msg": "{} has left the room.".format(session.get("name")),
"connected_users": self.connected_users,
},
broadcast=True,
)