Commit Graph

2253 Commits

Author SHA1 Message Date
Gustavo Trott
4e3711c1bd Resolve conflicts on backend marging 24->Develop 2022-01-27 08:29:14 -03:00
Ramón Souza
16cd3c4ebb Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125 2022-01-25 16:56:52 +00:00
Anton Georgiev
5f4c5cdedb
Merge branch 'develop' into r-r-e-acea 2022-01-24 16:05:57 -05:00
Anton Georgiev
2e72946bc1
Merge pull request #14088 from zhem0004/fixPhoneBan
Fix: Removing phone users always bans them
2022-01-24 15:50:30 -05:00
Anton Georgiev
a761f0177a
Merge pull request #14143 from frankemax/fix-userdata-injection
fix(userdata): consistent breakout room userdata
2022-01-24 15:10:38 -05:00
Anton Georgiev
b8ba4b5c71
Merge pull request #14075 from gustavotrott/api-create-virtual-background-param
Add param to disable Virtual Backgrounds in API /create
2022-01-24 15:04:30 -05:00
Pedro Beschorner Marin
c9043655f1
Merge branch 'develop' into position-in-waiting-queue 2022-01-24 14:31:03 -03:00
Pedro Beschorner Marin
810deb907b refactor(etherpad): access control et al.
Move all Etherpad's access control from Meteor to a separated [Node application](https://github.com/bigbluebutton/bbb-pads).
This new app uses [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview)
to create groups and manage session tokens for users to access them. Each group
represents one distinct pad at the html5 client.

- Removed locked users' access to pads: replaced readOnly pad's access with a new pad's content sharing routine
- Pad's access is now controlled by [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview)
- Closed captions edited content now reflects at it's live feedback
- Improved closed caption's dictation mode live feedback
- Moved all Etherpad's API control from Meteor to a separated [app](https://github.com/bigbluebutton/bbb-pads)
- Included access control both in akka-apps and bbb-pads
2022-01-21 16:56:01 -03:00
SashoVihVas
d99c271fa6 This commit includes following changes:
1.HashMap updates in Meeting.java are updated
2.callback is removed from setGuestStatus.js
3.MeetingService.java passes the guest list instead of iterating through it
2022-01-20 18:24:25 +00:00
Pedro Beschorner Marin
4a0882f9f2 fix(userdata): merge breakout room userdata
Avoid using MongoDB to copy breakout room user's userdata. All userdata is
now merged at bbb-web's join API call.
2022-01-19 10:58:13 -03:00
Aleksandar Vasilev
6935b8293c
Merge branch 'bigbluebutton:develop' into position-in-waiting-queue 2022-01-16 02:59:40 +01:00
Aleksandar Vasilev
6103ae960d
Merge branch 'bigbluebutton:develop' into develop-private-guest-lobby-messages 2022-01-16 02:58:43 +01:00
Bohdan Zhemelinskyi
df3da31f39 fixUsersGettBannedFromPhone 2022-01-13 18:43:16 +00:00
prlanzarin
8e822f4a6d fix(screenshare): add state sync between bbb-html5 and akka-apps
A TODO 5 years in the making
2022-01-12 19:36:38 -03:00
Gustavo Trott
7d55cac005 Implements virtualBackgroundsDisabled param to API /create 2022-01-12 18:21:58 -03:00
Anton Georgiev
d30fc98af0
Merge pull request #13894 from ramonlsouza/remove-user-persistent
refactor: Remove unused user data on leave
2022-01-12 14:10:03 -05:00
germanocaumo
b71b9a0c85 fix(polls): fix wrong typed poll results due to race condition
Sometimes a vote for a new answer text was being computed as a vote for the first option due to poll collection late update.
2022-01-12 17:41:02 +00:00
Ramón Souza
f6e65f58c5 merge 2.4 into develop and resolve conflicts - partial 2022-01-12 16:40:45 +00:00
SashoVihVas
1862f60e05 Add private guest lobby messages 2022-01-12 14:10:30 +00:00
SashoVihVas
2d7c82e73d Add position in waiting queue for guest users 2022-01-12 03:08:43 +00:00
Mario Jr
1621834239 feat(audio): add settings for audio websocket connection
Default values were kept, but now this can be changed in settings.yml.
If not set in settings.yml, the old hardcoded values are used.
2022-01-10 18:56:29 -03:00
Tainan Felipe
a0a20e46ac Fix typo in validate authtoken method 2022-01-10 15:29:25 -03:00
Ramón Souza
1ddb15eb8a Merge remote-tracking branch 'upstream/v2.4.x-release' into remove-user-persistent 2022-01-06 16:26:23 +00:00
Daniel Schreiber
6dcc4cab75 Fix telephone dialin
this fixes a crash in bbb-html5 when someone uses phone dialin. The
crash resulted in users joining the audio convference but not being
visible in the users list.

Fixed stack trace:

~~~
error: UserJoinedVoiceConfToClientEvtMsg: Error: Match error: Missing key 'pin'
    at check (packages/check/match.js:36:17)
    at addUser (imports/api/users/server/modifiers/addUser.js:23:3)
    at addDialInUser (imports/api/users/server/modifiers/addDialInUser.js:30:10)
    at EventEmitter.handleJoinVoiceUser (imports/api/voice-users/server/handlers/joinVoiceUser.js:36:5)
    at EventEmitter.emitAsync (/usr/share/meteor/bundle/programs/server/npm/node_modules/eventemitter2/lib/eventemitter2.js:463:31)
    at MeetingMessageQueue.handleTask (imports/startup/server/redis.js:114:10)
    at imports/startup/server/redis.js:126:28
    at Queue.start (/usr/share/meteor/bundle/programs/server/npm/node_modules/queue/index.js:145:17)
    at Queue.<computed> [as push] (/usr/share/meteor/bundle/programs/server/npm/node_modules/queue/index.js:59:12)
    at MeetingMessageQueue.add (imports/startup/server/redis.js:125:16)
    at RedisPubSub.handleMessage (imports/startup/server/redis.js:327:63)
    at runWithEnvironment (packages/meteor.js:1320:24)
~~~
2022-01-03 14:22:28 +01:00
Max Franke
85ad9a5e30 feat(video): webcam video pinning server side logic
Add the new ChangeUserPinState messages to handle the new video pinning
functionality
2021-12-21 16:58:38 -03:00
Anton Georgiev
c7206bb59e
Merge pull request #13866 from ramonlsouza/presenter-polls
fix: increase current-poll security
2021-12-15 13:40:19 -05:00
Ramón Souza
fd874aa10a Merge remote-tracking branch 'upstream/v2.4.x-release' into remove-user-persistent 2021-12-15 18:04:02 +00:00
Anton Georgiev
0b82fb9fdb
Merge pull request #13893 from Tainan404/fix-the-auth-loop
re-implement the server-side connection close when user is removed
2021-12-15 12:41:12 -05:00
Anton Georgiev
ff63e6541f
Merge pull request #13927 from Tainan404/fix-loop-auth
Revert auth token validation publisher changes
2021-12-15 11:51:15 -05:00
Anton Georgiev
b0c66caef9
Merge pull request #13915 from prlanzarin/u24-sprawling-pier
feat(webcams): add option to allow moderators to close another user's webcams
2021-12-15 09:24:11 -05:00
Tainan Felipe
da065cb6ea Revert auth token validation publisher changes 2021-12-15 11:06:07 -03:00
Anton Georgiev
a1fff7508d
Merge pull request #13876 from prlanzarin/u24-malibu-bubu
fix(fullaudio): remove cross wired configs
2021-12-14 16:44:59 -05:00
Anton Georgiev
ad97eb2ebe
Merge pull request #13871 from prlanzarin/u24-lifeforms-longforms
feat(bbb-html5): add a general forceRelay flag
2021-12-14 16:44:36 -05:00
Paulo Lanzarin
775150471c
Merge pull request #13688 from Arthurk12/screenshare-volume
feat(screenshare): volume control
2021-12-14 14:06:37 -03:00
prlanzarin
21c124b854 feat(webcams): server-side logic to allow moderators to close user's webcams
Includes a new create param/web conf called allowModsToEjectCameras, false by
default.

Ejection does not work in breakout rooms or with non-mod users

Ejection closes _all_ webcams shared by the target user
2021-12-13 19:49:41 +00:00
Ramón Souza
d1c516fef6 resolve html5 conflicts 2021-12-10 21:07:35 +00:00
Ramón Souza
b10544aba5 remove user data on leave + video fix 2021-12-10 19:13:26 +00:00
Tainan Felipe
fb6aae1a02 re-implement the server-side connection close when user is removed 2021-12-10 15:38:55 -03:00
Anton Georgiev
328b3c1563
Revert "fix: Fix server side connection close on user disconnection" 2021-12-09 17:27:35 -05:00
Anton Georgiev
b6cf565ca6
Revert "refactor: Remove unused user data on leave" 2021-12-09 16:56:25 -05:00
Anton Georgiev
797fc49633 TEMP 2021-12-09 20:37:05 +00:00
prlanzarin
93b5f4c93d feat(bbb-html5): add a general forceRelay flag
public.media.forceRelay forces relay usage on all browsers, environments and media modules

If true, overrides public.kurento.[4~forceRelayOnFirefox
2021-12-09 11:35:56 +00:00
prlanzarin
d59f910d84 fix(fullaudio): remove cross wired configs
Offer direction should only be controlled that way in listen only
2021-12-08 23:45:45 -03:00
Ramón Souza
6a6f690282 increase current-poll security 2021-12-08 19:30:04 +00:00
prlanzarin
e49aa1c959 refactor(screenshare): revert volume control to HTMLMediaElement, make it configurable
I have growing concerns about gain node`s effect on audio quality the way it
was implemented, so I opted to fall back to HTMLMediaElement`s volume control
for the time being until we can gauge quality impacts properly later on

Add a new configuration flag enableVolumeControl, false by default while the
feature undergoes a field trial
2021-12-08 16:24:31 +00:00
hiroshisuga
0bc62f66f4
Feat(meeting): minimise sequential user pick (#13831)
Updating random user picker to reduce the probability that the exact same viewers would be selected first in successive random-pick runs
2021-12-07 12:36:34 -05:00
Anton Georgiev
578332a094
Merge pull request #13731 from schrd/cluster_proxy
Allow BBB to run behind a proxy the avoid gUM permission queries per node
2021-12-03 11:32:07 -05:00
Anton Georgiev
8bbb2b3cae
Merge pull request #13773 from ramonlsouza/remove-persistent-on-leave
Remove unused user data on leave
2021-12-02 15:37:34 -05:00
Gustavo Trott
9488392116 Removes breakoutStarted handler once it will not be listened anymore 2021-12-02 16:02:28 -03:00
Gustavo Trott
ba5f38f504 Merge with breakout-history pr 2021-12-02 14:22:51 -03:00