tom/METH_Transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update login websocket

Browse Source
This commit is contained in:
edbernar
2024-08-03 09:12:45 +02:00
parent e5b6b3bf3a
commit 881c2f8200
8 changed files with 97 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site/module_livechat/listError.txt
View File

@ -4,4 +4,6 @@
- 9000 : Invalid token
- 9001 : Token not found
- 9002 : Invalid json
- 9003 : Invalid path
- 9003 : Invalid path
- 9004 : Invalid type
- 9005 : Invalid request

89
site/module_livechat/server/main.py
View File

@ -1,53 +1,49 @@
# **************************************************************************** #
# #
# ::: :::::::: #
# main.py :+: :+: :+: #
# +:+ +:+ +:+ #
# By: edbernar <edbernar@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2024/08/03 08:10:40 by edbernar #+# #+# #
# Updated: 2024/08/03 08:46:38 by edbernar ### ########.fr #
# #
# **************************************************************************** #
from typeRequets.getPrivateListUser import getPrivateListUser
import asyncio
from typeRequets.login import login, userList
import websockets
import asyncio
import json
connected_clients = set()
userList = [
{
"username": "user1",
"token": "123456",
"id": 1
},
{
"username": "user2",
"token": "789123",
"id": 2
},
{
"username": "user3",
"token": "456789",
"id": 3
}
]
typeRequest = ["get_private_list_user"]
functionRequest = [getPrivateListUser]
class userInfo(websockets.WebSocketServerProtocol):
def __init__(self, websocket):
self.websocket = websocket
self.username = ""
self.token = ""
self.id = 0
typeRequest = ["login", "get_private_list_user"]
functionRequest = [login, getPrivateListUser]
async def sendError(websocket, message, code):
jsonVar = {"type": "error", "content": message, "code": code}
await websocket.send(json.dumps(jsonVar))
async def sendInfoUser(websocket):
token = websocket.request_headers.get('Sec-WebSocket-Protocol')
user = [user for user in userList if user['token'] == token][0]
jsonVar = {"type": "login", "content": user}
await websocket.send(json.dumps(jsonVar))
async def isValidToken(websocket):
token = websocket.request_headers.get('Sec-WebSocket-Protocol')
# |TOM| Faire une requête à la base de données pour vérifier si le token est valide
if (token in [user['token'] for user in userList]):
await sendInfoUser(websocket)
return True
else:
return False
def verifyToken(websocket, token):
for user in userList:
if (user["token"] == token):
return True
return False
async def handler(websocket, path):
if (not await isValidToken(websocket)):
await websocket.close(reason="Invalid token")
if (path != "/"):
await sendError(websocket, "Invalid path", 9003)
await websocket.close()
return
connected_clients.add(userInfo(websocket))
try:
async for resquet in websocket:
try:
@ -56,19 +52,24 @@ async def handler(websocket, path):
await sendError(websocket, "Invalid JSON", 9002)
continue
try:
if (jsonRequest["token"][0] != websocket.request_headers.get('Sec-WebSocket-Protocol')):
await sendError(websocket, "Invalid token", 9000)
continue
if (jsonRequest["type"] in typeRequest):
if jsonRequest["type"] == "login":
await functionRequest[typeRequest.index(jsonRequest["type"])](websocket, jsonRequest["content"])
else:
if (verifyToken(websocket, jsonRequest["token"]) == False):
await sendError(websocket, "Invalid token", 9001)
continue
await functionRequest[typeRequest.index(jsonRequest["type"])](websocket)
else:
await sendError(websocket, "Invalid type", 9004)
except:
await sendError(websocket, "Token not found", 9001)
continue
if (jsonRequest["type"] in typeRequest):
await functionRequest[typeRequest.index(jsonRequest["type"])](websocket)
await sendError(websocket, "Invalid request", 9005)
except websockets.ConnectionClosed:
connected_clients.remove(websocket)
print("Client déconnecté")
start_server = websockets.serve(handler, "localhost", 8000, subprotocols=['123456'])
asyncio.get_event_loop().run_until_complete(start_server)
print("Server started")
asyncio.get_event_loop().run_forever()

BIN
site/module_livechat/server/typeRequets/__pycache__/getPrivateListUser.cpython-312.pyc
View File

Binary file not shown.

BIN
site/module_livechat/server/typeRequets/__pycache__/login.cpython-310.pyc Normal file
View File

Binary file not shown.

36
site/module_livechat/server/typeRequets/login.py Normal file
View File

@ -0,0 +1,36 @@
# **************************************************************************** #
# #
# ::: :::::::: #
# login.py :+: :+: :+: #
# +:+ +:+ +:+ #
# By: edbernar <edbernar@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2024/08/03 08:10:38 by edbernar #+# #+# #
# Updated: 2024/08/03 08:46:00 by edbernar ### ########.fr #
# #
# **************************************************************************** #
import asyncio
import websockets
import json
userList = [
{
"username": "user1",
"token": "123456",
"id": 1
},
{
"username": "user2",
"token": "789123",
"id": 2
},
{
"username": "user3",
"token": "456789",
"id": 3
}
]
async def login(websocket, content):
print(content)

11
site/module_livechat/site/main.js
View File

@ -3,10 +3,10 @@
/* ::: :::::::: */
/* main.js :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* By: edbernar <edbernar@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/30 13:50:35 by edbernar #+# #+# */
/* Updated: 2024/08/02 03:09:12 by edbernar ### ########.fr */
/* Updated: 2024/08/03 08:31:07 by edbernar ### ########.fr */
/* */
/* ************************************************************************** */
@ -29,7 +29,7 @@ function liveChat() {
chatDiv.style.display = "flex";
gameButtonChatHome.removeAttribute("id");
privateButtonChatHome.setAttribute("id", "selected");
await showListUserMessage(userList);
await showListUserMessage();
});
topChatHomeCross.addEventListener("click", () => {
chatDiv.style.display = "none";
@ -38,7 +38,7 @@ function liveChat() {
privateButtonChatHome.addEventListener("click", async () => {
gameButtonChatHome.removeAttribute("id");
privateButtonChatHome.setAttribute("id", "selected");
await showListUserMessage(userList);
await showListUserMessage();
});
gameButtonChatHome.addEventListener("click", () => {
privateButtonChatHome.removeAttribute("id");
@ -47,13 +47,14 @@ function liveChat() {
});
}
async function showListUserMessage(userList) {
async function showListUserMessage() {
const divMessageListChatHome = document.getElementById("messageListChatHome");
let divUser;
socket.send(JSON.stringify({
type: 'get_private_list_user',
token: token,
content: {}
}));
await waitForUserList();

5
site/module_livechat/site/typeResponse/typePrivateListUser.js
View File

@ -3,10 +3,10 @@
/* ::: :::::::: */
/* typePrivateListUser.js :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* By: edbernar <edbernar@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/02 01:56:15 by edbernar #+# #+# */
/* Updated: 2024/08/02 03:09:04 by edbernar ### ########.fr */
/* Updated: 2024/08/02 11:42:46 by edbernar ### ########.fr */
/* */
/* ************************************************************************** */
@ -27,6 +27,7 @@ function waitForUserList() {
function typePrivateListUser(list) {
userList = list;
userListAvailable = true;
console.log(userListResolve)
if (userListResolve) {
userListResolve();
userListResolve = null;

8
site/module_livechat/site/websocket.js
View File

@ -3,18 +3,18 @@
/* ::: :::::::: */
/* websocket.js :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* By: edbernar <edbernar@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/31 22:17:24 by edbernar #+# #+# */
/* Updated: 2024/08/02 03:00:42 by edbernar ### ########.fr */
/* Updated: 2024/08/03 08:46:22 by edbernar ### ########.fr */
/* */
/* ************************************************************************** */
import { typeLogin } from "./typeResponse/typeLogin.js";
import { typePrivateListUser } from "./typeResponse/typePrivateListUser.js";
const token = ['123456'];
const socket = new WebSocket('ws://localhost:8000/', token);
const socket = new WebSocket('ws://localhost:8000/');
const token = "123456";
const typeResponse = ["login", "private_list_user"];
const functionResponse = [typeLogin, typePrivateListUser];