Commit Graph

27915 Commits

Author SHA1 Message Date
Anton Georgiev
3faabd1821 Merge 2.2.29 and 2.2.30 into 2.3.x 2020-11-24 15:13:09 +00:00
Fred Dixon
1be05f12a3
Merge pull request #10890 from ffdixon/bbb-conf-check-7443
Don't warn about sip.js if sipjsHackViaWs=true
2020-11-23 20:55:28 -05:00
Fred Dixon
e37e1aa55a Don't warn about sip.js if sipjsHackViaWs=true 2020-11-23 19:52:21 -06:00
Anton Georgiev
2909ba9114
Merge pull request #10889 from antobinary/debug-logs
Removed string interpolation for server debug and verbose logs
2020-11-23 14:43:51 -05:00
Anton Georgiev
21644a1a43 Remove string interpolation for server debug and verbose logs 2020-11-23 14:35:59 -05:00
Anton Georgiev
b18d038aeb
Merge pull request #10888 from mariogasparoni/v2.2.x-release
Reduce delay for the first reconnection attempt of audio's websocket
2020-11-23 11:10:13 -05:00
Mario Jr
af48c8977d Reduce delay for the first reconnection attempt of audio's websocket
This is the same behavior we used to have on older sip.js version code
By doing this we reduce errors when user try to perform join/hangup during an websocket reconnection
2020-11-23 12:40:38 -03:00
Anton Georgiev
22d6b9d56a
Merge pull request #10877 from Tainan404/handle-chat-message-in-order-2.3
Port Handle chat messages in sync way for 2.3
2020-11-23 09:06:28 -05:00
Anton Georgiev
5a38f6908f
Merge pull request #10878 from Tainan404/tweak-socket-timout-2.3
Port socket sockejs timeout to 2.3
2020-11-23 09:05:48 -05:00
Fred Dixon
5d4d9ab0f5
Merge pull request #10887 from ffdixon/update-bbb-conf-30
Added check for default stun.freeswitch.org
2020-11-23 08:13:08 -05:00
Fred Dixon
0a4726bfcf Added check for default stun.freeswitch.org 2020-11-23 07:11:06 -06:00
Tainan Felipe
af7479df28 add missing file 2020-11-20 17:32:21 -03:00
Tainan Felipe
091c5f3932 Port Handle chat messages in sync way for 2.3 2020-11-20 16:26:34 -03:00
Tainan Felipe
8650e0500b Port socket sockejs timeout to 2.3 2020-11-20 14:31:24 -03:00
Fred Dixon
eba0058bac
Merge pull request #10873 from mariogasparoni/v2.2.x-release
Do not trigger reconnect when ICE connection terminates before hanging up process is finished
2020-11-20 07:43:14 -05:00
Mario Jr
2b89dd7db2 Do not trigger reconnect when ICE connection terminates before hanging up process is finished
This could leave users to have your audio reconnected in the main room, while joining a breakout room
Some information can be found in #10528
2020-11-20 00:25:46 -03:00
Mario Jr
9a2fcd27e0 Revert "Prevent Error 1006 when user has two or more occurrences of ':' (colon) in your name"
This reverts commit 0a601359bb.
2020-11-20 00:23:43 -03:00
Anton Georgiev
a310a59257
Merge pull request #10870 from antobinary/breakouts-who-is-talking-mute
Breakouts: do not allow mute via who-is-talking button
2020-11-19 14:20:12 -05:00
Anton Georgiev
35032963b9 bump up release to 2.2.30 2020-11-19 14:15:45 -05:00
Anton Georgiev
dedaea5ad2 who-is-talking - do not allow mute in breakouts 2020-11-19 14:14:37 -05:00
Anton Georgiev
5825e15dc9
Merge pull request #10868 from antobinary/nodejs-port-4000
parse instanceId as int; develop on port 4000
2020-11-19 10:34:39 -05:00
Anton Georgiev
39257aa2d8 parse instanceId as int; develop on port 4000 2020-11-19 15:31:24 +00:00
Anton Georgiev
a947977c66
Merge pull request #10865 from jfsiebel/handle-chat-message-in-order
Handle chat messages in sync way
2020-11-19 09:31:11 -05:00
Joao Siebel
4a88d0a6db Handle chat messages in sync way 2020-11-18 18:09:38 -03:00
Anton Georgiev
b406674349
Merge pull request #10860 from antobinary/parallel-nodejs-processes
Support for parallel bbb-html5 nodejs processes. Part 1
2020-11-18 15:44:52 -05:00
Anton Georgiev
23f2df11d5 code changes to allow for meetings' redis events to be processed on different html5 nodejs pids 2020-11-18 20:34:02 +00:00
Anton Georgiev
468725c386
Merge pull request #10858 from mariogasparoni/v2.2.x-release
Set listenOnly to false when user left voice
2020-11-18 13:27:39 -05:00
Mario Jr
70456ef93d Set listenOnly to false when user left voice
The message/event UserLeftVoiceConfToClientEvtMsg is used when user leaves mic and listenonly, but it only sets to false the 'voiceJoined' (which represents the <hasVoiceVoiceJoined> property in BBB's XML API.
We now also set to false the 'listeningOnly' (which represents the <isListeningOnly> property in BBB's XML API). Setting both to false is not a problem, once 'MIC' and 'ListenOnly' states are mutually exclusives
Fixes #10852
2020-11-18 11:55:32 -03:00
Anton Georgiev
0b34c4fa81
Merge pull request #10857 from mariogasparoni/v2.2.x-release
Filter 'name' field in user's search
2020-11-18 09:09:20 -05:00
Mario Jr
8822819900 Filter 'name' field in user's search
This is a part of #10848, as discussed in https://github.com/bigbluebutton/bigbluebutton/pull/10848#discussion_r525480434
2020-11-18 10:40:15 -03:00
Anton Georgiev
aaf3878a4d
Merge pull request #10848 from mariogasparoni/v2.2.x-release
Fix audio modal buttons (MIC/LISTEN) after errors AND prevent Error 1006 when user has two or more occurrences of ':'
2020-11-17 15:14:20 -05:00
Mario Jr
0a601359bb Prevent Error 1006 when user has two or more occurrences of ':' (colon) in your name
This happens because FreeSWITCH is not able to parse the "From" header when it has multiple occurrences of ':'. So user is not able to join audio.
To fix, we now changed the "callerId" to use the base64 value of the user name, instead of directly using user's input (the callerId format keeps being a triple like this: <user_id>-bbbID-<base64_encoded_name>).
Once this callerIdName is encoded at the same point it is generated, there shouldn't be server side effects for changing this value; except for those places where the callerName is retrieved by splitting this triple (such as the voice talking-indicator, as described below).
Updated the talking-indicator to retrieve the username from User's object, instead of retrieving from the one username generated by splitting the callerId triple.
This problem also happens in versions <= 2.2.26.
2020-11-17 15:31:43 -03:00
Mario Jr
1b1a055d37 Fix audio modal buttons (MIC/LISTEN) not working after audio error
When user joins audio and for some reason an error (such as 1001, 1002,...), happens, the user is not able to click "Mic" and "Listen Only Buttons"; except if the audio window is closed and oppened again.
2020-11-17 15:31:42 -03:00
Anton Georgiev
38b71049f9
Merge pull request #10826 from jfsiebel/tweak-sockjs-timeout
Tweak sockjs timeout value
2020-11-17 11:24:42 -05:00
Fred Dixon
04959f45d8
Merge pull request #10841 from lkiesow/allow-bbb-to-manage-rec
Allow user bigbluebutton to delete recordings
2020-11-16 19:49:46 -05:00
Fred Dixon
6b4710e349
Merge pull request #10840 from lkiesow/bbb-record-style
Style of bbb-record
2020-11-16 19:49:03 -05:00
Lars Kiesow
7a59069958
Allow user bigbluebutton to delete recordings
This patch modifies `bbb-record` allowing the user `bigbluebutton` to
delete recordings. The user has all necessary access rights, meaning
that the deletion works without a problem and the check for root does
not protect anything. The users owns the data after all. The current
check just makes things less convenient.
2020-11-16 23:58:47 +01:00
Lars Kiesow
c7bdfc09c6
Style of bbb-record
Currently, `bbb-record` uses a bunch of different style for indentation,
sometimes tabs, sometimes to, three or four spaces and these are
sometimes mixed on a line by line basis, making it hard to read and to
get what's going on.

This is a simple patch making the style of `bbb-record` consistent by
using three spaces for indentation which seemed to be the most commonly
used type of indentation here.
2020-11-16 23:39:25 +01:00
Joao Siebel
b6b211f4fb Tweak heartbeat 2020-11-16 18:37:25 -03:00
Joao Siebel
1c47023e8a Add original function link for reference 2020-11-16 10:46:18 -03:00
Joao Siebel
3a2d06fd88 Tweak sockjs timeout value 2020-11-13 18:41:56 -03:00
Fred Dixon
4bc44bfa9c
Merge pull request #10825 from KDSBrowne/2.3-safair-console-errors
Fix console errors in safari on iPad
2020-11-13 16:06:45 -05:00
Anton Georgiev
18b7528571
Merge pull request #10824 from antobinary/debug-behind-flag
Pulled HTML5 locales on Nov 13, 2020
2020-11-13 14:18:47 -05:00
Anton Georgiev
9ed5154740 Pulled HTML5 locales on Nov 13, 2020 2020-11-13 14:17:15 -05:00
Anton Georgiev
b1227f5785
Merge pull request #10810 from prlanzarin/u22-gumtgc-wa
[html5/webrtc] Fix tryGenerateIceCandidates rejections and put it behind a flag
2020-11-13 11:00:05 -05:00
Anton Georgiev
ecbf575dcf
Merge pull request #10819 from bigbluebutton/join-api-sanitize
Sanitize parameters of API's. Fixes #10818
2020-11-13 10:55:38 -05:00
Anton Georgiev
ca0adf046c
Merge pull request #10820 from bigbluebutton/clear-return-messages
Split error message from session token in bbb-web enter API
2020-11-13 10:45:11 -05:00
Anton Georgiev
72b4c83844
Merge pull request #10817 from antobinary/debug-behind-flag
Simplified redis debug and placed behind check
2020-11-13 09:53:26 -05:00
Tiago Daniel Jacobs
e59bcd0c33 Sanitize all received parameters 2020-11-13 06:54:32 +00:00
Tiago Daniel Jacobs
52e3eea552 Split error message from session token ( making it easier to translate - and more secure/ ) 2020-11-13 06:13:48 +00:00