BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,723 Commits 13 Branches 260 Tags 1.1 GiB
8c29a6568f
Commit Graph

1404 Commits

Author SHA1 Message Date
Aron Engineer
e5903ccfdd feat:Meeting analytics web api endpoint added to expose meeting info 2021-04-08 19:19:22 +00: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
Aron Engineer
35909a4cba fix: Null value replaced with other relevant placeholder values for analytics logging. 2021-04-05 20:55:55 +00:00
Aron Engineer
c7563765c6 fix: Analytics logging value Meeting Recorded corrected, common messages change 2021-04-05 18:43:39 +00:00
Aron Engineer
66b320c26a fix: extra lines removed from updateWebcamStream 2021-04-01 18:12:36 +00:00
Aron Engineer
2d740ec2a9 feat: CamStreamSubscribeSysMsg added with handler and update webcam functionality, ScreenStreamSubscribeSysMsg added 2021-04-01 17:35:09 +00:00
Aron Engineer
1a2af980cf fix: literal renamed for readability 2021-03-30 20:28:01 +00:00
Aron Engineer
21ad951f5f feat: TwoWay user params added to MeetingAnalyticsInfo message, Message body modified with correct ref naming 2021-03-30 20:08:41 +00:00
Anton Georgiev
cf6491adc8
Merge branch 'develop' into multiple-choice-poll 2021-03-30 12:49:35 -04:00
Aron Engineer
7c06f3b85e Merge branch 'develop' into analytics_actor_for_meeting_info 2021-03-29 19:50:03 +00:00
Aron Engineer
c3640f2971 fix:Banned user rejoining error code modified with error message 2021-03-29 17:22:55 +00:00
Anton Georgiev
aae72c0547
Merge branch 'develop' into multiple-choice-poll 2021-03-29 11:54:44 -04:00
Aron Engineer
7195a67e4e fix: MeetingInfoAnalyticsMessage WebcamStream modified 2021-03-26 20:29:27 +00:00
Aron Engineer
4c328e980a Merge branch 'develop' into analytics_actor_for_meeting_info 2021-03-24 20:32:22 +00:00
Aron Engineer
fe898bc276 WIP: Meeting actor modified to separate individual params 2021-03-24 20:30:01 +00:00
Aron Engineer
105e1d0166 fix: Option removed from ValidateAuthTokenRespMsg and respective handlers, default eject reason added 2021-03-24 17:42:19 +00:00
Aron Engineer
376dfcc59a Merge branch 'develop' into logout_response_message_modified_reasoncode 2021-03-24 13:15:45 +00:00
Aron Engineer
52d57645c4 fix: ValidateAuthTokenRespMsg reason code added to the message. 2021-03-23 21:13:14 +00:00
Pedro Beschorner Marin
0c4cf0135d Handle pad's events and Meteor's instances 
Since Meteor was split in multiple process and events started to be
filtered by instances, all Etherpad's Redis events were being discarded.

Etherpad has a Redis' publisher plugin that is unaware of BigBlueButton's
existence. All the communication between them is kept simple with minimal
of internal data exchange. The concept of distincts subscribers at Meteor's
side broke part of this simplicity and, now, Etherpad has to know which
instance must receive it's messages. To provide such information I decided
to include Meteor's instance as part of the pad's id. Should look like:

 - [instanceId]padId for the shared notes
 - [instanceId]padId_cc_(locale) for the closed captions

With those changes the pad id generation made at the recording scripts had to
be re-done because there is no instance id available. Pad id is now recorded at
akka-apps and queried while archiving the shared notes.
 2021-03-23 18:03:50 -03:00
Aron Engineer
6d100d2a21 WIP: New params added to MeetingInfoAnalyticsLogMessage 2021-03-23 20:13:40 +00:00
Aron Engineer
f0b7aea734 Merge branch 'develop' into analytics_actor_for_meeting_info 2021-03-23 13:06:15 +00:00
Aron Engineer
f598862149 feat: Presenter added to presentationInfo analytics message 2021-03-19 19:25:08 +00:00
Aron Engineer
af528b26d1 feat: WIP meeting info analytics logging messages computed 2021-03-18 21:43:49 +00:00
Anton Georgiev
b1bbc3fd52
Merge branch 'develop' into multiple-choice-poll 2021-03-17 16:11:49 -04:00
Pedro Beschorner Marin
d90ba5e286 Merge branch '2.3-per-user-wb' into develop 2021-03-16 20:28:39 -03:00
Pedro Beschorner Marin
381c5cb15c Isolated whiteboard access 
Modified the previous implementation of the whiteboard individual access to remove
multiple Collections dependency on this feature. Multi-user whiteboard is now an
array instead of a boolean value and most of the access control can be synchronized
and handled by akka-apps.
 2021-03-16 19:55:25 -03:00
Michael Z
4d3bda1306
Merge branch 'develop' into multiple-choice-poll 2021-03-16 18:38:48 +01:00
Aron Engineer
eb601eef3e fix: create meeting message order precedes group chat message in akka-apps 2021-03-15 22:34:54 +00:00
Michael Zinsmeister
b99bd3be0c Merged upstream develop branch 2021-03-14 22:17:19 +01:00
Anton Georgiev
9f841bd64b
Merge pull request #11622 from prlanzarin/u23-ilgiardino 
[screenshare] Rewrite SFU/Kurento screensharing bridge (+reconnections|audio sharing|QoL, was #11025)
 2021-03-12 05:13:11 -05:00
prlanzarin
7eb91f9273 Merge branch 'u22-screenshare18102020' of https://github.com/prlanzarin/bigbluebutton-1 into u23-ilgiardino 2021-03-11 18:49:14 +00:00
Aron Engineer
625c4962a0 feat: ValidateAuthToken revoked when user is logged out, reason added to response message 2021-03-11 14:32:01 +00:00
Aron Engineer
56a2ff5df8 feat: User modified to add logged out attribute 2021-03-11 14:32:01 +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
Michael Zinsmeister
6ac09c25cf change back application.conf 2021-03-07 15:32:52 +01:00
Michael Zinsmeister
81d5129084 Merge with upstream 2021-03-07 15:28:39 +01:00
Michael Zinsmeister
214b236701 Merge with upstream 2021-03-07 15:12:49 +01: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
Aron Engineer
2c8220a897 fix: HealthActor messages optimized for the timestamp value update 2021-03-05 18:31:31 +00:00
Aron Engineer
284ba1af97 fix: Timeout exception response modified with typesafety. 2021-03-05 17:23:51 +00: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
Aron Engineer
391ce4d83d feat: BasicStatusCheck added for redis db, computation added to HeathActor 2021-03-02 20:49:02 +00:00
Anton Georgiev
abf9ed4063
Merge pull request #11538 from prlanzarin/u22-track1006022021 
Improve permission checks for video, screen sharing and listen only
 2021-03-02 15:46:33 -05:00
Anton Georgiev
eba2d0ab58
Merge pull request #11535 from pedrobmarin/etherpad-patch 
Rework padIds and turn bbb-web pad aware
 2021-03-02 14:48:34 -05:00
Anton Georgiev
879c54981e
Merge pull request #11447 from antobinary/external-video-sync-lucas-amguirado73 
External video events propagated through akka-apps
 2021-03-02 08:53:09 -05:00
Anton Georgiev
550bf6d282
Merge pull request #11525 from gustavotrott/develop 
Adds lastAuthTokenValidatedOn to users
 2021-03-01 13:56:16 -05:00
Anton Georgiev
d20479d7c4
Merge pull request #11493 from aron-2809/bbb-core-http-endpoint-wip 
WIP: Http endpoint added for health check
 2021-02-26 12:44:04 -05:00
Pedro Beschorner Marin
540ce10c24 Recording external video events 2021-02-26 00:59:40 +00:00
Anton Georgiev
aff272cbf3 Merge #7484 into #11447 ExternalVideo recording events 2021-02-25 19:54:22 +00:00
Gustavo Trott
63e00bd7ca Adds lastAuthTokenValidatedOn to users in Akka, send it in ValidateAuthTokenRespMsg pubSub msg, makes Meteor store it as authTokenValidatedTime 2021-02-25 16:52:20 -03:00
Aron Engineer
135f80ba71 WIP: Http endpoint added for health check 2021-02-24 21:23:07 +00:00
Anton Georgiev
af7e158244 Set falllback value of voiceConf.ejectRogueVoiceUsers to true 2021-02-24 13:12:02 -05:00
Anton Georgiev
b8eaf47263
Merge pull request #11454 from schrd/akka-config 
Akka config
 2021-02-23 08:44:00 -05:00
Anton Georgiev
0b6496618c Merge branch 'develop' of github.com:amguirado73/bigbluebutton into external-video-sync-lucas 2021-02-21 11:04:39 +00:00
Daniel Schreiber
5d620e7acd let bbb-apps-akka read an override config file from /etc/bigbluebutton 
This change introduces a config file
`/etc/bigbluebutton/bbb-apps-akka.conf` which reads the default config
from packages and allows operators to keep their own config file changes
across package upgrades. This removes the workaround of copying the
config file to /tmp in preinst and then extracvting API URI and secret
and then in postinst inject it back to the config file in /usr/share

If the config file in /usr does not have the "changeme" secret, then API
URI and secret are extracted and injected to the generated file /etc, so
packages would upgrade in a clean way.

The postrm script removes the config file in /etc if the package is
purged but not if it is just uninstalled.

bbb-install and bbb-conf must reflect this change and replace the API
secret and URL in /etc, not /usr/share
 2021-02-19 13:55:36 +01:00
Anton Georgiev
55e8de4357 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb18-merge 2021-02-18 20:33:19 +00:00
Anton Georgiev
e966d6c7b6
Merge pull request #11366 from MaximKhlobystov/updating-poll-ui 
Updated poll UI: question field and typed responses
 2021-02-18 10:32:33 -05:00
Anton Georgiev
49cdf9faef
Merge pull request #11413 from gustavotrott/develop 
Include registeredOn date in pubSub user creation messages to replace loginTime creation in Meteor
 2021-02-17 16:56:53 -05:00
Gustavo Trott
573bfc107b Remove changes not related to issue 2021-02-17 09:39:36 -03:00
Gustavo Trott
91f4eba678 Replace registeredOn params to Long (timestamp) instead of String (ISO_OFFSET_DATE_TIME) 2021-02-17 09:20:55 -03:00
prlanzarin
866c771792 akka-apps: make ejectRogueVoiceUsers true by default 2021-02-17 08:54:47 -03:00
Anton Georgiev
b2c4244276 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into 2.3-alpha5-with-split-meteor-roles-10349 2021-02-16 19:55:10 +00:00
Gustavo Trott
129a4e4f33 Remove changes not related with registeredOn issue 2021-02-16 15:40:56 -03:00
Gustavo Trott
12e363eb92 Removes loginTime creation from Meteor and use the registeredOn date created on Akka. Makes Akka send the registeredOn date throught PubSub messages: UserRegisteredRespMsg, GuestsWaitingForApprovalEvtMsg and ValidateAuthTokenRespMsg. 2021-02-16 14:46:30 -03:00
Anton Georgiev
f43560d535 Support for backend vs frontend nodejs instances bbb-html5 2021-02-16 03:19:31 +00:00
prlanzarin
8f233b74ee akka-apps: handle dial-in users in voice user ejection 2021-02-12 17:16:32 -03:00
Richard Alam
04a05f0bbe
Merge pull request #11390 from aron-2809/fix-userId-EndMeeting 
fix inserts userId to the EndMeeting function calls.
 2021-02-12 14:58:52 -05:00
prlanzarin
703505c486 akka-apps: extend SysConf in VoiceApp 
To be used with the ejectRogueVoiceUsers config option
 2021-02-12 16:01:44 -03:00
Pedro Beschorner Marin
ba9528ebb1 Option to eject voice users with no matching user 
Reconnects may introduce ghost voice users in a meeting when the client fails to
rejoin but the audio connection remains active.

While fetching for the voice conference user's status, apps can now check if a
voice user has a matching user record. If it doesn't, eject the voice user.
 2021-02-12 15:29:56 -03:00
Aron Engineer
1d8c51e9cf fix inserts userId to the EndMeeting function calls. 2021-02-12 17:45:08 +00:00
prlanzarin
1290838b16 akka-apps: cleanup on the camera/listen/screen permission calls 2021-02-11 19:45:59 -03:00
Richard Alam
71eb8cc664
Merge pull request #11383 from aron-2809/fix-issue-11182 
User role is incorrect after client reconnect.
 2021-02-11 14:53:55 -05:00
Aron Engineer
a49789d50a User role is incorrect after client reconnect. 
fix for issue: https://github.com/bigbluebutton/bigbluebutton/issues/11182
 2021-02-11 18:57:58 +00:00
Anton Georgiev
2061e0ddd2
Merge pull request #11164 from BrentBaccala/preserve-bbb-web-settings 
preserve bbbWebAPI and sharedSecret over upgrades
 2021-02-11 12:50:42 -05:00
Fred Dixon
54ae154759
Merge pull request #11380 from schrd/akka-systemd 
Customize systemd unit files
 2021-02-11 07:36:19 -04:00
Daniel Schreiber
b6777ed9cb Customize Systemd unit files 
Currently there is a mechanism in bbb-config which adds overlay units.
This is not neccesary because sbt allows you to specify your own unit
files.
 2021-02-11 11:16:55 +01:00
prlanzarin
765686714b akka-apps, video: add camera broadcast and subscribe permission check messages 
Used by bbb-webrtc-sfu to enrich its validation on whether a user is allowed to broadcast or subscribe to a camera stream
 2021-02-10 21:55:46 -03:00
prlanzarin
93aa556aba akka-apps, screenshare: add broadcast and subscribe permission check messages 
Used by bbb-webrtc-sfu to enrich its validation on whether a user is allowed to broadcast a screen or subscribe to one
 2021-02-10 19:02:19 -03:00
prlanzarin
c226d9544e akka-apps: add global audio permission check messages 
Used by bbb-webrtc-sfu to enrich its validation on whether a user is allowed to subscribe to the global audio bridge via listen only or not
 2021-02-10 15:00:04 -03: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
Michael Zinsmeister
129681c0d5 Merge remote-tracking branch 'origin/multiple-choice-poll' into multiple-choice-poll 2021-02-09 14:40:50 +01:00
Michael Zinsmeister
f5831d7da7 Revert "backend mutiple choice - config files" 
This reverts commit 7a6c534f
 2021-02-09 14:38:49 +01:00
Maxim Khlobystov
480602a1a6 Using ArrayBuffer instead of Array when creating a new Question 2021-02-09 06:24:23 +00:00
Anton Georgiev
e2e0b78d40 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into split-meteor-roles-on-top-of-2.3-alpha6 2021-02-08 23:39:42 +00:00
Maxim Khlobystov
ff4260dc98 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into updating-poll-ui 2021-02-08 21:41:43 +00:00
Simon Hirtreiter
70fc71cc70 Merge remote-tracking branch 'upstream/develop' into multiple-choice-poll 
# Conflicts:
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Meeting2x.scala
 2021-02-08 17:00:36 +01:00
Michael Zinsmeister
eaa6f0260c Fix poll results and add locale entries 2021-02-08 10:57:39 +01: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
8c0f0fdd52 Split Meteor roles backend-frontend revisit 2021-02-05 17:47:46 +00:00
hiroshisuga
0d63383c2a
Prevent presenter being selected by random viewer selection (#11275) 
Akka-apps filter presenter and moderators from random viewer selection list
 2021-02-04 20:26:04 -05:00
Michael Zinsmeister
7a6c534fef backend mutiple choice - config files 2021-02-04 16:13:21 +01:00
Michael Zinsmeister
462f963d08 backend mutiple choice 2021-02-04 16:13:07 +01: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
werk21
80af96ff76 9101: Survey: New profile yes/no/abstention 2021-01-24 02:22:40 +01:00
Pedro Beschorner Marin
19cbef1fd9 When authenticatedGuests is disabled, guests should be fit for promotion 2021-01-23 21:51:03 -03:00
Pedro Beschorner Marin
0bbef12ac7 Authenticated guests feature controlled at bbb-web properties 2021-01-23 21:48:02 -03:00
Anton Georgiev
45c1ff6e40
Merge pull request #11175 from MaximKhlobystov/select-random-user 
Presenter selecting a random viewer
 2021-01-22 15:31:00 -05:00
Brent Baccala
434b64ed88 packaging for bbb-web: preserve bbbWebAPI and sharedSecret over upgrades 
Trying to get to the point where upgrades can occur without having
to re-run bbb-conf
 2021-01-15 16:35:50 -05:00
hiroshisuga
7f5352e2f9
Update application.conf 2020-12-17 23:13:32 +09:00
Anton Georgiev
8b65f9e15b Set bbb-html5 loadbalancing to be round robin 2020-12-15 01:55:57 +00:00
Anton Georgiev
9239d515a5 dispatch whiteboard events to html5 redis channel only 2020-12-12 01:45:38 +00:00
Anton Georgiev
09ca742e01 cleanup 2020-12-11 23:46:01 +00:00
Anton Georgiev
0be8773e4c Loadbalance bbb-html5 in bbb-web based on CPU 2020-12-11 21:36:06 +00:00
germanocaumo
83fe68db08 Play screenshare audio when present 2020-12-08 20:30:22 +00:00
Anton Georgiev
3faabd1821 Merge 2.2.29 and 2.2.30 into 2.3.x 2020-11-24 15:13:09 +00:00
KDSBrowne
50f85ff2e2 make responders private | add accessors 2020-11-05 19:24:10 +00:00
KDSBrowne
2f46c1fd28 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-user-rand-select 2020-11-02 16:16:29 +00:00
KDSBrowne
d2cb02b3bd prevent users from being able to send more than 1 poll vote 2020-10-28 18:33:09 +00:00
Anton Georgiev
df8b6350c9
Merge pull request #10617 from KDSBrowne/2.3-undo-pencil 
Fix broken undo of consecutive pencil annotations
 2020-10-27 14:59:57 -04:00
KDSBrowne
73f890c9d8 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-updated-polling 2020-10-21 16:05:03 +00: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
KDSBrowne
d74b5af2a9 clear selected user when moderator closes modal | clean up 2020-10-19 14:46:41 +00:00
KDSBrowne
c518263fc9 fix broken undo of consecutive pencil annotations 2020-10-08 14:35:36 +00:00
hiroshisuga
ff47857c18
Update Bezier.java 2020-09-30 22:44:26 +09:00
hiroshisuga
a7c981d124
Update Bezier.java 2020-09-30 09:59:11 +09:00
hiroshisuga
e857d016e0
Update Bezier.java 2020-09-30 09:49:08 +09:00
KDSBrowne
3e8eebdd1b move random viewer selection to akka-apps 2020-09-25 19:41:30 +00:00
Pedro Beschorner Marin
a7e1623619 Option to prevent eject users by permission violation 
PermissionCheck verifies ejectOnViolation before eject an user
 2020-09-22 15:13:15 -03:00
KDSBrowne
d32155cc5f add new poll type | allow typed responses | update UI 2020-09-21 12:07:36 +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
Anton Georgiev
14f464087f
Merge pull request #8417 from pedrobmarin/backend-cleanup 
Backend cleanup
 2020-08-28 15:37:00 -04:00
root
851c2645ea Committer: Antonio Guirado <amguirado73@gmail.com> 
Changes to be committed:
	new file:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/ExternalVideoApp2x.scala
	new file:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/StartExternalVideoPubMsgHdlr.scala
	new file:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/StopExternalVideoPubMsgHdlr.scala
	new file:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/UpdateExternalVideoPubMsgHdlr.scala
	modified:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
	modified:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
	modified:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
	new file:   bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/ExternalVideoMsgs.scala
	new file:   bigbluebutton-html5/imports/api/external-videos/server/eventHandlers.js
	new file:   bigbluebutton-html5/imports/api/external-videos/server/handlers/startExternalVideo.js
	new file:   bigbluebutton-html5/imports/api/external-videos/server/handlers/stopExternalVideo.js
	new file:   bigbluebutton-html5/imports/api/external-videos/server/handlers/updateExternalVideo.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/index.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/methods.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/methods/emitExternalVideoEvent.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js
	new file:   bigbluebutton-html5/imports/api/external-videos/server/streamer.js
	modified:   bigbluebutton-html5/imports/api/meetings/server/handlers/meetingDestruction.js
	modified:   bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js
	modified:   bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
	modified:   bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js
	modified:   bigbluebutton-html5/imports/api/users/server/store/bannedUsers.js
	modified:   bigbluebutton-html5/imports/startup/server/index.js
	modified:   bigbluebutton-html5/imports/startup/server/redis.js
	modified:   bigbluebutton-html5/imports/ui/components/external-video-player/service.js
	modified:   bigbluebutton-html5/private/config/settings.yml
 2020-08-28 12:58:55 +02:00
KDSBrowne
0fdd1dc978 allow start / stop of polls with no presentation 2020-07-20 14:34:46 +00:00
Anton Georgiev
3b843e7c56 Do not ban user who left while in waiting list. Adjusting after merging 2.2. into 2.3 in #9672 2020-05-26 13:55:38 +00: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
Anton Georgiev
b6194f96cb Add log in akka-apps to show whether user was banned or simply ejected 2020-05-22 11:12:19 -04:00
Anton Georgiev
e7917994d5 add banUser field in EjectUserFromMeetingCmdMsgBody 2020-05-22 10:45:28 -04:00
Richard Alam
eb006d470b Ejected users due to permission check cannot rejoin meeting 
- users who are ejected from meeting because of permission check cannot
   rejoin meeting as we mark them as banned. Only users ejected by a
   moderator should be banned. Later on, we should make the moderator
   indicate if the ejected user should be bannd or not.

   see https://github.com/bigbluebutton/bigbluebutton/issues/9608
 2020-05-19 12:41:35 -07:00
basisbit
5ccba7b0fb
akka-bbb-apps only listen on localhost 
attack surface reduction by having akka-bbb-apps only listen on localhost
 2020-05-15 13:42:20 +02:00
Anton Georgiev
c3e1738314 Adjust #8499 for 58fed45754 
Tweaking `RegisteredUsers.remove(u.id, liveMeeting.registeredUsers)`
since we no longer have .remove on RegisteredUsers
 2020-05-06 16:27:47 +00:00
Anton Georgiev
cc79c4b6ae merge 2.2.10 into 2.3 2020-05-05 19:52:44 +00:00
Richard Alam
292f673f5e Do not send disconnect message 
Do not send disconnect message when validate token fails as meteor will disconnect the client itself.
 2020-04-28 19:29:21 -07:00
Richard Alam
309ac30899 - comment out debug printlns 2020-04-24 07:20:42 -07:00
Richard Alam
58fed45754 Do not ban users ejecting self from meeting 
Some users join with multiple browsers. When user is ejecting self from one browser,
 do not eject all sessions for that user and do not prevent them from rejoining.
 2020-04-24 07:14:50 -07:00
Richard Alam
cca49e4546 Keep track of banned dial-in callers 
When a dial-in caller is ejected from the meeting, keep track of the callerid number.
 When the same callerid number rejoins the conference, eject the caller.
 2020-04-23 19:12:16 -07:00
Richard Alam
c40f1727d3 Prevent ejected users from rejoining 
- track ejected user based on external userid. If user rejoins with the same external
   userid, fail the validate token.
 2020-04-21 19:26:09 -07:00
Chad Pilkey
40b18b0662 whiteboard performance improvements 2020-04-08 20:03:56 +00:00
Anton Georgiev
1299abdf2c Revert "Merge pull request #8782 from ritzalam/generate-meeting-data" 
This reverts commit 37ed2c7501, reversing
changes made to 5af41dabb4.
 2020-03-25 16:13:01 -04:00
Richard Alam
3cddd8a1c5 - dump out some meeting stats data into the log 2020-03-14 11:54:45 -07: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
d879710503 - minimize logs 2020-02-28 13:12:53 -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
2fbd2821f4 - fix to display slodes 2020-02-20 12:43:23 -08:00
Richard Alam
7099df132d - handle new messages in akka apps 2020-02-19 15:04:19 -08:00
Richard Alam
db4dc4aff0 - add urls on presentation page conversion message 2020-02-18 14:03:08 -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
Richard Alam
7911d2b874 - client session wasn't set properly 2020-02-06 07:36:42 -08:00
Richard Alam
5af6374265 Track call session state 
Currently, we user DTMF to inform the client when the call session is in echo test and when entering the voice conference.
 Unfortunately, sometimes when FS sends the DTMF, FS crashes.

 Monitor the progress of the call session using ESL events and propagate to the client.

 The client would be informed of these call states: CALL_STARTED, IN_ECHO_TEST, IN_CONFERENCE, CALL_ENDED.
 2020-02-05 14:58:47 -08:00
Pedro Beschorner Marin
397041efcc Removes waiting guests that stop polling for their status 2020-01-15 12:03:52 -03:00
Anton Georgiev
866f359b0e Add handling route for GetRunningMeetingsReqMsg 2020-01-09 15:59:48 +00:00
Pedro Beschorner Marin
13060aef26 Moving CheckRunningAndRecordingVoiceConfEvtMsg outside the messages that affect inactivity handler 2019-12-12 17:46:11 -03:00
Pedro Beschorner Marin
690d34029d Remove Flash shared notes backend 2019-12-11 17:40:56 -03:00
Pedro Beschorner Marin
b11113c165 Remove meeting inactivity monitor 2019-12-11 17:11:57 -03:00
Anton Georgiev
56b1b12431
Merge branch 'master' into v2.2.x-release 2019-12-10 11:07:23 -05:00
Richard Alam
ecc99fa415 - apply lock settings when user is locked. 2019-12-06 14:31:50 -08:00
Richard Alam
e40def72a4 - enforce only mic settings when disabling mic 2019-12-06 13:46:02 -08:00
Richard Alam
bf2f4c536d - apply lock settings to viewers and non-listen only users 2019-12-06 13:11:45 -08:00
Richard Alam
a26d1f0a8f - enforce lock settings 
- make sure listen only users are muted
 2019-12-06 11:50:50 -08:00
Richard Alam
124924735a - if muted user is talking, mute the user 2019-12-06 11:37:20 -08:00
Richard Alam
27d9879c12 - check if listen only user is talking and mute if so 2019-12-06 11:24:38 -08:00
Richard Alam
bcc14792ea - enforce lock settings when user joins voice conf 
- make sure liten only user is muted when they join voice conf
 2019-12-06 11:11:48 -08:00
Richard Alam
ace413b319 - apply disableMic lock settings to viewers and listen only users 2019-12-06 10:33:04 -08:00
Richard Alam
5d7dbee1a6 - return all meeting id of running meetings and allow requesting state for each meeting. 2019-12-03 08:14:51 -08:00
Richard Alam
1f74bd8cf4 - send reply to get meeting request when there are no meeting running 2019-12-03 07:17:51 -08:00
Richard Alam
1f2448c1ea
Merge pull request #8256 from ritzalam/change-audio-recording-codec 
Change audio recording codec
 2019-11-05 16:18:55 -05:00
Richard Alam
613a214817
Default recording codec 
Set the default recording codec to opus since we now have opus support in freeswitch.
 2019-11-05 16:18:19 -05:00
Richard Alam
4c6bdebd00
Merge pull request #8225 from riadvice/big-pdf-conversion 
Detect big PDF files and check the page size
 2019-10-29 16:47:26 -04:00
Richard Alam
0b81cb055b - add flac codec 2019-10-29 08:44:33 -07:00
Richard Alam
bea53ac633 Allow configure of audio recording codec 
- set audio recording codec to ogg so file size will be smaller compared to wav
 2019-10-25 13:13:41 -07:00
Richard Alam
6f29c5307f - set different interval in sending recording and user status audio to freeswitch 2019-10-25 11:26:27 -07:00
Richard Alam
4f62e0ea79 - update last status in one spot 2019-10-24 15:28:16 -07:00
Richard Alam
5d52c15456 - handle voice user status event from FreeSWITCH 2019-10-24 13:36:28 -07:00
Richard Alam
7752808f47 - keep track of last user status update 2019-10-23 14:19:51 -07:00
Richard Alam
0261a5e2b8 - send users and recordings in one message 2019-10-21 14:29:52 -07:00
Richard Alam
1e7557562f Sync FS user status 
- poll FreeSWITCH for status of user so that akka-apps would be in sync with FreeSWITCH
 2019-10-21 11:01:58 -07:00
Ghazi Triki
cd944d4770 Add missing PdfConversionInvalidErrorEvtMsg event to be sent to the web client. 2019-10-21 13:33:40 +01:00
Richard Alam
3395cdbdc0 Make sure we record audio if meeting is recorded 
- We had an issue where FreeSWITCH, for some unknow reason, stopped recording the voice conference
   in the middle of the meeting while there are users in the voice conference. We've relied on the
   voice conf started event to trigger recording of wav files. This event is sent when the first user
   joins the voice conference. In this case, there was no voice user joined after the recording stopped
   as there were already users in the voice conference. TO make sure that the audio is recorded, akka-apps
   will send a "check if voice conf is running and recording" message to FreeSWITCH every 30sec. If akka-apps
   receives a "running=true recording=false" response from FreeSWITCH, akka-apps will send a start recording
   msg to FreeSWITCH.
 2019-10-17 11:50:12 -07:00
Ghazi Triki
ba109530ae Disallow converting PDF files that have at least one big weighted page. 2019-10-16 08:37:03 +01:00
Richard Alam
13d610f798 Stop recording of voice 
- stop recording of voice conference when meeting ends.
 2019-10-01 11:34:41 -07:00
Chad Pilkey
027c28c320 add lock setting option to hide viewers from each other 2019-08-09 16:45:26 -07:00
Richard Alam
db88be858b - fix https://github.com/bigbluebutton/bigbluebutton/issues/7452 2019-05-16 13:55:52 -07: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
Pedro Beschorner Marin
c27f409def Locking shared notes from akka-apps up to the Flash client 2019-05-08 20:36:36 +00: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
Richard Alam
47ea1bed67
Merge pull request #7270 from pedrobmarin/unmute-users 
Unmute users
 2019-05-01 10:52:12 -04:00
Richard Alam
bf7898225b - minor cleanup 2019-04-30 12:30:59 -07:00
Richard Alam
0bd6b214d8 - add redis password to red5 apps 2019-04-29 09:04:16 -07:00
Pedro Beschorner Marin
324681d5b2 Renamed unmuteUsers to allowModsToUnmuteUsers 2019-04-23 12:30:55 -03:00
Richard Alam
1a39ecdc64 Merge branch 'master' into add-redis-password-on-master 2019-04-23 07:36:55 -07:00
Pedro Beschorner Marin
50afb24653 Changed from unmute only viewers to unmute anyone 2019-04-17 10:55:01 -03:00
Richard Alam
7fb5dc6e37 Do not trigger chapter break recording when meeting is set not to be recorded 
When chapterBreakLengthInMinutes > 0 in /usr/share/bbb-apps-akka/conf/application.conf, the
 chapter break is triggered even when the meeting isn't set to be recorded.

 Check if meeting is to be recorded before triggering chapter break.
 2019-04-16 07:27:18 -07: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
Richard Alam
e98c5b0f26 - log whiteboard shape that has null values 
- sanitized pool results
 2019-04-11 15:28:20 -07:00
Richard Alam
dcbeee3d17 - remove null values from whiteboard shapes 2019-04-11 12:57:47 -07: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
Pedro Beschorner Marin
3ac5204141 Filtering only Flash moderators 2019-04-05 14:47:43 +00:00
Pedro Beschorner Marin
9ae8813f47 Sending an extra message for guest management in Meteor 2019-04-05 13:18:24 +00:00
Richard Alam
a33271bc09 - make akka-apps and bbb-web work with redis password 2019-04-04 14:38:53 -07:00
Richard Alam
3aeaf72719 - flag that an authed user joined the meeting 2019-03-28 12:47:52 -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
3f7199c307 - enable scariform for akka-apps 2019-03-27 13:41:16 -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
Richard Alam
9801efb95a - make user inactivitiy audit disabled by default 2019-03-25 12:39:09 -07:00
Richard Alam
547249b475 - set meeting inactivity check to zero as default which disables the check. When set to 
zero, the meeting won't end due to inactivity.
 2019-03-25 10:10:03 -07:00
Fred Dixon
4770ef7144
Merge pull request #6929 from fcecagno/disable-chapter-break 
Disable chapter break by default
 2019-03-20 10:21:31 -04:00
Richard Alam
1e26e8ce29 Merge branch 'track-user-register-join' of https://github.com/ritzalam/bigbluebutton into ritzalam-track-user-register-join 2019-03-16 09:32:55 -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
Chad Pilkey
9cfc792eaf allow unlocked viewers to unmute when meeting is locked 2019-03-13 10:28:43 -07:00
Felipe Cecagno
9ce5c45ee2 fix typo 2019-03-13 12:14:49 -03:00
Ghazi Triki
5a60f62b41 Copy dial number from the parent room to all breakout rooms. 2019-03-11 22:33:34 +01:00
Felipe Cecagno
f67808e9ae set also default recordingChapterBreakLength to zero on SystemConfiguration 2019-03-07 13:49:11 -03:00
Felipe Cecagno
db2bfbe1dd disable chapter break by default 2019-03-07 11:53:44 -03:00
Anton Georgiev
c7647a7254
Merge pull request #6862 from capilkey/2.2-fix-inactivity 
Fixed mapping of inactivity values
 2019-03-05 16:43:26 -05:00
Richard Alam
9ecdff3d81 - track if user joins within a certain period of time. Sometimes, nodejs takes 
most of the CPU that users takes a long time to load the client and join. This
   way, we can detect if there are a number of users failing to join the meeting.
 2019-02-26 20:27:52 -08:00
Chad Pilkey
5a6d067e98 fix private chat for viewers and allow pc with mod 2019-02-25 16:19:41 -08:00
Chad Pilkey
9a07f0abd2 fixed mapping of inactivity values 2019-02-25 12:48:46 -08:00
Anton Georgiev
38b743b895
Merge pull request #6711 from jfsiebel/sync-lock-settings-status 
Sync meeting lock settings status
 2019-02-11 17:34:44 -05: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
Joao Siebel
555ee1232a sync meeting lock settings status and handle GetLockSettingsRespMsg message. close #6669 2019-02-04 14:07:20 -02: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
Ghazi Triki
78f5b2715d Improve akka-bbb-fsesl packaging. 2018-12-14 15:15:19 +01:00
Ghazi Triki
dde9419ca4 Make akka-bbb-apps runnable for developers while keeping the packaging intact. 2018-12-13 22:29:05 +01:00
Pedro Beschorner Marin
dec1fe481d Not overriding record prop 2018-12-13 11:46:20 -02:00
Richard Alam
3f9dc6655a - minimize logging of redis connection 2018-12-11 14:06:09 -08:00
Richard Alam
9a612f7e3d - see if akka-apps package will start logging. 2018-12-11 13:33:07 -08:00
Pedro Beschorner Marin
ebffcb0848 Created property keepEvents at bbb-web to make redis record the events for all meetings 2018-12-11 18:37:31 -02:00
Ghazi Triki
5a9f74c88d Fix akka applications packaging configuration. 2018-12-10 19:10:46 +01:00
Richard Alam
cb0d282451
Merge pull request #6293 from riadvice/redis-refactor 
Refactor redis implementation in server applications
 2018-12-09 10:33:31 -05:00
Ghazi Triki
79d34c42d2 Fix redis storage issues. 2018-12-06 11:53:39 +01:00
Ghazi Triki
fd959f9e14 Remove rediscala library and replace it by a lettuce implementation. 2018-12-05 20:21:06 +01:00
Ghazi Triki
5b8a9a0ace Add password to redis scala classes. 2018-11-23 11:38:28 -02:00
Richard Alam
ff3f8239c8 - end the meeting asap when the last user leaves by setting meetingExpireWhenLastUserLeftInMinutes=0 in 
bbb-web's bigbluebutton.properties
 2018-11-16 10:36:10 -08:00
Richard Alam
d1dad75898 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-master-nov14 2018-11-14 08:47:21 -08:00
Richard Alam
ddc391b3d9 - fix issue where meeting doesn't end when lasr user leaves or when meetign is never joined. 
- the client to server rtt message is always updating the meeting activity. This prevents the meeting
   from ending due to inactivity.
 2018-11-13 13:01:16 -08:00
Ghazi Triki
fc4028d6de Redis refactoring : remove duplicate classes, factorisation and build configuration update. 2018-11-09 20:19:46 +01:00
Ghazi Triki
0614ccd763 Updated akka-bbb-apps project to use sbt 1.2.6 and scala 2.12.7 2018-11-08 14:53:00 +01:00
Ghazi Triki
653fd74440 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
#	bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/TextFileCreatorImp.java
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
#	bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
#	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
#	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/client/compatibility/kurento-extension.js
#	bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2018-11-01 14:00:54 +01:00
Richard Alam
92a2cd0d60 - delay removing user from user's list in case the user is just reconnecting 2018-10-24 12:42:00 -07:00
Richard Alam
eafa3273c5 - flag the user first when receiving user left event in case user is just reconnecting 2018-10-24 07:41:39 -07:00
Richard Alam
cc6f88d020 - my IntelliJ IDE seems to format differently with Ghazi's 
- fix screenshare redis connection error
 - fix bbb-web create meeting exception when second user joins
 2018-09-13 13:08:49 -07:00
Ghazi Triki
83025a9d5e Merge remote-tracking branch 'bigbluebutton/master' into jvm-quality-improve 
# Conflicts:
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
 2018-09-12 18:49:25 +01:00
Richard Alam
cdaf447758
Merge pull request #5975 from riadvice/user-typing-feature 
Implementation of user typing feature to chat
 2018-09-12 13:43:43 -04:00
Richard Alam
5b03e0ef6c
Merge pull request #5581 from riadvice/recording-timer 
Add a new message RecordStatusResetSysMsg to be handled and saved in events.xml
 2018-09-12 12:03:09 -04:00