BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,049 Commits 13 Branches 260 Tags 1.1 GiB
b6de2a1b55
Commit Graph

795 Commits

Author SHA1 Message Date
Gustavo Trott
dad9be2a6a Merge remote-tracking branch 'upstream/v2.5.x-release' into api-param-disabledFeatures 2022-02-07 10:23:28 -03:00
Gustavo Trott
de4688bcdc Implement new param disabledFeatures 2022-02-07 10:22:52 -03:00
Guilherme Leme
ea09c7001c [issue-14014] - WIP adding current tag on presentation payload 2022-02-04 14:52:53 -03:00
Guilherme Leme
7650967b2f Resolved merging conflicts. 2022-02-04 08:48:58 -03:00
Guilherme Leme
75f3eab3f8 Resolve merging conflicts 2022-02-03 12:03:26 -03:00
Guilherme Leme
ff9916866a Implemented validation and created the template as well as the response builder for this endpoint. 2022-02-03 09:39:01 -03:00
Guilherme Leme
655c81c8f4 [Issue-14014]-Implemented the logic in the controller and refactored the function uploadDocuments to fit the new scenario. I also created the insert model to be validated. 2022-02-03 09:33:29 -03:00
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
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
16f5b104d3
Merge pull request #14112 from pedrobmarin/f-a-aaamcp 
feat(api): allowRequestsWithoutSession as a meeting create param
 2022-01-24 15:08:26 -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
Guilherme Leme
7d6156d298 [Issue-13238]-Refactored files to fit the new presentation structure (With the removable attribute). And refactored message services as well. 2022-01-21 11:49:44 -03:00
Guilherme Leme
fe2a7e82de [Issue-13238]-Refactored classes to fit the new presentation structure (With the removable attribute). 2022-01-21 11:43:30 -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
Aleksandar Vasilev
06799ad64f
Corrected HashMap updates in Meeting.java 2022-01-20 04:08:59 +02:00
Arthurk12
3e4d918b47 fix(breakouts): user with no custom data 
Fixes null pointer exception when user has no custom data.
 2022-01-19 10:58:29 -03: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
Pedro Beschorner Marin
2bc370ce0b feat(api): allowRequestsWithoutSession as a meeting create param 
Add a create meeting parameter to enable or disable the user's cookie
session requests.
 2022-01-17 09:51:01 -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
Gustavo Trott
baf1b53407 Resolve conflicts in Ramon's 2.4 merge 2022-01-12 19:35:00 -03:00
Gustavo Trott
7d55cac005 Implements virtualBackgroundsDisabled param to API /create 2022-01-12 18:21:58 -03: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
Gustavo Trott
e930bcefd5 fix: Adds support for big numbers in learningDashboardCleanupDelayInMinutes 2022-01-10 18:37:11 -03:00
Gustavo Trott
af4bf7e6f1 Handles Dashboard cleanUpDelayMinutes greater than allowed 2022-01-10 16:51:19 -03:00
root
427cd8ac34 Merge branch 'develop' into origin/jdk-17-upgrade 2021-12-17 15:59:00 +00:00
Richard Alam
223b5488c7
Merge pull request #13932 from paultrudel/make-create-passwords-optional 
Added logging for passwords
 2021-12-15 14:30:31 -05:00
paultrudel
65688af8b0 Added logging for passwords 2021-12-15 14:28:37 -05:00
Richard Alam
0a8330a98b
Merge pull request #13928 from paultrudel/make-create-passwords-optional 
Make create passwords optional
 2021-12-15 09:39:51 -05:00
paultrudel
0ad6d6a2b8 Passwords are now optional for create requests 2021-12-15 09:33:36 -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
Gustavo Trott
35e465387b Merge of last Dashboard 2.4 improvements 2021-12-15 10:35:14 -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
Gustavo Trott
63f60f5009 Reduce Dashboard cookie timelife 2021-12-10 17:15:47 -03:00
Anton Georgiev
797fc49633 TEMP 2021-12-09 20:37:05 +00:00
paultrudel
6213e4badd Added new constraint to join request to validate passwords 2021-12-06 13:29:44 -05:00
root
1b40921ca2 upgrading dependencies for bbb-common-web 2021-12-04 17:50:47 +00:00
root
ce7362380b Merge branch 'develop' into origin/jdk-17-upgrade 2021-12-03 14:04:02 +00:00
root
e3330d0e07 upgrading bbb-common-web 2021-11-27 09:42:25 +00:00
Gustavo Trott
df60295d22 Implements join param excludeFromDashboard 2021-11-26 14:07:03 -03:00
Gustavo Trott
8555187df3 Resolve conflicts with Develop branch 2021-11-11 14:02:03 -03:00
Gustavo Trott
02750b35ef Let interface define group name when its null (in favor of intl) 2021-11-11 10:25:40 -03:00
Gustavo Trott
e919e24b38 Auto assign breakout names and users using lastBreakout or groups 2021-11-11 10:10:31 -03:00
Joao Siebel
1f6d44763f Add version tag back to api response 2021-11-03 11:11:33 -03:00
Anton Georgiev
123705bd37
Merge pull request #13609 from jfsiebel/bbb-version-api-response 
Add bbb version in api response
 2021-11-02 16:35:38 -04:00
Joao Siebel
cb4c21a7ac Add bbb version in api response 2021-10-29 17:20:19 -03:00
Joao Siebel
3796d152a4 Fix setRole and remove required 2021-10-27 16:10:12 -03:00
Joao Siebel
7ea48706ef Add role parameter on join 2021-10-27 15:28:11 -03:00
Gustavo Trott
ae88e8d325 Add Api/learningDashboard properly validation 2021-10-18 18:15:46 -03:00
Anton Georgiev
a1e3bbebd3
Merge pull request #13488 from gustavotrott/learning-dashboard-individual-token 
refactor: Makes LearningDashboard data be provided by bbb-web (avoid demoted user to receive updates)
 2021-10-18 13:37:03 -04:00
Gustavo Trott
0102104fbe Makes bbb-web provide LearningDashboard data while meeting is alive 2021-10-14 14:00:25 -03:00
paultrudel
d5405edcee Checksum constrain is now validated before any other constraints 2021-10-06 16:36:14 -04:00
paultrudel
6f40fa115d Merge branch 'v2.4.x-release' of https://github.com/bigbluebutton/bigbluebutton into change-message-key-value 2021-10-06 16:02:48 -04:00
paultrudel
a6d2dfd8ba removed some unused code 2021-10-06 10:40:40 -04:00
paultrudel
fa3fce9678 allow all parameters to be sent in th request body and have a null query string 2021-10-06 10:36:21 -04:00
paultrudel
5b4ea24ea8 All constraints now have both a key and a message parameter 2021-10-04 13:50:17 -04:00
Gustavo Trott
64f0c7cf29 Disable LearningDashboard for Breakout Rooms 2021-10-04 11:09:47 -03:00
paultrudel
5e3f33131c Reverted the messageKey values in validation error messages back to their old values 2021-10-01 15:31:30 -04:00
paultrudel
65a7ecacbb Join and end request passwords still required 2021-09-15 09:48:39 -04:00
paultrudel
9c6974741b moderatorPW and attendeePW and no longer required for create requests 2021-09-15 09:11:27 -04:00
Joao Siebel
05ba0db81a Remove presentation on end 2021-09-10 16:25:01 -03:00
Joao Siebel
6286d8bc9c Prevent some cases where the presentation conversions didn't end in some breakouts. close #13109 2021-09-10 15:39:46 -03:00
Anton Georgiev
a8bebbe91c
Merge pull request #13133 from gustavotrott/learning-dashboard-adjustments 
Makes configurable the delay to clean up Learning Dashboard
 2021-09-02 10:45:15 -04:00
Gustavo Trott
d2c405ddf2 Renames config learningDashboardCleanupInMinutes to learningDashboardCleanupDelayInMinutes 2021-09-01 16:52:52 -03:00
paultrudel
39aaa52b25 Move max participant check back to Api 
Controller
 2021-09-01 15:50:45 -04:00
Gustavo Trott
76c6a9d107 Replaces config learningDashboardCleanupEnabled by learningDashboardCleanupInMinutes 2021-09-01 15:51:22 -03:00
Gustavo Trott
049981da01 Renames activity_report.json to learning_dashboard_data.json 2021-09-01 11:38:00 -03:00
Gustavo Trott
6970a0ab30
Merge branch 'develop' into learning-dashboard-improvements2 2021-08-30 15:23:04 -03:00
Anton Georgiev
4ecb24b4fa Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-aug30 2021-08-30 18:11:16 +00:00
Gustavo Trott
4c4323ec69 Implements Clean up of LearningDashboard files when meeting ends 2021-08-26 14:18:09 -03:00
Gustavo Trott
ef4de06cf8 Fix problem in param learningDashboardEnabled 2021-08-25 17:19:04 -03:00
Gustavo Trott
cd15f17394 Refactor all references for activity-report renaming to learning-dashboard 2021-08-25 11:38:35 -03:00
Pedro Beschorner Marin
1db49719c9 feat(web): set default logo 
Add an option to set a default logo to be placed for all created meetings.

The default logo is inserted as a create meeting param for all meetings that
do not have a `logo` param defined. Two new properties were included at
bigbluebutton-web configuration:

- [Boolean] `useDefaultLogo`: enables/disables the use of the default logo
  disabled as default

- [String] `defaultLogoURL`: The default logo URL to be fetched by the client
  bigbluebutton logo as default
 2021-08-19 15:22:44 -03:00
Anton Georgiev
d75900d5a2
Merge pull request #12924 from gustavotrott/activity-report-2 
Activity Report - New Dashboard layout
 2021-08-06 12:44:39 -04:00
paultrudel
f5b55a6bdb modified how the checksum is removed from the query string 2021-08-05 14:55:35 -04:00
paultrudel
ad8578f476 allowed the use of commas in meeting names 2021-08-04 16:07:54 -04:00
Gustavo Trott
42e32b7ba8 Include infos about meeting endedOn and fix problem where user leftOn was never set if meeting ends before they left 2021-08-02 11:16:08 -03:00
Anton Georgiev
73da9c15da Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-23-july-30 2021-07-30 23:43:27 +00:00
paultrudel
2af81a3a9e fixed issue with guests not joining meeting after being approved 2021-07-30 15:57:30 -04:00
paultrudel
c325713167 null values are now allowed for parameters that are not required 2021-07-30 10:04:17 -04:00
paultrudel
5687842f17 converted boolean input values to lowercase before validating them 2021-07-29 10:38:39 -04:00
paultrudel
0ef55cd592 modified boolean validator to accept 0 and 1 as valid boolean values 2021-07-29 09:58:45 -04:00
paultrudel
4fcf4f991b modified regex pattern to allow international characters in meeting name/id 2021-07-28 09:56:42 -04:00
Marcel Hellkamp
500a1e6ff4 fix(common-web): Sub-processes hang if output buffers fill up 
ExternalProcessExecutor spawned sub-processes with stderr and
stdout buffers, but did not read from those buffers. Sub-processes
producing output sometimes would fill up these buffers and then hang
until the timeout occurs and the process is killed.

This fixes #12839 (PDF conversion hangs for 10 seconds per page)
by properly discarding command output. The patch also deprecates an
outdated and dangerous API and offers a safer alternative. Splitting
command arguments based on whitespace may result in unwanted behavior
if an argument (e.g. a filename) contains whitespace.
 2021-07-28 14:56:26 +02:00
Gustavo Trott
e4ef1582f2
Merge branch 'develop' into activity-report 2021-07-22 11:33:47 -03:00
Gustavo Trott
4e211d70a8 Removes unnecessary comments 2021-07-22 11:13:30 -03:00
Gustavo Trott
3c6155a73e Creates config activityReportTracking to enable Activity Report 2021-07-22 11:09:44 -03:00
Gustavo Trott
b0f9835ffd Merge branch 'develop' into activity-report 2021-07-21 14:20:27 -03:00
Joao Siebel
8462465a5f Allow default layout config in bbb-web. close #12668 2021-07-19 11:02:58 -03:00
paultrudel
4a0f1b773b made voice bridge an optional parameter 2021-07-13 12:30:44 -04:00
paultrudel
43e454fca8 breakout room and record are no longer required parameters for create requests 2021-07-13 11:27:59 -04:00
Gustavo Trott
45d4c310c2 Merge branch 'develop' into activity-report 2021-07-13 11:12:45 -03:00
Anton Georgiev
2c28206ea1
Merge pull request #12564 from gustavotrott/breakoutrooms-set-name 
Adds possibility to give a name to breakout rooms
 2021-07-12 16:30:14 -04:00
Anton Georgiev
8cf5b64a0f
Merge pull request #12693 from paultrudel/update-api-validation 
Updates to BBB-Web API validation
 2021-07-12 16:20:34 -04:00
Gustavo Trott
5c602fd2b0
Merge branch 'develop' into breakoutrooms-set-name 2021-07-12 16:31:38 -03:00
paultrudel
e5f13e7916 added postman test scripts to test to the functionality of the bbb-web api 2021-07-12 11:24:09 -04:00
Gustavo Trott
1d7dcb200a Add improvements in Nginx config 2021-07-09 15:24:08 -03:00
paultrudel
6b9463daf8 added type conversion check for createTime parameter in join meeting 2021-07-07 11:44:55 -04:00
paultrudel
af32ac984d added new constraints to ensure proper data format 2021-07-05 14:08:56 -04:00
paultrudel
5db8c769c2 fixed freemarker getSessions null error 2021-07-02 10:57:45 -04:00
paultrudel
078a369b68 Minor bug fixes to validation in some validators 2021-06-30 13:21:28 -04:00
paultrudel
f74ea387d7 updates to validation on all api endpoints 2021-06-30 10:17:08 -04:00
Gustavo Trott
0417cbb03f Adds Activity Dashboard initial version and generate activityReportAccessToken 2021-06-30 00:01:46 -03:00
Gustavo Trott
7d76ccac4c Change default Activity-report directory 2021-06-24 16:37:15 -03:00
Gustavo Trott
de9896d8c5 Akka sends pubSub ActivityReportEvtMsg and Bbb-web listen and export the content as Json file 2021-06-24 16:22:27 -03:00
paultrudel
1191713b48 fixed merge conflicts 2021-06-24 10:03:02 -04:00
paultrudel
a2cd27c1f9 merge with update-api-create-join-validation 2021-06-24 09:32:23 -04:00
paultrudel
1cdfbbd08a updated validation for bbb-web api create/join 2021-06-23 11:17:35 -04:00
Anton Georgiev
5ee5ed1970 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-june16 2021-06-16 19:54:28 +00:00
Anton Georgiev
3e5214234b
Merge pull request #12469 from jfsiebel/allow-tags-meeting-user-name 
Allow tags in meeting and user name
 2021-06-15 10:28:58 -04:00
Max Franke
4757107f6f fix(breakout-room): avoid muteOnStart at breakout room 
Quick fix to prevent the moderator who joins the
breakout room from being unable to unmute himself
 2021-06-14 19:28:29 -03:00
Gustavo Trott
37dea2215b Translates dynamically breakout room Names when default name is being used 2021-06-14 16:59:27 -03:00
Anton Georgiev
06b73419a6 fix: endWhenNoModerator* passed meetingCreate params should override default values 2021-06-03 19:46:57 +00:00
Anton Georgiev
e01bdf69c5 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into june2-merge-into-develop 2021-06-02 18:45:31 +00:00
Joao Siebel
eedf3a00f2 Remove stripHTMLTags method 2021-05-31 13:14:39 -03:00
Joao Siebel
f16700a8c4 Allow tags in meeting and user name. close #10221 close #12370 2021-05-31 09:59:15 -03:00
Anton Georgiev
ced0cc0b26 removed configXML from bbb-web 2021-05-22 16:13:29 +00:00
Gustavo Trott
00240c925e Implements endWhenNoModerator 2021-05-17 17:52:59 -03:00
Gustavo Trott
7ab6a2c4c9 Detects if PDF contains font Type 3 and rasterize automatically 2021-04-28 15:47:55 -03:00
Gustavo Trott
b6e0a571d5 Implements forceRasterizeSlides (force convert presentation to png before svg) and pngWidthRasterizedSlides (force png width (px)) 2021-04-22 21:57:55 -03:00
Gustavo Trott
a08a0d33e1 Makes presentation svg resolution configurable, and set default to 300 2021-04-19 16:01:48 -03:00
Gustavo Trott
3e675af3b5 Akka broadcasts UploadedFile Too Large error msg 2021-04-08 16:49:17 -03:00
Gustavo Trott
3d1575e635 Send pubSub FileTooLarge Error Msg from bbb-web when file is too large, (and makes Akka send meetingId with presentation token msg) 2021-04-08 14:18:15 -03:00
Gustavo Trott
8a1d5ba8a0 Handle and log timeout error during Office2Pdf conversion 2021-03-31 14:21:00 -03:00
Gustavo Trott
64d3afbb1c Changes timeout error text 2021-03-31 14:19:47 -03:00
Gustavo Trott
4b4588c20d Handle and log timeout errors during conversions 2021-03-31 12:10:02 -03:00
Gustavo Trott
1c6f8a1610 Moves default pdfToSvg conversion timeout to config 2021-03-30 18:29:34 -03:00
Anton Georgiev
75e935d771
Merge pull request #11809 from gustavotrott/develop 
Enhancements to presentation OfficeToPDF conversion
 2021-03-30 12:27:25 -04:00
Gustavo Trott
58a05acce6 Implements max concurrent office2pdf conversions and set conversion timeout from config 2021-03-30 11:26:03 -03:00
Anton Georgiev
d131b0a7bf
Merge pull request #11717 from gustavotrott/develop 
Adds a customizable "office to pdf" converter for presentations
 2021-03-29 17:08:49 -04:00
Gustavo Trott
eab8e6488a Use of ProcessBuilder instead of Runtime.exec 2021-03-29 17:44:46 -03:00
Tiago D J
cab865c913
Quick fix to avoid empty slides 
This PR reduces the impact of #8618 by increasing hardcoded timeout from 7s to 60s

A subsequent PR is going to be sent by @gustavotrott to:

-> Make this timeout configurable;
-> Add a log telling that timeout happened
 2021-03-25 12:09:44 -03:00
Gustavo Trott
a69baba177 Removes jodconverter from project dependencies 2021-03-24 15:00:05 -03:00
Gustavo Trott
5c1271cf0d Removes files and codes not used anymore 2021-03-23 18:37:37 -03:00
Gustavo Trott
2f56f7415d Improves error handling 2021-03-23 10:46:39 -03:00
Gustavo Trott
1a6457f178 Adds presentation script path as parameter 2021-03-22 17:37:49 -03:00
Gustavo Trott
e9d5eca664 Replaces the presentation Office to Pdf converter using shellScript instead of jodconverter 2021-03-22 15:32:22 -03:00
Anton Georgiev
8302159255
Revert "Add getter for defaultKeepEvents" 2021-03-21 22:21:52 -04:00
Anton Georgiev
f8149578bd
Add getter for defaultKeepEvents 
Follow up to #11681
 2021-03-21 21:43:50 -04:00
Anton Georgiev
6c7da44940 replaced keepEvents with defaultKeepEvents and meetingKeepEvents 2021-03-18 02:31:47 +00:00
Pedro Beschorner Marin
0365018e92 Add guest lobby messages 
Moderators are able to send a message to the meeting's guest lobby. This new
event reaches bbb-web and is sent to the guest user with her/his status response
while polling. All guest users that are waiting for acceptance will be able to
read this message.

enableGuestLobbyMessage is disabled by default.
 2021-03-09 11:02:25 -03:00
Richard Alam
28245a1b58
Merge pull request #11557 from aron-2809/bbb-core-http-endpoint-wip 
Bbb core http endpoint wip
 2021-03-05 14:27:48 -05:00
Anton Georgiev
228bad03d5 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into march4-merge 2021-03-04 21:25:47 +00:00
Aron Engineer
cae124aed7 feat: pubsub send and receive statuses added to health endpoint 2021-03-04 21:16:48 +00:00
Pedro Beschorner Marin
f02384bb1f Fix padId getter 
Pad exporter uses this same location to serve pad's downloaded content
but the the match was failing because padId is not the last element
of the URL on that scenario.

Pattern follows /pad/p/<padID>[/export/(format)]?<query>.
 2021-03-03 20:36:19 -03:00
Anton Georgiev
f43560d535 Support for backend vs frontend nodejs instances bbb-html5 2021-02-16 03:19:31 +00:00
Pedro Beschorner Marin
09b39a8d63 Add extra pad validation 
Associate pads with meetings so session validation is restricted to the
meeting's valid session tokens.

Meteor will dispatch new redis events on shared notes and closed captions
pads creation. This event will go through apps and reach web to populate
a new meeting's pad collection that contains all valid pad id's for that
session. Nginx will use this collection to check if the user's session token
belongs to the pad's authorized users.

Besides these modifications, an extra change will be needed at notes.nginx.
Location /pad/p/ needs to change it's auth_request:

from /bigbluebutton/connection/checkAuthorization;
to /bigbluebutton/connection/validatePad;
 2021-02-10 13:37:04 -03:00
Anton Georgiev
363c801338
Merge pull request #11215 from pedrobmarin/guest-draft 
Disable authenticated guests
 2021-02-05 16:13:46 -05:00
Anton Georgiev
4459b11f78
Merge pull request #8907 from lkiesow/8900-dollar-in-room-name 
Fix Special Characters in Room Names
 2021-02-03 16:40:59 -05:00
Anton Georgiev
09e6ba8dfd Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-Jan30 2021-01-29 20:58:05 +00:00
Pedro Beschorner Marin
7e26e78c4f Cleanup from authenticated guests removal 
While cherry-picking some of this work I noticed those extras.
 2021-01-23 22:22:52 -03:00
Pedro Beschorner Marin
0bbef12ac7 Authenticated guests feature controlled at bbb-web properties 2021-01-23 21:48:02 -03:00
Pedro Beschorner Marin
ca7e3baf0f Check if stream already exists before adding in list 2021-01-08 13:48:36 -03:00
Anton Georgiev
55fe528e35 Change bigbluebutton.properties client url param 2020-12-16 15:49:20 +00:00
Anton Georgiev
8b65f9e15b Set bbb-html5 loadbalancing to be round robin 2020-12-15 01:55:57 +00:00
Anton Georgiev
0be8773e4c Loadbalance bbb-html5 in bbb-web based on CPU 2020-12-11 21:36:06 +00:00
Anton Georgiev
418fdb1a31 remove obsolete attendeesJoinViaHTML5Client moderatorsJoinViaHTML5Client 2020-12-09 19:11:50 +00:00
basisbit
34ad640ea7 Fix voice bridge compare 
Cherry-picked https://github.com/bigbluebutton/bigbluebutton/pull/9855

Co-Authored-By: Pedro Beschorner Marin <pedrobmarin@gmail.com>
 2020-12-09 14:55:47 +01:00
basisbit
7ba6bd9f7a Fix voiceBridge collision 
Cherry-picked the commits from https://github.com/bigbluebutton/bigbluebutton/pull/9251
The added code checks if a meetingID is unique and makes sure no two meetings use the same VoiceBridge. Also see Issue # 9024
 2020-12-09 13:58:26 +01:00
Anton Georgiev
3faabd1821 Merge 2.2.29 and 2.2.30 into 2.3.x 2020-11-24 15:13:09 +00: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
0c7ead1916 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into oct16-merge 2020-10-21 14:48:02 +00:00
Tiago D J
db413c59e9
Update OfficeToPdfConversionService.java 2020-10-08 18:13:55 -03:00
Pedro Beschorner Marin
2fb26ff0cf Patch of improvements for bbb-web 
This patch includes two improvements made for bbb-web. It tries to better isolate
the sessionToken's handling and session's validation, including logs for each one of
these steps; and removes maxParticipats control from registered users (that are no
longer removed from bbb-web collections) binding it to joined users or users that
reached the enter API call. The following adds more details about this last one:

User's regular flow to join a meeting goes around an API join call -> redis register event ->
redirect to client page -> API enter call -> redis join event. When the guest policy is ASK_MODERATOR,
non-moderators are registered and redirected to a guest lobby that polls for her/his guest status and
only enters the meeting after a moderator approval.
Using registered users as control to check how many participants are in a meeting is problematic because
non-approved guests are counted as participants and bbb-web has to find out when to ditch registered users
records to make a seat in a meeting available again. In other words, a meeting with maxParicipants
of 5 can get it's joins locked with a moderator and 4 waiting guests or bbb-web can wrongly drop a registered
user record on a reconnection inducing weird 401 responses from the API.

This change proposes to control maxParticipants both at join and enter API calls monitoring the number
of redis joined users. This also includes an extra buffer to capture users that called the enter API but
still don't have an user joined event.
User left events are now handled different holding the user data before removing from the joined users collection
and only releasing after verifying that the user didn't reconnected.

Both user left timeout `usersTimeout` and entered user timeout `enteredUsersTimeout` can be configured at properties.
 2020-09-28 09:59:52 -03:00
Anton Georgiev
d5450af5df
Merge pull request #10458 from pedrobmarin/avatar-image 
Support for avatar images
 2020-09-21 08:22:04 -04:00
Anton Georgiev
f2c307932f Remove maxInactivity added in merge from 2.2.24 2020-09-18 18:12:42 +00:00
Anton Georgiev
377dc27a8d Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 09-16-merge 2020-09-17 14:37:28 +00:00
Pedro Beschorner Marin
e2adf24546 Support for avatar images 
Use the former Flash client avatarURL join param to replace the name
initials avatar from the user list, chat, waiting guests and connection
status list.

It is possible to define a defaultAvatarURL at bbb-web and enable/disable it
 2020-09-15 16:50:10 -03:00
Richard Alam
9e6a40280e - set html5 as default client 
- add meetingEndedURL and endWhenNoModerator create param
 - meetingEndedURL is complete
 - endWhenNoModerator is partially implemented. Will be continued in another PR.
 2020-09-05 08:43:12 -07:00
Anton Georgiev
14f464087f
Merge pull request #8417 from pedrobmarin/backend-cleanup 
Backend cleanup
 2020-08-28 15:37:00 -04:00
Anton Georgiev
5be5aed1d9 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12 2020-08-12 17:12:58 +00:00
Tiago Jacobs
153c59307d Improvements on bbb-libreoffice 2020-07-24 02:42:51 -03:00
Pedro Beschorner Marin
49236ac3d0 Avoid wrongly naming a thumbnail as thumb-1 2020-07-13 19:58:02 -03:00
Fred Dixon
22f88bf8d0
Merge pull request #9977 from tdjac0bs/bbb_libreoffice_container 
Detach libreoffice from bbb-web ( running as a docker container )
 2020-07-02 16:07:58 -04:00
Joao Siebel
9981b021ef Merge remote-tracking branch 'upstream/develop' into merge-2.2 2020-06-22 09:00:43 -03:00
Pedro Beschorner Marin
de40885768 Define API's voice bridge error 2020-06-16 17:01:57 -03:00
Joao Siebel
3e95ed0e4b Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2 2020-06-16 16:40:56 -03:00
Pedro Beschorner Marin
d8183b3abd Fix string compare 2020-06-16 16:28:27 -03:00
Tobias Gall
00aec57ca0 Fix missing leading zeros in conference number 
Rewrite is to use only string manipulation as converting to Int removes leading zeros.

fixes #9769
 2020-06-08 11:34:43 +02:00
Tiago Jacobs
d7ab880bcc Use external pool of soffice processes 2020-06-04 01:47:00 -03:00
Fred Dixon
0475d4c3b3
Merge pull request #9595 from miztaka/catalyst-fix-xml-injection 
Fix XML(Formula) Injection
 2020-06-02 10:24:00 -04:00
Anton Georgiev
56e16d79a3
Merge pull request #9251 from elor/fix-voicebridge-collision 
Fix voiceBridge collision (Issue #9024)
 2020-05-28 16:17:59 -04:00
Anton Georgiev
d1924c5bb2
Revert "Fix calcGuestStatus" 2020-05-26 09:28:00 -04:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
Richard Alam
6943fef65c Format conference num 
- separate conf num with space instead of dash

 Initial work on more flexible formatting is being done in
  https://github.com/ritzalam/bigbluebutton/tree/format-voice-conf-number

 This just addresses complaints on mailing list that separating using '-'
 is confusing.
 2020-05-21 05:01:21 -07:00
Mitsutaka Sato
e5349d9b27 Fix XML(Formula) Injection 2020-05-19 08:56:00 +12:00
Lars Kiesow
1849b4c1c8
Fix Special Characters in Room Names 
This patch fixes the issue that regexp special characters like `$` in a
room name cause an error when trying to enter the room.

This fixes #8900
This fixes #4671
 2020-05-18 02:57:56 +02:00
Anton Georgiev
b70ee28a31
Merge pull request #9189 from miztaka/catalyst-fix-calcGuestStatus 
Fix calcGuestStatus
 2020-05-06 09:11:46 -04:00
Anton Georgiev
cc79c4b6ae merge 2.2.10 into 2.3 2020-05-05 19:52:44 +00:00
Richard Alam
5cde97b139 Reweork file upload and download 
- fix filename regex
 - create download flag when uploading file with that can be downloaded
 2020-05-02 04:51:32 -07:00
Richard Alam
f876ce01c2 Rework presentation download and upload 
- verify presentation and meeting id formats
 - construct presentation file path making sure that they are valid
 - add "downloadable" flag to check if presentation can be downloaded or not
 - collect presentation upload errors so we can send to the client in the future
 2020-05-01 14:16:42 -07:00
Ghazi Triki
481afb514d Check path for file to download. 2020-04-30 15:44:08 +01:00
Ghazi Triki
84ba925014 Improve the file download in the browser. 2020-04-30 15:41:06 +01:00
Richard Alam
0877d8379a Format conference numbers 
- add dashes to conference numbers so it is easier to read
 2020-04-28 18:27:54 -07:00
Ghazi Triki
b21ca8355a Return 404 error when the file download is not allowed. 2020-04-25 19:51:17 +03:00
Erik E. Lorenz
535016dddc Don't create duplicate telvoice/webvoice meetings 2020-04-24 17:29:26 +02:00
Erik E. Lorenz
69164169a8 Add telVoice query functions to MeetingService 
* getNotEndedMeetingWithTelVoice()
* getNotEndedMeetingWithWebVoice()
 2020-04-24 17:25:51 +02:00
Mitsutaka Sato
b256b55c3e Fix calcGuestStatus 2020-04-22 15:10:42 +12:00
Ghazi Triki
78c649650e Strip HTML tags from name and fullName API params. 2020-04-03 20:00:33 +03:00
Anton Georgiev
8129468300 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merging 2020-03-04 23:36:21 +00:00
Richard Alam
4f453c4026 - add option to skip office pre-check 2020-03-02 09:40:01 -08:00
Richard Alam
92970a612d - downscale large pages 2020-03-01 08:22:43 -08:00
Richard Alam
f8437fb19d Merge branch 'v2.2.x-release' of https://github.com/bigbluebutton/bigbluebutton into pres-url-on-page-convert 2020-03-01 05:38:04 -08:00
Anton Georgiev
3754d0ab6f Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-master-feb-28-2020 2020-02-28 17:47:06 -05:00
Richard Alam
c0372e3a97 Merge branch 'blank-presentation' of https://github.com/riadvice/bigbluebutton into riadvice-blank-presentation 2020-02-28 13:32:02 -08:00
Ghazi Triki
64d08d69c7 Updated java projects dependencies versions. 2020-02-28 10:44:28 +01:00
Richard Alam
eb48875f7e - remove unused file 2020-02-27 13:40:57 -08:00
Richard Alam
859c6a2220 - clean up 
- addjust timeouts
 2020-02-27 13:37:42 -08:00
Richard Alam
518fb12341 - send end completion for image presentation 2020-02-26 14:46:58 -08:00
Richard Alam
5428e86448 - try to process multiple presentations in parallel 2020-02-26 14:36:04 -08:00
Richard Alam
70b93bdcc8 - cleanup 2020-02-26 08:13:03 -08:00
Richard Alam
fb222e0a7f - include page extraction into conversion step 2020-02-25 14:58:34 -08:00
Richard Alam
f4a4b8be5d - downscale large pdf page 2020-02-25 14:18:56 -08:00
Richard Alam
bba17c3a03 - handle pages on page converted messages instead on conversion completed message 2020-02-24 15:00:20 -08:00
Richard Alam
f521f97382 - explode pdf so we can process each page 2020-02-22 09:33:32 -08:00
Ghazi Triki
0c96050fde Improvements to conversion default fall-back files and process. 2020-02-22 18:26:50 +01:00
Richard Alam
ddb8f53852 - run conversion in a completion service 2020-02-21 12:57:40 -08:00
Richard Alam
0c9c9878c8 - figure out filename when converting one pdf page to png 2020-02-20 15:12:32 -08:00
Richard Alam
3864fef3ea - generate proper png and thumb filenames 2020-02-20 13:42:37 -08:00
Richard Alam
7099df132d - handle new messages in akka apps 2020-02-19 15:04:19 -08:00
Richard Alam
96cdf30af7 - do proper page conversion steps 2020-02-19 12:29:01 -08:00
Richard Alam
db4dc4aff0 - add urls on presentation page conversion message 2020-02-18 14:03:08 -08:00
Richard Alam
45f8def0ca - send message when office to pdf conversion failed 2020-02-15 09:13:45 -08:00
Anton Georgiev
4b0452d1fd Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb14-merge-2.2-into-master 2020-02-14 21:43:35 +00:00
Tiago D J
e23db63992
Update PresentationUrlDownloadService.java 2020-02-08 01:24:29 -03:00
Richard Alam
4fc677a0b4 Breakout rooms shouldn't call the end meeting callback url 
- add check if the meeting that ended isn't a breakout room and if there is an end-meeting-callback-url.
 2020-02-06 14:50:25 -08:00
Pedro Beschorner Marin
397041efcc Removes waiting guests that stop polling for their status 2020-01-15 12:03:52 -03:00
Pedro Beschorner Marin
b11113c165 Remove meeting inactivity monitor 2019-12-11 17:11:57 -03:00
Anton Georgiev
b3a37d42f7
Merge pull request #8375 from ritzalam/fix-handling-of-redirect-for-callback-2.2-beta-17-based 
- since the endcallbackurl is passed as meta parameter, we expect it…
 2019-11-28 16:39:25 -05:00
Ghazi Triki
cd944d4770 Add missing PdfConversionInvalidErrorEvtMsg event to be sent to the web client. 2019-10-21 13:33:40 +01:00
Ghazi Triki
ba109530ae Disallow converting PDF files that have at least one big weighted page. 2019-10-16 08:37:03 +01:00
Chad Pilkey
027c28c320 add lock setting option to hide viewers from each other 2019-08-09 16:45:26 -07:00
Richard Alam
f434cc34a2 - since the endcallbackurl is passed as meta parameter, we expect it to be a working 
url and not a redirect.
 2019-07-19 07:59:31 -07:00
Ghazi Triki
2f571eab10 Display SVG conversion progress. 2019-06-17 18:49:25 +03:00
Richard Alam
19caf3a386 Merge branch 'fix-recording-swf-disabled' of https://github.com/riadvice/bigbluebutton into riadvice-fix-recording-swf-disabled 2019-06-07 09:14:11 -07:00
Richard Alam
5d9f72ae21 - add single use token to request for the text track 2019-06-06 14:54:31 -07:00
Richard Alam
a8b6717c94 - put captions into temporary file to remove race condition between start of processing and writing contents of file. 2019-06-06 10:03:54 -07:00
Richard Alam
7577bf5310 - check if lang param is valid 2019-06-06 07:21:54 -07:00
Richard Alam
c92bfbb591 - deploy recording scripts in proper location 
- log upload captions params
 2019-06-04 14:07:10 -04:00
Richard Alam
7fdb920aad - change field names to match json keys 2019-06-03 13:18:27 -07:00
Richard Alam
08f0c2b4e7 - make changes to align closer to spec document 2019-06-03 11:59:20 -07:00
Richard Alam
9d416ee473 Merge branch 'text-tracks' of https://github.com/riadvice/bigbluebutton into riadvice-text-tracks 2019-05-30 12:30:07 -07:00
Ghazi Triki
ddb02f57e7 Validate recordID in putRecordingTextTrack. 2019-05-22 16:18:57 +03:00
Richard Alam
2e3350cc5c
Revert "Create API returns now returns error when no passwords provided for meeting" 2019-05-20 16:39:45 -04:00
Richard Alam
72d559f4ff - when a bad endcallbackurl is sent and causes exception, we are not handling 
it properly that results in the meeting not being removed from the running
   meeting list
 2019-05-16 14:21:04 -07:00
Ghazi Triki
deae4bc831 Fix svgImagesRequired, generatePngs and swfSlidesRequired flags. 2019-05-15 18:50:28 +01:00
Ghazi Triki
7c5727750f Merge remote-tracking branch 'bigbluebutton/master' into text-tracks 2019-05-13 14:46:20 +01:00
Ghazi Triki
dbd86eb096 Code improve. 2019-05-10 15:51:05 +01:00
Fred Dixon
056ef6ee8c
Merge pull request #7327 from ritzalam/add-redis-password-on-master 
Add redis password on master
 2019-05-09 16:35:42 -04:00
Fred Dixon
b2dc8bd4c6
Merge pull request #7384 from riadvice/mandatory-api-passwords 
Create API returns an error when no password parameter is provided
 2019-05-09 06:28:35 -04:00
Pedro Beschorner Marin
9867aa6b78 Shared notes lock settings first commit 2019-05-08 20:36:36 +00:00
Ghazi Triki
8892389234 Create API returns an error when no password parameter is provided. 2019-05-08 17:35:00 +01:00
Ghazi Triki
17a3af0487 Write playback caption files from the captions file generated for API. 2019-05-07 18:13:09 +01:00
Ghazi Triki
a7c3dd8e80 Fix typo and caption files URL in RecordingMetaXmlHelper.scala 2019-05-07 14:11:50 +01:00
Richard Alam
52964f9e6b - put allow duplicate external userids behind a flag so we can enable/disable 2019-05-03 09:15:14 -07:00
Pedro Beschorner Marin
a0590c12ea Merge remote-tracking branch 'origin/master' into set-lock-settings-on-meeting-create 2019-05-02 11:05:34 -03:00
Ghazi Triki
eef047d4e3 Implement getRecordingTextTracks. 2019-05-01 16:14:10 +01:00
Richard Alam
e3a68f9a97 - cleanup 2019-04-30 13:10:51 -07:00
Pedro Beschorner Marin
324681d5b2 Renamed unmuteUsers to allowModsToUnmuteUsers 2019-04-23 12:30:55 -03:00
Ghazi Triki
cd3edb4491 Read generated caption files description using getRecordingTextTracks API. 2019-04-22 20:30:00 +01:00
Pedro Beschorner Marin
50afb24653 Changed from unmute only viewers to unmute anyone 2019-04-17 10:55:01 -03:00
Pedro Beschorner Marin
87435c515c Merge remote-tracking branch 'master' into set-lock-settings-on-meeting-create 2019-04-12 13:58:58 -03:00
Pedro Beschorner Marin
5f011f2e2e Included unmuteViewers param on create 2019-04-10 17:55:24 -03:00
Richard Alam
b50c22f445 - propagate privateChatEnabled value from parent meeting to breakout room 2019-04-10 13:53:03 -07:00
Richard Alam
f6c0d21fda - pass breakout and lock setting using create meeting message 2019-04-09 14:33:08 -07:00
Richard Alam
a33271bc09 - make akka-apps and bbb-web work with redis password 2019-04-04 14:38:53 -07:00
Richard Alam
f2098bc376 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into ritzalam-add-redis-password-on-v2.2-dev 2019-04-02 10:43:46 -07:00
Richard Alam
0f93ce4a38 - store the client url instead of joinviahtml5 info into user session. That 
way we can preserve the client url form the join and don't have to recreate
   in the guestWaitHandler
 2019-03-28 13:46:53 -07:00
Richard Alam
0d217447eb - check if guest user waiting for mod approval is joining via html5 2019-03-28 11:24:02 -07:00
Richard Alam
6774062ca2 - do not make moderators wait no matter what the guest policy is 2019-03-28 10:35:41 -07:00
Richard Alam
790c9f9629 - fix formatting using scalariform 2019-03-28 07:34:46 -07:00
Richard Alam
09a5a09c67 Merge branch 'master' into set-lock-settings-on-meeting-create 2019-03-28 07:10:52 -07:00
Richard Alam
81d7c117f7 - enable scalariform for bbb-common-web 2019-03-27 13:36:34 -07:00
Richard Alam
e9fa7d5d49 - a little bit of formatting and comment. 2019-03-27 08:20:54 -07:00
Richard Alam
3b4a10ebd5 - do not override settings from config.xml unless an override param is passed on create api call 2019-03-27 08:15:01 -07:00
Richard Alam
a63f7dccc3 - allow passing of breakout and lock settings params on create API 2019-03-26 10:57:50 -07:00
Ghazi Triki
48ca58ea3e Fix API variables formatting for meeting endTime and duration. 2019-03-25 13:41:14 +01:00
Richard Alam
42982482d8 - fix typo 2019-03-16 08:54:06 -07:00
Richard Alam
b41d25d847 Merge branch 'bbb-conf-clean' of https://github.com/riadvice/bigbluebutton into riadvice-bbb-conf-clean 2019-03-16 08:07:36 -07:00
Ghazi Triki
5a60f62b41 Copy dial number from the parent room to all breakout rooms. 2019-03-11 22:33:34 +01:00
Ghazi Triki
094ecd0e9f Generate text files in all cases. 2019-03-06 19:21:49 +01:00
Ghazi Triki
5482fa07f9 Added a new flag to switch SWF files conversion on and off. 2019-03-06 19:07:28 +01:00
Ghazi Triki
2412c94a9c Generate temporary files names using UUID instead of relying on the original file name. 2019-03-06 15:16:18 +01:00
Chad Pilkey
9a07f0abd2 fixed mapping of inactivity values 2019-02-25 12:48:46 -08:00
Richard Alam
0120a7a114
Merge pull request #6750 from ritzalam/retry-callbacks 
- retry end meeting callback in 30ms, 1min, 2min, and 5min if failing
 2019-02-10 21:38:56 -05:00
Richard Alam
bd3fb3f9f7 - retry end meeting callback in 30ms, 1min, 2min, and 5min if failing 2019-02-10 10:37:01 -08:00
Richard Alam
7185eae79b - make easy to collect data from logs 2019-02-09 19:09:32 -08:00
Richard Alam
733923de99 Merge branch 'akka-transcode-update' of https://github.com/riadvice/bigbluebutton into riadvice-akka-transcode-update 2019-02-09 09:04:04 -08:00
Richard Alam
3e286f1ed6
Merge pull request #6473 from zhu/patch-3 
Fix convert jpg with orientation metadata
 2019-02-09 12:03:03 -05:00
Pedro Beschorner Marin
a8237d8827 Fixed typo 2019-02-06 09:38:14 -02:00
Pedro Beschorner Marin
b5427737d7 Includes a minimal authentication step before SFU connections 2019-02-06 09:37:05 -02:00
Richard Alam
b84b5d8552 Merge branch 'grails-gradle-update' of https://github.com/riadvice/bigbluebutton into riadvice-grails-gradle-update 2019-01-25 08:06:46 -08:00
Fred Dixon
566b245e3c
Merge pull request #6385 from pedrobmarin/keep-meeting-events 
Created property keepEvents at bbb-web to make redis record the event…
 2019-01-24 21:47:50 -05:00
Pedro Beschorner Marin
5ecfbce82a
Information about the ended tag creation order 2019-01-24 19:13:22 -02:00
Ghazi Triki
cbcf9315a0 Improved response handling in ApiControllerSpec and added unit test for join. 2019-01-22 11:50:33 +01:00