[mirotalksfu] - improve security & minor fix

هذا الالتزام موجود في:
Miroslav Pejic
2023-04-24 11:12:00 +02:00
الأصل 986be19104
التزام 2753870c3b
6 ملفات معدلة مع 69 إضافات و12 حذوفات

عرض الملف

@@ -59,4 +59,12 @@ class LocalStorage {
getLocalStorageDevices() {
return JSON.parse(localStorage.getItem('LOCAL_STORAGE_DEVICES'));
}
setItemLocalStorage(key, value) {
localStorage.setItem(key, value);
}
getItemLocalStorage(key) {
localStorage.getItem(key);
}
}

عرض الملف

@@ -71,6 +71,7 @@ let chatMessagesId = 0;
let room_id = getRoomId();
let room_password = getRoomPassword();
let peer_name = getPeerName();
let peer_uuid = getPeerUUID();
let isScreenAllowed = getScreen();
let notify = getNotify();
@@ -415,6 +416,15 @@ function getPeerName() {
return name;
}
function getPeerUUID() {
if (lS.getItemLocalStorage('peer_uuid')) {
return lS.getItemLocalStorage('peer_uuid');
}
const peer_uuid = getUUID();
lS.setItemLocalStorage('peer_uuid', peer_uuid);
return peer_uuid;
}
function getRoomPassword() {
let qs = new URLSearchParams(window.location.search);
let roomPassword = filterXSS(qs.get('password'));
@@ -435,7 +445,7 @@ function getRoomPassword() {
function getPeerInfo() {
peer_info = {
join_data_time: getDataTimeString(),
peer_uuid: getUUID(),
peer_uuid: peer_uuid,
peer_id: socket.id,
peer_name: peer_name,
peer_presenter: isPresenter,
@@ -707,6 +717,7 @@ function joinRoom(peer_name, room_id) {
socket,
room_id,
peer_name,
peer_uuid,
peer_info,
isAudioAllowed,
isVideoAllowed,

عرض الملف

@@ -116,6 +116,7 @@ class RoomClient {
socket,
room_id,
peer_name,
peer_uuid,
peer_info,
isAudioAllowed,
isVideoAllowed,
@@ -133,6 +134,7 @@ class RoomClient {
this.room_id = room_id;
this.peer_id = socket.id;
this.peer_name = peer_name;
this.peer_uuid = peer_uuid;
this.peer_info = peer_info;
this.isAudioAllowed = isAudioAllowed;
@@ -3810,6 +3812,10 @@ class RoomClient {
roomAction(action, emit = true) {
let data = {
room_id: this.room_id,
peer_id: this.peer_id,
peer_name: this.peer_name,
peer_uuid: this.peer_uuid,
action: action,
password: null,
};
@@ -3943,7 +3949,7 @@ class RoomClient {
let lobbyTr = '';
let peer_id = data.peer_id;
let peer_name = data.peer_name;
let avatarImg = getParticipantAvatar(peer_name);
let avatarImg = this.genAvatarSvg(peer_name, 32);
let lobbyTb = this.getId('lobbyTb');
let lobbyAccept = _PEER.acceptPeer;
let lobbyReject = _PEER.ejectPeer;
@@ -3952,7 +3958,7 @@ class RoomClient {
lobbyTr += `
<tr id='${peer_id}'>
<td><img src='${avatarImg}'></td>
<td><img src="${avatarImg}" /></td>
<td>${peer_name}</td>
<td><button id=${lobbyAcceptId} onclick="rc.lobbyAction(this.id, 'accept')">${lobbyAccept}</button></td>
<td><button id=${lobbyRejectId} onclick="rc.lobbyAction(this.id, 'reject')">${lobbyReject}</button></td>
@@ -4333,6 +4339,8 @@ class RoomClient {
if (emit) {
let data = {
from_peer_name: this.peer_name,
from_peer_id: this.peer_id,
from_peer_uuid: this.peer_uuid,
peer_id: peer_id,
action: action,
broadcast: broadcast,
@@ -4346,6 +4354,7 @@ class RoomClient {
switch (action) {
case 'eject':
if (peer_id === this.peer_id || broadcast) {
this.exit(true);
this.sound(action);
this.peerActionProgress(from_peer_name, 'Will eject you from the room', 5000, action);
}