diff --git a/README.md b/README.md index b6b64a122821..32a91ce3d47c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +**2023/5/7 The latest 2.6.5 source + dev2.6.3_detachable + dev2.6.1_translation + dev2.6.3_stopAutoPlayVideo (with minor conflicts) + dev2.6_genupload_qpoll_qlink** + BigBlueButton ============= BigBlueButton is an open source web conferencing system. diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/FileUploadedSysMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/FileUploadedSysMsgHdlr.scala new file mode 100644 index 000000000000..b95c26c7fa8e --- /dev/null +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/FileUploadedSysMsgHdlr.scala @@ -0,0 +1,36 @@ +package org.bigbluebutton.core.apps.upload + +import org.bigbluebutton.common2.msgs._ +import org.bigbluebutton.core.bus.MessageBus +import org.bigbluebutton.core.running.LiveMeeting + +trait FileUploadedSysMsgHdlr { + this: UploadApp2x => + + def handle( + msg: FileUploadedSysMsg, + liveMeeting: LiveMeeting, + bus: MessageBus + ): Unit = { + + val meetingId = liveMeeting.props.meetingProp.intId + val userId = msg.header.userId + + def broadcastFileUploadedEvtMsg(msg: FileUploadedSysMsg): Unit = { + val uploadId = msg.body.uploadId + val source = msg.body.source + val filename = msg.body.filename + + val routing = Routing.addMsgToClientRouting(MessageTypes.DIRECT, meetingId, userId) + val envelope = BbbCoreEnvelope(FileUploadedEvtMsg.NAME, routing) + val header = BbbClientMsgHeader(FileUploadedEvtMsg.NAME, meetingId, userId) + val body = FileUploadedEvtMsgBody(uploadId, source, filename) + val event = FileUploadedEvtMsg(header, body) + val msgEvent = BbbCommonEnvCoreMsg(envelope, event) + + bus.outGW.send(msgEvent) + } + + broadcastFileUploadedEvtMsg(msg) + } +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/UploadApp2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/UploadApp2x.scala new file mode 100644 index 000000000000..e2c29e2cc1c8 --- /dev/null +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/UploadApp2x.scala @@ -0,0 +1,11 @@ +package org.bigbluebutton.core.apps.upload + +import akka.actor.ActorContext +import akka.event.Logging + +class UploadApp2x(implicit val context: ActorContext) + extends UploadRequestReqMsgHdlr + with FileUploadedSysMsgHdlr { + + val log = Logging(context.system, getClass) +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/UploadRequestReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/UploadRequestReqMsgHdlr.scala new file mode 100644 index 000000000000..ac1494f8bf3f --- /dev/null +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/UploadRequestReqMsgHdlr.scala @@ -0,0 +1,65 @@ +package org.bigbluebutton.core.apps.upload + +import org.bigbluebutton.common2.msgs._ +import org.bigbluebutton.core.bus.MessageBus +import org.bigbluebutton.core.running.LiveMeeting +import org.bigbluebutton.core.apps.{ PermissionCheck, RightsManagementTrait } +import org.bigbluebutton.core.util.RandomStringGenerator + +trait UploadRequestReqMsgHdlr extends RightsManagementTrait { + this: UploadApp2x => + + def handle( + msg: UploadRequestReqMsg, + liveMeeting: LiveMeeting, + bus: MessageBus + ): Unit = { + + val meetingId = liveMeeting.props.meetingProp.intId + val userId = msg.header.userId + val source = msg.body.source + val filename = msg.body.filename + val timestamp = msg.body.timestamp + + // To system + def broadcastUploadRequestSysMsg( + msg: UploadRequestReqMsg, + token: String + ): Unit = { + + val routing = collection.immutable.HashMap("sender" -> "bbb-apps-akka") + val envelope = BbbCoreEnvelope(UploadRequestSysMsg.NAME, routing) + val header = BbbCoreHeaderWithMeetingId(UploadRequestSysMsg.NAME, meetingId) + val body = UploadRequestSysMsgBody(source, filename, userId, token) + val event = UploadRequestSysMsg(header, body) + val msgEvent = BbbCommonEnvCoreMsg(envelope, event) + + bus.outGW.send(msgEvent) + } + + // To client + def broadcastUploadRequestRespMsg( + msg: UploadRequestReqMsg, + success: Boolean = false, + token: String = null + ): Unit = { + + val routing = Routing.addMsgToClientRouting(MessageTypes.DIRECT, meetingId, userId) + val envelope = BbbCoreEnvelope(UploadRequestRespMsg.NAME, routing) + val header = BbbClientMsgHeader(UploadRequestRespMsg.NAME, meetingId, userId) + val body = UploadRequestRespMsgBody(source, filename, userId, success, timestamp, token) + val event = UploadRequestRespMsg(header, body) + val msgEvent = BbbCommonEnvCoreMsg(envelope, event) + + bus.outGW.send(msgEvent) + } + + if (permissionFailed(PermissionCheck.GUEST_LEVEL, PermissionCheck.MOD_LEVEL, liveMeeting.users2x, userId)) { + broadcastUploadRequestRespMsg(msg) + } else { + val token = RandomStringGenerator.randomAlphanumericString(32) + broadcastUploadRequestSysMsg(msg, token) + broadcastUploadRequestRespMsg(msg, true, token) + } + } +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala index 98808f3e900e..aa6128f1bd5b 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala @@ -363,6 +363,12 @@ class ReceivedJsonMsgHandlerActor( case GetScreenshareStatusReqMsg.NAME => routeGenericMsg[GetScreenshareStatusReqMsg](envelope, jsonNode) + // Upload + case UploadRequestReqMsg.NAME => + routeGenericMsg[UploadRequestReqMsg](envelope, jsonNode) + case FileUploadedSysMsg.NAME => + routeGenericMsg[FileUploadedSysMsg](envelope, jsonNode) + // Lock settings case LockUserInMeetingCmdMsg.NAME => routeGenericMsg[LockUserInMeetingCmdMsg](envelope, jsonNode) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/AbstractUploadRecordEvent.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/AbstractUploadRecordEvent.scala new file mode 100644 index 000000000000..122a3e708fe7 --- /dev/null +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/AbstractUploadRecordEvent.scala @@ -0,0 +1,24 @@ +/** + * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ + * + * Copyright (c) 2017 BigBlueButton Inc. and by respective authors (see below). + * + * This program is free software; you can redistribute it and/or modify it under the + * terms of the GNU Lesser General Public License as published by the Free Software + * Foundation; either version 3.0 of the License, or (at your option) any later + * version. + * + * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License along + * with BigBlueButton; if not, see . + * + */ + +package org.bigbluebutton.core.record.events + +trait AbstractUploadRecordEvent extends RecordEvent { + setModule("UPLOAD") +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/FileUploadedRecordEvent.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/FileUploadedRecordEvent.scala new file mode 100644 index 000000000000..7f506a1d67b0 --- /dev/null +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/FileUploadedRecordEvent.scala @@ -0,0 +1,49 @@ +/** + * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ + * + * Copyright (c) 2017 BigBlueButton Inc. and by respective authors (see below). + * + * This program is free software; you can redistribute it and/or modify it under the + * terms of the GNU Lesser General Public License as published by the Free Software + * Foundation; either version 3.0 of the License, or (at your option) any later + * version. + * + * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License along + * with BigBlueButton; if not, see . + * + */ + +package org.bigbluebutton.core.record.events + +class FileUploadedRecordEvent extends AbstractUploadRecordEvent { + import FileUploadedRecordEvent._ + + setEvent("FileUploadedEvent") + + def setUserId(userId: String) { + eventMap.put(USER_ID, userId) + } + + def setUploadId(uploadId: String) { + eventMap.put(UPLOAD_ID, uploadId) + } + + def setSource(source: String) { + eventMap.put(SOURCE, source) + } + + def setFilename(filename: String) { + eventMap.put(FILENAME, filename) + } +} + +object FileUploadedRecordEvent { + protected final val USER_ID = "userId" + protected final val UPLOAD_ID = "uploadId" + protected final val SOURCE = "source" + protected final val FILENAME = "filename" +} diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala index 3a01f2d1454d..89131c21a5a3 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala @@ -6,6 +6,7 @@ import akka.actor.SupervisorStrategy.Resume import org.bigbluebutton.SystemConfiguration import org.bigbluebutton.core.apps.groupchats.GroupChatHdlrs import org.bigbluebutton.core.apps.presentationpod._ +import org.bigbluebutton.core.apps.upload.UploadApp2x import org.bigbluebutton.core.apps.users._ import org.bigbluebutton.core.apps.whiteboard.ClientToServerLatencyTracerMsgHdlr import org.bigbluebutton.core.domain._ @@ -133,6 +134,7 @@ class MeetingActor( val usersApp = new UsersApp(liveMeeting, outGW, eventBus) val groupChatApp = new GroupChatHdlrs val presentationPodsApp = new PresentationPodHdlrs + val uploadApp = new UploadApp2x val pollApp = new PollApp2x val webcamApp2x = new WebcamApp2x val wbApp = new WhiteboardApp2x @@ -538,6 +540,10 @@ class MeetingActor( case m: UpdateCaptionOwnerPubMsg => captionApp2x.handle(m, liveMeeting, msgBus) case m: SendCaptionHistoryReqMsg => captionApp2x.handle(m, liveMeeting, msgBus) + // Upload + case m: UploadRequestReqMsg => uploadApp.handle(m, liveMeeting, msgBus) + case m: FileUploadedSysMsg => uploadApp.handle(m, liveMeeting, msgBus) + // Guests case m: GetGuestsWaitingApprovalReqMsg => handleGetGuestsWaitingApprovalReqMsg(m) case m: SetGuestPolicyCmdMsg => handleSetGuestPolicyMsg(m) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala index 594919973885..1b846c37763c 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala @@ -159,6 +159,11 @@ class AnalyticsActor(val includeChat: Boolean) extends Actor with ActorLogging { case m: SetPrivateGuestLobbyMessageCmdMsg => logMessage(msg) case m: PrivateGuestLobbyMsgChangedEvtMsg => logMessage(msg) + // Upload + case m: UploadRequestReqMsg => logMessage(msg) + case m: UploadRequestRespMsg => logMessage(msg) + case m: FileUploadedEvtMsg => logMessage(msg) + // System case m: ClientToServerLatencyTracerMsg => traceMessage(msg) case m: ServerToClientLatencyTracerMsg => traceMessage(msg) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala index e634a89007b4..c6abb09e926c 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala @@ -121,6 +121,9 @@ class RedisRecorderActor( case m: MeetingEndingEvtMsg => handleEndAndKickAllSysMsg(m) case m: MeetingCreatedEvtMsg => handleStarterConfigurations(m) + // Upload + case m: FileUploadedEvtMsg => handleFileUploadedEvtMsg(m) + // Recording case m: RecordingChapterBreakSysMsg => handleRecordingChapterBreakSysMsg(m) @@ -579,6 +582,16 @@ class RedisRecorderActor( record(msg.header.meetingId, ev.toMap.asJava) } + private def handleFileUploadedEvtMsg(msg: FileUploadedEvtMsg): Unit = { + val ev = new FileUploadedRecordEvent() + ev.setUserId(msg.header.userId) + ev.setUploadId(msg.body.uploadId) + ev.setSource(msg.body.source) + ev.setFilename(msg.body.filename) + + record(msg.header.meetingId, ev.toMap.asJava) + } + private def handleRecordingChapterBreakSysMsg(msg: RecordingChapterBreakSysMsg): Unit = { val ev = new RecordChapterBreakRecordEvent() ev.setMeetingId(msg.header.meetingId) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/UploadMsgs.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/UploadMsgs.scala new file mode 100644 index 000000000000..5c973f1e8a58 --- /dev/null +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/UploadMsgs.scala @@ -0,0 +1,25 @@ +package org.bigbluebutton.common2.msgs + +// client to akka-apps +object UploadRequestReqMsg { val NAME = "UploadRequestReqMsg" } +case class UploadRequestReqMsg(header: BbbClientMsgHeader, body: UploadRequestReqMsgBody) extends StandardMsg +case class UploadRequestReqMsgBody(source: String, filename: String, timestamp: Long) + +// akka-apps to client +object UploadRequestRespMsg { val NAME = "UploadRequestRespMsg" } +case class UploadRequestRespMsg(header: BbbClientMsgHeader, body: UploadRequestRespMsgBody) extends StandardMsg +case class UploadRequestRespMsgBody(source: String, filename: String, userId: String, success: Boolean, timestamp: Long, token: String = null) + +object FileUploadedEvtMsg { val NAME = "FileUploadedEvtMsg" } +case class FileUploadedEvtMsg(header: BbbClientMsgHeader, body: FileUploadedEvtMsgBody) extends StandardMsg +case class FileUploadedEvtMsgBody(uploadId: String, source: String, filename: String) + +// akka-apps to bbb-web +object UploadRequestSysMsg { val NAME = "UploadRequestSysMsg" } +case class UploadRequestSysMsg(header: BbbCoreHeaderWithMeetingId, body: UploadRequestSysMsgBody) extends BbbCoreMsg +case class UploadRequestSysMsgBody(source: String, filename: String, userId: String, token: String) + +// bbb-web to akka-apps +object FileUploadedSysMsg { val NAME = "FileUploadedSysMsg" } +case class FileUploadedSysMsg(header: BbbClientMsgHeader, body: FileUploadedSysMsgBody) extends StandardMsg +case class FileUploadedSysMsgBody(uploadId: String, source: String, filename: String, contentType: String) diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java index bf918aa9493b..247ff1156188 100755 --- a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java +++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java @@ -38,6 +38,7 @@ import org.bigbluebutton.api.domain.RegisteredUser; import org.bigbluebutton.api.domain.User; import org.bigbluebutton.api.domain.UserSession; +import org.bigbluebutton.api.domain.UploadedFile; import org.bigbluebutton.api.messaging.MessageListener; import org.bigbluebutton.api.messaging.converters.messages.DestroyMeetingMessage; import org.bigbluebutton.api.messaging.converters.messages.EndMeetingMessage; @@ -272,6 +273,33 @@ private void kickOffProcessingOfRecording(Meeting m) { } } + public Boolean isUploadRequestValid(String meetingId, String source, String filename, String userId, String token) { + Meeting m = getMeeting(meetingId); + if (m != null) { + return m.isUploadRequestValid(source, filename, userId, token); + } else { + return false; + } + } + + public Boolean isDownloadRequestValid(String meetingId, String source, String uploadId) { + Meeting m = getMeeting(meetingId); + if (m != null) { + return m.hasUploadedFile(source, uploadId); + } else { + return false; + } + } + + public UploadedFile getUploadedFile(String meetingId, String uploadId) { + Meeting m = getMeeting(meetingId); + if (m != null) { + return m.getUploadedFile(uploadId); + } else { + return null; + } + } + public Boolean authzTokenIsValid(String authzToken) { // Note we DO NOT expire the token return uploadAuthzTokens.containsKey(authzToken); } @@ -617,6 +645,22 @@ public void processRecording(Meeting m) { } } + public void fileUploaded( + String uploadId, + String source, + String filename, + String contentType, + String extension, + String userId, + String meetingId + ) { + Meeting m = getMeeting(meetingId); + if (m != null) { + m.addUploadedFile(source, filename, contentType, extension, uploadId); + gw.fileUploaded(uploadId, source, filename, contentType, userId, meetingId); + } + } + public void endMeeting(String meetingId) { handle(new EndMeeting(meetingId)); } @@ -734,6 +778,13 @@ private void processGuestStatusChangedEventMsg(GuestStatusChangedEventMsg messag } + private void processUploadRequest(UploadRequest message) { + Meeting m = getMeeting(message.meetingId); + if (m != null) { + m.addUploadRequest(message.source, message.filename, message.userId, message.token); + } + } + private void processPresentationUploadToken(PresentationUploadToken message) { uploadAuthzTokens.put(message.authzToken, message); } @@ -1157,6 +1208,8 @@ public void run() { processRegisterUser((RegisterUser) message); } else if (message instanceof CreateBreakoutRoom) { processCreateBreakoutRoom((CreateBreakoutRoom) message); + } else if (message instanceof UploadRequest) { + processUploadRequest((UploadRequest) message); } else if (message instanceof PresentationUploadToken) { processPresentationUploadToken((PresentationUploadToken) message); } else if (message instanceof PositionInWaitingQueueUpdated) { diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java index 10668b4329f0..d7104a0923c2 100755 --- a/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java +++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java @@ -128,6 +128,8 @@ public class ParamsProcessorUtil { private boolean defaultLockSettingsHideViewersCursor; private Long maxPresentationFileUpload = 30000000L; // 30MB + private Long maxUploadSize = 900000000L; // 900MB - but probably doesn't matter + private String uploadDir; private Integer clientLogoutTimerInMinutes = 0; private Integer defaultMeetingExpireIfNoUserJoinedInMinutes = 5; @@ -1331,6 +1333,22 @@ public void setMaxPresentationFileUpload(Long maxFileSize) { public Long getMaxPresentationFileUpload() { return maxPresentationFileUpload; } + + public void setMaxUploadSize(Long maxUploadSize) { + this.maxUploadSize = maxUploadSize; + } + + public Long getMaxUploadSize() { + return maxUploadSize; + } + + public void setUploadDir(String uploadDir) { + this.uploadDir = uploadDir; + } + + public String getUploadDir() { + return uploadDir; + } public void setMuteOnStart(Boolean mute) { defaultMuteOnStart = mute; diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/Util.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/Util.java index c76d0b8d1bd5..311a6860d42a 100755 --- a/bbb-common-web/src/main/java/org/bigbluebutton/api/Util.java +++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/Util.java @@ -123,4 +123,27 @@ public static void makePresentationDownloadable( downloadMarker.createNewFile(); } } + + public static String generateUploadId(String filename) { + long timestamp = System.currentTimeMillis(); + return DigestUtils.sha1Hex(filename) + "-" + timestamp; + } + + public static File createUploadDir(String rootDir, String source, String meetingId, String uploadId) { + String meetingsPath = rootDir + File.separatorChar + "meetings"; + String sourcePath = meetingsPath + File.separatorChar + meetingId + File.separatorChar + source; + String uploadPath = sourcePath + File.separatorChar + uploadId; + File uploadDir = new File(uploadPath); + if (uploadDir.mkdirs()) { + return uploadDir; + } + return null; + } + + public static String getDownloadPath(String rootDir, String source, String meetingId, String uploadId) { + String meetingsPath = rootDir + File.separatorChar + "meetings"; + String sourcePath = meetingsPath + File.separatorChar + meetingId + File.separatorChar + source; + String downloadPath = sourcePath + File.separatorChar + uploadId; + return downloadPath; + } } diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java index 1a45f0acf68b..a8d186a130db 100755 --- a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java +++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java @@ -104,6 +104,9 @@ public class Meeting { private String presentationUploadExternalDescription; private String presentationUploadExternalUrl; + private HashMap uploadRequests = new HashMap(); + private HashMap uploadedFiles = new HashMap(); + private Integer meetingExpireIfNoUserJoinedInMinutes = 5; private Integer meetingExpireWhenLastUserLeftInMinutes = 1; private Integer userInactivityInspectTimerInMinutes = 120; @@ -192,6 +195,16 @@ public List getBreakoutRooms() { return breakoutRooms; } + public void addUploadRequest(String source, String filename, String userId, String token) { + UploadRequest uploadRequest = new UploadRequest(source, filename, userId); + uploadRequests.put(token, uploadRequest); + } + + public void addUploadedFile(String source, String filename, String contentType, String extension, String uploadId) { + UploadedFile uploadedFile = new UploadedFile(source, filename, contentType, extension); + uploadedFiles.put(uploadId, uploadedFile); + } + public Map getMetadata() { return metadata; } @@ -266,6 +279,29 @@ public void setGuestStatusWithId(String userId, String guestStatus) { } + public Boolean isUploadRequestValid(String source, String filename, String userId, String token) { + UploadRequest uploadRequest = uploadRequests.get(token); + if (uploadRequest != null) { + return uploadRequest.isValid(source, filename, userId); + } else { + return false; + } + } + + public Boolean hasUploadedFile(String source, String uploadId) { + UploadedFile uploadedFile = uploadedFiles.get(uploadId); + if (uploadedFile != null) { + return source.equals(uploadedFile.source); + } else { + return false; + } + } + + public UploadedFile getUploadedFile(String uploadId) { + UploadedFile uploadedFile = uploadedFiles.get(uploadId); + return uploadedFile; + } + public RegisteredUser getRegisteredUserWithAuthToken(String authToken) { for (RegisteredUser ruser : registeredUsers.values()) { if (ruser.authToken.equals(authToken)) { diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/UploadRequest.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/UploadRequest.java new file mode 100644 index 000000000000..2863c18ed51a --- /dev/null +++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/UploadRequest.java @@ -0,0 +1,28 @@ +package org.bigbluebutton.api.domain; + +public class UploadRequest { + public final String source; + public final String filename; + public final String userId; + private Boolean valid; + + public UploadRequest(String source, String filename, String userId) { + this.source = source; + this.filename = filename; + this.userId = userId; + this.valid = true; + } + + public Boolean isValid(String source, String filename, String userId) { + if (this.valid) { + // Invalidate this upload request after the first check + this.valid = false; + Boolean validSource = source != null && source.equals(this.source); + Boolean validFilename = filename != null && filename.equals(this.filename); + Boolean validUserId = userId != null && userId.equals(this.userId); + return validSource && validFilename && validUserId; + } else { + return false; + } + } +} diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/UploadedFile.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/UploadedFile.java new file mode 100644 index 000000000000..477a754d38a3 --- /dev/null +++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/UploadedFile.java @@ -0,0 +1,15 @@ +package org.bigbluebutton.api.domain; + +public class UploadedFile { + public final String source; + public final String filename; + public final String contentType; + public final String extension; + + public UploadedFile(String source, String filename, String contentType, String extension) { + this.source = source; + this.filename = filename; + this.contentType = contentType; + this.extension = extension; + } +} diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/messages/UploadRequest.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/messages/UploadRequest.java new file mode 100644 index 000000000000..2eec4c72e150 --- /dev/null +++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/messages/UploadRequest.java @@ -0,0 +1,17 @@ +package org.bigbluebutton.api.messaging.messages; + +public class UploadRequest implements IMessage { + public final String meetingId; + public final String source; + public final String filename; + public final String userId; + public final String token; + + public UploadRequest(String meetingId, String source, String filename, String userId, String token) { + this.meetingId = meetingId; + this.source = source; + this.filename = filename; + this.userId = userId; + this.token = token; + } +} diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java b/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java index cfb28e33d8ab..eef16046da15 100755 --- a/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java +++ b/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java @@ -55,6 +55,14 @@ void registerUser(String meetingID, String internalUserId, String fullname, Stri void destroyMeeting(DestroyMeetingMessage msg); void endMeeting(EndMeetingMessage msg); + void fileUploaded( + String uploadId, + String source, + String filename, + String contentType, + String userId, + String meetingId + ); void sendKeepAlive(String system, Long bbbWebTimestamp, Long akkaAppsTimestamp); void publishedRecording(PublishedRecordingMessage msg); void unpublishedRecording(UnpublishedRecordingMessage msg); diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala index 22ec7e5245f5..a3b91c64b484 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala @@ -293,6 +293,18 @@ class BbbWebApiGWApp( msgToAkkaAppsEventBus.publish(MsgToAkkaApps(toAkkaAppsChannel, event)) } + def fileUploaded( + uploadId: String, + source: String, + filename: String, + contentType: String, + userId: String, + meetingId: String + ): Unit = { + val event = MsgBuilder.buildFileUploadedSysMsg(uploadId, source, filename, contentType, userId, meetingId) + msgToAkkaAppsEventBus.publish(MsgToAkkaApps(toAkkaAppsChannel, event)) + } + def publishedRecording(msg: PublishedRecordingMessage): Unit = { val event = MsgBuilder.buildPublishedRecordingSysMsg(msg) // Probably violating something here, but a new event bus looks just too much for this diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala index 09532942bd66..562f50785d66 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala @@ -104,6 +104,22 @@ object MsgBuilder { BbbCommonEnvCoreMsg(envelope, req) } + def buildFileUploadedSysMsg( + uploadId: String, + source: String, + filename: String, + contentType: String, + userId: String, + meetingId: String + ): BbbCommonEnvCoreMsg = { + val routing = collection.immutable.HashMap("sender" -> "bbb-web") + val envelope = BbbCoreEnvelope(FileUploadedSysMsg.NAME, routing) + val header = BbbClientMsgHeader(FileUploadedSysMsg.NAME, meetingId, userId) + val body = FileUploadedSysMsgBody(uploadId, source, filename, contentType) + val req = FileUploadedSysMsg(header, body) + BbbCommonEnvCoreMsg(envelope, req) + } + def buildPresentationPageGeneratedPubMsg(msg: DocPageGeneratedProgress): BbbCommonEnvCoreMsg = { val routing = collection.immutable.HashMap("sender" -> "bbb-web") val envelope = BbbCoreEnvelope(PresentationPageGeneratedSysPubMsg.NAME, routing) diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala index a7f9d8f5ed83..1f9a624ab466 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala @@ -88,6 +88,8 @@ class ReceivedJsonMsgHdlrActor(val msgFromAkkaAppsEventBus: MsgFromAkkaAppsEvent route[UserRoleChangedEvtMsg](envelope, jsonNode) case CreateBreakoutRoomSysCmdMsg.NAME => route[CreateBreakoutRoomSysCmdMsg](envelope, jsonNode) + case UploadRequestSysMsg.NAME => + route[UploadRequestSysMsg](envelope, jsonNode) case PresentationUploadTokenSysPubMsg.NAME => route[PresentationUploadTokenSysPubMsg](envelope, jsonNode) case GuestsWaitingApprovedEvtMsg.NAME => diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala index 6e4092228d7a..c6d396db0101 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala @@ -36,6 +36,7 @@ class OldMeetingMsgHdlrActor(val olgMsgGW: OldMessageReceivedGW) case m: UserBroadcastCamStartedEvtMsg => handleUserBroadcastCamStartedEvtMsg(m) case m: UserBroadcastCamStoppedEvtMsg => handleUserBroadcastCamStoppedEvtMsg(m) case m: CreateBreakoutRoomSysCmdMsg => handleCreateBreakoutRoomSysCmdMsg(m) + case m: UploadRequestSysMsg => handleUploadRequestSysMsg(m) case m: PresentationUploadTokenSysPubMsg => handlePresentationUploadTokenSysPubMsg(m) case m: GuestsWaitingApprovedEvtMsg => handleGuestsWaitingApprovedEvtMsg(m) case m: PosInWaitingQueueUpdatedRespMsg => handlePosInWaitingQueueUpdatedRespMsg(m) @@ -168,6 +169,10 @@ class OldMeetingMsgHdlrActor(val olgMsgGW: OldMessageReceivedGW) olgMsgGW.handle(new UserRoleChanged(msg.header.meetingId, msg.body.userId, msg.body.role)) } + def handleUploadRequestSysMsg(msg: UploadRequestSysMsg): Unit = { + olgMsgGW.handle(new UploadRequest(msg.header.meetingId, msg.body.source, msg.body.filename, msg.body.userId, msg.body.token)) + } + def handlePresentationUploadTokenSysPubMsg(msg: PresentationUploadTokenSysPubMsg): Unit = { olgMsgGW.handle(new PresentationUploadToken(msg.body.podId, msg.body.authzToken, msg.body.filename, msg.body.meetingId)) } diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js index e851e3036d2f..e11831b84cdc 100755 --- a/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js +++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js @@ -21,6 +21,8 @@ import clearUserInfo from '/imports/api/users-infos/server/modifiers/clearUserIn import clearConnectionStatus from '/imports/api/connection-status/server/modifiers/clearConnectionStatus'; import clearScreenshare from '/imports/api/screenshare/server/modifiers/clearScreenshare'; import clearAudioCaptions from '/imports/api/audio-captions/server/modifiers/clearAudioCaptions'; +import clearUploadRequest from '/imports/api/upload/server/modifiers/clearUploadRequest'; +import clearUploadedFile from '/imports/api/upload/server/modifiers/clearUploadedFile'; import clearMeetingTimeRemaining from '/imports/api/meetings/server/modifiers/clearMeetingTimeRemaining'; import clearLocalSettings from '/imports/api/local-settings/server/modifiers/clearLocalSettings'; import clearRecordMeeting from './clearRecordMeeting'; @@ -56,6 +58,8 @@ export default async function meetingHasEnded(meetingId) { clearVoiceUsers(meetingId), clearUserInfo(meetingId), clearConnectionStatus(meetingId), + clearUploadRequest(meetingId), + clearUploadedFile(meetingId), clearAudioCaptions(meetingId), clearLocalSettings(meetingId), clearMeetingTimeRemaining(meetingId), diff --git a/bigbluebutton-html5/imports/api/upload/index.js b/bigbluebutton-html5/imports/api/upload/index.js new file mode 100644 index 000000000000..7ad70ab6a365 --- /dev/null +++ b/bigbluebutton-html5/imports/api/upload/index.js @@ -0,0 +1,14 @@ +import { Meteor } from 'meteor/meteor'; + +const UploadRequest = new Mongo.Collection('upload-request'); +const UploadedFile = new Mongo.Collection('uploaded-file'); + +if (Meteor.isServer) { + UploadRequest._ensureIndex({ meetingId: 1 }); + UploadedFile._ensureIndex({ meetingId: 1 }); +} + +export { + UploadRequest, + UploadedFile, +}; diff --git a/bigbluebutton-html5/imports/api/upload/server/eventHandlers.js b/bigbluebutton-html5/imports/api/upload/server/eventHandlers.js new file mode 100644 index 000000000000..d0e5f7171880 --- /dev/null +++ b/bigbluebutton-html5/imports/api/upload/server/eventHandlers.js @@ -0,0 +1,6 @@ +import RedisPubSub from '/imports/startup/server/redis'; +import handleUploadRequestResp from './handlers/uploadRequestResp'; +import handleFileUploadedEvt from './handlers/fileUploadedEvt'; + +RedisPubSub.on('UploadRequestRespMsg', handleUploadRequestResp); +RedisPubSub.on('FileUploadedEvtMsg', handleFileUploadedEvt); diff --git a/bigbluebutton-html5/imports/api/upload/server/handlers/fileUploadedEvt.js b/bigbluebutton-html5/imports/api/upload/server/handlers/fileUploadedEvt.js new file mode 100644 index 000000000000..14e627f2cbea --- /dev/null +++ b/bigbluebutton-html5/imports/api/upload/server/handlers/fileUploadedEvt.js @@ -0,0 +1,24 @@ +import { check } from 'meteor/check'; +import { isNotificationEnabled } from '../helpers'; +import addNotification from '../modifiers/addNotification'; +import addUploadedFile from '../modifiers/addUploadedFile'; + +export default function handleFileUploadedEvt({ header, body }, meetingId) { + check(body, Object); + check(header, Object); + check(meetingId, String); + + const { userId } = header; + + const { + uploadId, + source, + filename, + } = body; + + if (isNotificationEnabled()) { + addNotification(meetingId, userId, uploadId, source, filename); + } + + return addUploadedFile(meetingId, userId, uploadId, source, filename); +} diff --git a/bigbluebutton-html5/imports/api/upload/server/handlers/uploadRequestResp.js b/bigbluebutton-html5/imports/api/upload/server/handlers/uploadRequestResp.js new file mode 100644 index 000000000000..f4f0c110ecd2 --- /dev/null +++ b/bigbluebutton-html5/imports/api/upload/server/handlers/uploadRequestResp.js @@ -0,0 +1,18 @@ +import { check } from 'meteor/check'; +import addUploadRequest from '../modifiers/addUploadRequest'; + +export default function handleUploadRequestResp({ body }, meetingId) { + check(body, Object); + check(meetingId, String); + + const { + source, + filename, + userId, + success, + timestamp, + token, + } = body; + + return addUploadRequest(meetingId, source, filename, userId, success, timestamp, token); +} diff --git a/bigbluebutton-html5/imports/api/upload/server/helpers.js b/bigbluebutton-html5/imports/api/upload/server/helpers.js new file mode 100644 index 000000000000..e4d5df9e94d8 --- /dev/null +++ b/bigbluebutton-html5/imports/api/upload/server/helpers.js @@ -0,0 +1,9 @@ +import { Meteor } from 'meteor/meteor'; + +const UPLOAD = Meteor.settings.public.upload; + +const isNotificationEnabled = () => UPLOAD.notification; + +export { + isNotificationEnabled, +}; diff --git a/bigbluebutton-html5/imports/api/upload/server/index.js b/bigbluebutton-html5/imports/api/upload/server/index.js new file mode 100644 index 000000000000..92451ac76bf2 --- /dev/null +++ b/bigbluebutton-html5/imports/api/upload/server/index.js @@ -0,0 +1,3 @@ +import './eventHandlers'; +import './methods'; +import './publishers'; diff --git a/bigbluebutton-html5/imports/api/upload/server/methods.js b/bigbluebutton-html5/imports/api/upload/server/methods.js new file mode 100644 index 000000000000..a410dd7a218c --- /dev/null +++ b/bigbluebutton-html5/imports/api/upload/server/methods.js @@ -0,0 +1,6 @@ +import { Meteor } from 'meteor/meteor'; +import requestUpload from './methods/requestUpload'; + +Meteor.methods({ + requestUpload, +}); diff --git a/bigbluebutton-html5/imports/api/upload/server/methods/requestUpload.js b/bigbluebutton-html5/imports/api/upload/server/methods/requestUpload.js new file mode 100644 index 000000000000..4cd5b1ffd47b --- /dev/null +++ b/bigbluebutton-html5/imports/api/upload/server/methods/requestUpload.js @@ -0,0 +1,27 @@ +import RedisPubSub from '/imports/startup/server/redis'; +import { check } from 'meteor/check'; +import { extractCredentials } from '/imports/api/common/server/helpers'; + +//export default function requestUpload(credentials, source, filename, timestamp) { +export default function requestUpload(source, filename, timestamp) { + const REDIS_CONFIG = Meteor.settings.private.redis; + const CHANNEL = REDIS_CONFIG.channels.toAkkaApps; + const EVENT_NAME = 'UploadRequestReqMsg'; + + //const { meetingId, requesterUserId } = credentials; +const { meetingId, requesterUserId } = extractCredentials(this.userId); + + check(meetingId, String); + check(requesterUserId, String); + check(source, String); + check(filename, String); + check(timestamp, Number) + + const payload = { + source, + filename, + timestamp, + }; + + return RedisPubSub.publishUserMessage(CHANNEL, EVENT_NAME, meetingId, requesterUserId, payload); +} diff --git a/bigbluebutton-html5/imports/api/upload/server/modifiers/addNotification.js b/bigbluebutton-html5/imports/api/upload/server/modifiers/addNotification.js new file mode 100644 index 000000000000..df8d7cad705c --- /dev/null +++ b/bigbluebutton-html5/imports/api/upload/server/modifiers/addNotification.js @@ -0,0 +1,55 @@ +import flat from 'flat'; +import { check } from 'meteor/check'; +import Logger from '/imports/startup/server/logger'; +import { GroupChatMsg } from '/imports/api/group-chat-msg'; + +const CHAT = Meteor.settings.public.chat; +const SYSTEM_ID = CHAT.type_system; +const CHAT_ID = 'MAIN-PUBLIC-GROUP-CHAT'; +const CHAT_CONFIG = Meteor.settings.public.chat; +const SYSTEM_CHAT_TYPE = CHAT_CONFIG.type_system; + +export default function addUploadedFileMsg(meetingId, userId, uploadId, source, filename) { + check(meetingId, String); + check(userId, String); + check(uploadId, String); + check(source, String); + check(filename, String); + + const now = Date.now(); + + const upload = { + uploadId, + source, + filename, + }; + + const selector = { + meetingId, + chatId: CHAT_ID, + id: `${SYSTEM_CHAT_TYPE}-upload-msg-${now}`, + }; + + const modifier = { + $set: { + meetingId, + chatId: CHAT_ID, + message: '', + upload, + sender: SYSTEM_ID, + timestamp: now, + }, + }; + + try { + const { insertedId, numberAffected } = GroupChatMsg.upsert(selector, modifier); + + if (insertedId) { + Logger.info(`Added group-chat-msg uploaded file meetingId=${meetingId}`); + } else if (numberAffected){ + Logger.info(`Upserted group-chat-msg uploaded file meetingId=${meetingId}`); + } + } catch (err) { + Logger.error(`Adding group-chat-msg uploaded file to collection: ${err}`); + } +} diff --git a/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadRequest.js b/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadRequest.js new file mode 100644 index 000000000000..312bb0d7ef06 --- /dev/null +++ b/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadRequest.js @@ -0,0 +1,42 @@ +import { check } from 'meteor/check'; +import Logger from '/imports/startup/server/logger'; +import { UploadRequest } from '/imports/api/upload'; + +export default function addUploadRequest(meetingId, source, filename, userId, success, timestamp, token) { + check(source, String); + check(filename, String); + check(userId, String); + check(success, Boolean); + check(timestamp, Number); + + if (success) { + check(token, String); + } + + const selector = { + meetingId, + source, + userId, + filename, + timestamp, + }; + + const modifier = { + meetingId, + source, + userId, + filename, + success, + timestamp, + token, + }; + + try { + const { numberAffected } = UploadRequest.upsert(selector, modifier); + if (numberAffected) { + Logger.debug(`Upserting upload request filename=${filename} user=${userId} meeting=${meetingId}`); + } + } catch (err) { + Logger.error(`Upserting upload request: ${err}`); + } +} diff --git a/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadedFile.js b/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadedFile.js new file mode 100644 index 000000000000..1999517158bc --- /dev/null +++ b/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadedFile.js @@ -0,0 +1,33 @@ +import { check } from 'meteor/check'; +import Logger from '/imports/startup/server/logger'; +import { UploadedFile } from '/imports/api/upload'; + +export default function addUploadedFile(meetingId, userId, uploadId, source, filename) { + check(meetingId, String); + check(userId, String); + check(uploadId, String); + check(source, String); + check(filename, String); + + const selector = { + meetingId, + uploadId, + }; + + const modifier = { + meetingId, + userId, + uploadId, + source, + filename, + }; + + try { + const { numberAffected } = UploadedFile.upsert(selector, modifier); + if (numberAffected) { + Logger.debug(`Upserting uploaded file filename=${filename} meeting=${meetingId} source=${source}`); + } + } catch (err) { + Logger.error(`Upserting upload file: ${err}`); + } +} diff --git a/bigbluebutton-html5/imports/api/upload/server/modifiers/clearUploadRequest.js b/bigbluebutton-html5/imports/api/upload/server/modifiers/clearUploadRequest.js new file mode 100644 index 000000000000..b8b1bf3ee50b --- /dev/null +++ b/bigbluebutton-html5/imports/api/upload/server/modifiers/clearUploadRequest.js @@ -0,0 +1,15 @@ +import { UploadRequest } from '/imports/api/upload'; +import Logger from '/imports/startup/server/logger'; + +export default function clearUploadRequest(meetingId) { + if (meetingId) { + return UploadRequest.remove({ meetingId }, () => { + Logger.info(`Cleared UploadRequest (${meetingId})`); + }); + } + + // clearing upload requests for the whole server + return UploadRequest.remove({}, () => { + Logger.info('Cleared UploadRequest (all)'); + }); +} diff --git a/bigbluebutton-html5/imports/api/upload/server/modifiers/clearUploadedFile.js b/bigbluebutton-html5/imports/api/upload/server/modifiers/clearUploadedFile.js new file mode 100644 index 000000000000..98fec2dffc4f --- /dev/null +++ b/bigbluebutton-html5/imports/api/upload/server/modifiers/clearUploadedFile.js @@ -0,0 +1,15 @@ +import { UploadedFile } from '/imports/api/upload'; +import Logger from '/imports/startup/server/logger'; + +export default function clearUploadedFile(meetingId) { + if (meetingId) { + return UploadedFile.remove({ meetingId }, () => { + Logger.info(`Cleared UploadedFile (${meetingId})`); + }); + } + + // clearing uploaded files for the whole server + return UploadedFile.remove({}, () => { + Logger.info('Cleared UploadedFile (all)'); + }); +} diff --git a/bigbluebutton-html5/imports/api/upload/server/publishers.js b/bigbluebutton-html5/imports/api/upload/server/publishers.js new file mode 100644 index 000000000000..01e450147b57 --- /dev/null +++ b/bigbluebutton-html5/imports/api/upload/server/publishers.js @@ -0,0 +1,54 @@ +import { Meteor } from 'meteor/meteor'; +//import { check } from 'meteor/check'; +import { + UploadRequest, + UploadedFile, +} from '/imports/api/upload'; +import Logger from '/imports/startup/server/logger'; +//Suga +import { extractCredentials } from '/imports/api/common/server/helpers'; + +// Somebody still sends credentials. This will be a security issue... +function uploadRequest(credentials, source, filename) { + if (!this.userId) { + return UploadRequest.find({ meetingId: ''}); + } + //const { meetingId, requesterUserId } = credentials; // this also works + const { meetingId, requesterUserId } = extractCredentials(this.userId); + + const selector = { + meetingId, + userId: requesterUserId, + source, + filename, + }; + + Logger.debug(`Publishing upload request for ${meetingId} ${requesterUserId}`); + + return UploadRequest.find(selector); +} + +function publishRequest(...args) { + const boundUploadRequest = uploadRequest.bind(this); + return boundUploadRequest(...args); +} + +Meteor.publish('upload-request', publishRequest); + +function uploadedFile() { + if (!this.userId) { + return UploadedFile.find({ meetingId: ''}); + } + const { meetingId } = extractCredentials(this.userId); + + Logger.debug(`Publishing uploaded file for ${meetingId}`); + + return UploadedFile.find({ meetingId }); +} + +function publishUpload(...args) { + const boundUploadedFile = uploadedFile.bind(this); + return boundUploadedFile(...args); +} + +Meteor.publish('uploaded-file', publishUpload); diff --git a/bigbluebutton-html5/imports/api/users-persistent-data/server/modifiers/addUserPersistentData.js b/bigbluebutton-html5/imports/api/users-persistent-data/server/modifiers/addUserPersistentData.js index 71288d6ae551..e404a6fe7800 100644 --- a/bigbluebutton-html5/imports/api/users-persistent-data/server/modifiers/addUserPersistentData.js +++ b/bigbluebutton-html5/imports/api/users-persistent-data/server/modifiers/addUserPersistentData.js @@ -8,6 +8,7 @@ export default async function addUserPersistentData(user) { sortName: String, color: String, speechLocale: String, + translationLocale: String, mobile: Boolean, breakoutProps: Object, inactivityCheck: Boolean, diff --git a/bigbluebutton-html5/imports/api/users/server/methods.js b/bigbluebutton-html5/imports/api/users/server/methods.js index 3d64c05d56f7..4f2344903136 100644 --- a/bigbluebutton-html5/imports/api/users/server/methods.js +++ b/bigbluebutton-html5/imports/api/users/server/methods.js @@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor'; import validateAuthToken from './methods/validateAuthToken'; import setEmojiStatus from './methods/setEmojiStatus'; import setSpeechLocale from './methods/setSpeechLocale'; +import setTranslationLocale from './methods/setTranslationLocale'; import setMobileUser from './methods/setMobileUser'; import assignPresenter from './methods/assignPresenter'; import changeRole from './methods/changeRole'; @@ -17,6 +18,7 @@ import setExitReason from './methods/setExitReason'; Meteor.methods({ setEmojiStatus, setSpeechLocale, + setTranslationLocale, setMobileUser, assignPresenter, changeRole, diff --git a/bigbluebutton-html5/imports/api/users/server/methods/setTranslationLocale.js b/bigbluebutton-html5/imports/api/users/server/methods/setTranslationLocale.js new file mode 100644 index 000000000000..4d1530326e45 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/methods/setTranslationLocale.js @@ -0,0 +1,22 @@ +import { check } from 'meteor/check'; +import Logger from '/imports/startup/server/logger'; +import updateTranslationLocale from '../modifiers/updateTranslationLocale'; +import { extractCredentials } from '/imports/api/common/server/helpers'; + +const LANGUAGES = Meteor.settings.public.app.audioCaptions.language.available; + +export default function setTranslationLocale(locale) { + try { + const { meetingId, requesterUserId } = extractCredentials(this.userId); + + check(meetingId, String); + check(requesterUserId, String); + check(locale, String); + + if (LANGUAGES.includes(locale) || locale === '') { + updateTranslationLocale(meetingId, requesterUserId, locale); + } + } catch (err) { + Logger.error(`Exception while invoking method setTranslationLocale ${err.stack}`); + } +} diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js b/bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js index b8a476989bb1..35a31ee6f108 100755 --- a/bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js @@ -44,6 +44,7 @@ export default async function addUser(meetingId, userData) { meetingId, sortName: lowercaseTrim(user.name), speechLocale: '', + translationLocale: '', mobile: false, breakoutProps: { isBreakoutUser: Meeting.meetingProp.isBreakout, diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/updateTranslationLocale.js b/bigbluebutton-html5/imports/api/users/server/modifiers/updateTranslationLocale.js new file mode 100644 index 000000000000..f5bc7cab18a7 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/updateTranslationLocale.js @@ -0,0 +1,25 @@ +import Logger from '/imports/startup/server/logger'; +import Users from '/imports/api/users'; + +export default function updateTranslationLocale(meetingId, userId, locale) { + const selector = { + meetingId, + userId, + }; + + const modifier = { + $set: { + translationLocale: locale, + }, + }; + + try { + const numberAffected = Users.update(selector, modifier); + + if (numberAffected) { + Logger.info(`Updated translation locale=${locale} userId=${userId} meetingId=${meetingId}`); + } + } catch (err) { + Logger.error(`Updating translation locale: ${err}`); + } +} diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx index d87edbf71acb..7926ee59631b 100755 --- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx @@ -2,6 +2,8 @@ import _ from 'lodash'; import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; import { defineMessages } from 'react-intl'; +//import Button from '/imports/ui/components/button/component'; +import MediaUploadContainer from '/imports/ui/components/upload/media/container'; import { withModalMounter } from '/imports/ui/components/common/modal/service'; import withShortcutHelper from '/imports/ui/components/shortcut-help/service'; import ExternalVideoModal from '/imports/ui/components/external-video-player/modal/container'; @@ -24,6 +26,7 @@ const propTypes = { shortcuts: PropTypes.string, handleTakePresenter: PropTypes.func.isRequired, allowExternalVideo: PropTypes.bool.isRequired, + isMediaUploadEnabled: PropTypes.bool.isRequired, stopExternalVideoShare: PropTypes.func.isRequired, isMobile: PropTypes.bool.isRequired, setMeetingLayout: PropTypes.func.isRequired, @@ -49,6 +52,14 @@ const intlMessages = defineMessages({ id: 'app.actionsBar.actionsDropdown.presentationDesc', description: 'adds context to upload presentation option', }, + uploadMediaLabel: { + id: 'app.actionsBar.actionsDropdown.uploadMediaLabel', + description: 'Upload media option label', + }, + uploadMediaDesc: { + id: 'app.actionsBar.actionsDropdown.uploadMediaDesc', + description: 'adds context to upload media option', + }, desktopShareDesc: { id: 'app.actionsBar.actionsDropdown.desktopShareDesc', description: 'adds context to desktop share option', @@ -106,12 +117,14 @@ class ActionsDropdown extends PureComponent { super(props); this.presentationItemId = _.uniqueId('action-item-'); + this.uploadMediaId = _.uniqueId('action-item-'); this.pollId = _.uniqueId('action-item-'); this.takePresenterId = _.uniqueId('action-item-'); this.selectUserRandId = _.uniqueId('action-item-'); this.handleExternalVideoClick = this.handleExternalVideoClick.bind(this); this.makePresentationItems = this.makePresentationItems.bind(this); + this.handleUploadMediaClick = this.handleUploadMediaClick.bind(this); } componentDidUpdate(prevProps) { @@ -132,6 +145,7 @@ class ActionsDropdown extends PureComponent { intl, amIPresenter, allowExternalVideo, + isMediaUploadEnabled, handleTakePresenter, isSharingVideo, isPollingEnabled, @@ -149,6 +163,8 @@ class ActionsDropdown extends PureComponent { pollBtnLabel, presentationLabel, takePresenter, + uploadMediaLabel, + uploadMediaDesc, } = intlMessages; const { @@ -241,6 +257,15 @@ class ActionsDropdown extends PureComponent { }); } + if (amIPresenter && isMediaUploadEnabled) { + actions.push({ + icon: "upload", + label: formatMessage(uploadMediaLabel), + key: this.uploadMediaId, + onClick: this.handleUploadMediaClick, + }) + } + return actions; } @@ -281,6 +306,11 @@ class ActionsDropdown extends PureComponent { return presentationItemElements; } + handleUploadMediaClick() { + const { mountModal } = this.props; + mountModal(); + } + render() { const { intl, diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx index d0e1d262ff8a..bbb7b33f0132 100755 --- a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx @@ -32,6 +32,7 @@ class ActionsBar extends PureComponent { isRaiseHandButtonEnabled, isThereCurrentPresentation, allowExternalVideo, + isMediaUploadEnabled, setEmojiStatus, currentUser, layoutContextDispatch, @@ -58,6 +59,7 @@ class ActionsBar extends PureComponent { isPollingEnabled, isSelectRandomUserEnabled, allowExternalVideo, + isMediaUploadEnabled, handleTakePresenter, intl, isSharingVideo, @@ -74,11 +76,7 @@ class ActionsBar extends PureComponent { ) : null} - { !deviceInfo.isMobile - ? ( - - ) - : null } + diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx index 52b2ca3e3bb5..7289972d9865 100644 --- a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx +++ b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx @@ -11,6 +11,7 @@ import ActionsBar from './component'; import Service from './service'; import UserListService from '/imports/ui/components/user-list/service'; import ExternalVideoService from '/imports/ui/components/external-video-player/service'; +import MediaUploadService from '/imports/ui/components/upload/media/service'; import CaptionsService from '/imports/ui/components/captions/service'; import { layoutSelectOutput, layoutDispatch } from '../layout/context'; import { isVideoBroadcasting } from '/imports/ui/components/screenshare/service'; @@ -66,6 +67,7 @@ export default withTracker(() => ({ isRaiseHandButtonEnabled: RAISE_HAND_BUTTON_ENABLED, isThereCurrentPresentation: Presentations.findOne({ meetingId: Auth.meetingID, current: true }, { fields: {} }), + isMediaUploadEnabled: MediaUploadService.isEnabled(), allowExternalVideo: isExternalVideoEnabled(), setEmojiStatus: UserListService.setEmojiStatus, }))(injectIntl(ActionsBarContainer)); diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/quick-poll-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/quick-poll-dropdown/component.jsx index f6fd92281949..05b75b4debcd 100644 --- a/bigbluebutton-html5/imports/ui/components/actions-bar/quick-poll-dropdown/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/actions-bar/quick-poll-dropdown/component.jsx @@ -123,7 +123,7 @@ const QuickPollDropdown = (props) => { itemLabel = options.join('/').replace(/[\n.)]/g, ''); if (type === _pollTypes.Custom) { for (let i = 0; i < options.length; i += 1) { - const letterOption = options[i]?.replace(/[\r.)]/g, '').toUpperCase(); + const letterOption = options[i]?.replace(/[\r.)]/g, ''); if (letterAnswers.length < MAX_CUSTOM_FIELDS) { letterAnswers.push(letterOption); } else { @@ -131,18 +131,19 @@ const QuickPollDropdown = (props) => { } } } + itemLabel = options.map(function(item){ return item.slice(0,1); }).slice(0,MAX_CUSTOM_FIELDS).join('/'); } // removes any whitespace from the label itemLabel = itemLabel?.replace(/\s+/g, '').toUpperCase(); - const numChars = { - 1: 'A', 2: 'B', 3: 'C', 4: 'D', 5: 'E', - }; - itemLabel = itemLabel.split('').map((c) => { - if (numChars[c]) return numChars[c]; - return c; - }).join(''); + //const numChars = { + // 1: 'A', 2: 'B', 3: 'C', 4: 'D', 5: 'E', 6: 'F', 7: 'G', 8: 'H', 9: 'I', + //}; + //itemLabel = itemLabel.split('').map((c) => { + // if (numChars[c]) return numChars[c]; + // return c; + //}).join(''); return ( { const sizes = []; return pollItemElements.filter((el) => { const { label } = el.props; - if (label.length === sizes[sizes.length - 1]) return false; + //if (label.length === sizes[sizes.length - 1]) return false; sizes.push(label.length); return el; }); @@ -215,7 +216,8 @@ const QuickPollDropdown = (props) => { startPoll( pollTypes.Custom, currentSlide.id, - optionsWithLabels, + //optionsWithLabels, + answers, pollQuestion, multiResponse, ); diff --git a/bigbluebutton-html5/imports/ui/components/audio/captions/button/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/captions/button/component.jsx index d87503540c56..72ad3b94dbb3 100644 --- a/bigbluebutton-html5/imports/ui/components/audio/captions/button/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/audio/captions/button/component.jsx @@ -24,12 +24,22 @@ const intlMessages = defineMessages({ id: 'app.audio.captions.button.transcription', description: 'Audio speech transcription label', }, + translation: { + id: 'app.audio.captions.button.translation', + description: 'Audio speech translation label', + }, transcriptionOn: { id: 'app.switch.onLabel', }, transcriptionOff: { id: 'app.switch.offLabel', }, + translationOn: { + id: 'app.switch.onLabel', + }, + translationOff: { + id: 'app.switch.offLabel', + }, language: { id: 'app.audio.captions.button.language', description: 'Audio speech recognition language label', @@ -85,24 +95,39 @@ const CaptionsButton = ({ isRTL, enabled, currentSpeechLocale, + currentTranslationLocale, availableVoices, + availableTranslations, isSupported, isVoiceUser, }) => { const isTranscriptionDisabled = () => ( currentSpeechLocale === DISABLED ); + const isTranslationDisabled = () => ( + currentTranslationLocale === DISABLED + ); + + const isTranslationActivated = () => ( + Meteor.settings.public.captions.enableAutomaticTranslation + ); const fallbackLocale = availableVoices.includes(navigator.language) ? navigator.language : DEFAULT_LOCALE; const getSelectedLocaleValue = (isTranscriptionDisabled() ? fallbackLocale : currentSpeechLocale); + const getSelectedTranslationLocaleValue = (isTranslationDisabled() ? fallbackLocale : currentTranslationLocale); const selectedLocale = useRef(getSelectedLocaleValue); + const selectedTranslationLocale = useRef(getSelectedTranslationLocaleValue); useEffect(() => { if (!isTranscriptionDisabled()) selectedLocale.current = getSelectedLocaleValue; }, [currentSpeechLocale]); + + useEffect(() => { + if (!isTranslationDisabled()) selectedTranslationLocale.current = getSelectedTranslationLocaleValue; + }, [currentTranslationLocale]); if (!enabled) return null; @@ -115,9 +140,8 @@ const CaptionsButton = ({ label: intl.formatMessage(intlMessages[availableVoice]), key: availableVoice, iconRight: selectedLocale.current === availableVoice ? 'check' : null, - customStyles: (selectedLocale.current === availableVoice) && Styled.SelectedLabel, + customStyles: (selectedLocale.current === availableVoice) ? Styled.SelectedLabel : Styled.NormalLabel, disabled: isTranscriptionDisabled(), - dividerTop: availableVoice === availableVoices[0], onClick: () => { selectedLocale.current = availableVoice; SpeechService.setSpeechLocale(selectedLocale.current); @@ -125,39 +149,79 @@ const CaptionsButton = ({ } )) ); + + const getAvailableTranslationLocales = () => ( + availableTranslations.map((availableTranslation) => ( + { + icon: '', + label: intl.formatMessage(intlMessages[availableTranslation]), + key: availableTranslation, + iconRight: selectedTranslationLocale.current === availableTranslation ? 'check' : null, + customStyles: (selectedTranslationLocale.current === availableTranslation) ? Styled.SelectedLabel : Styled.NormalLabel, + disabled: isTranscriptionDisabled() || isTranslationDisabled(), + onClick: () => { + selectedTranslationLocale.current = availableTranslation; + SpeechService.setTranslationLocale(selectedTranslationLocale.current); + }, + } + )) + ); const toggleTranscription = () => { SpeechService.setSpeechLocale(isTranscriptionDisabled() ? selectedLocale.current : DISABLED); }; - const getAvailableLocalesList = () => ( - [{ - key: 'availableLocalesList', - label: intl.formatMessage(intlMessages.language), - customStyles: Styled.TitleLabel, - disabled: true, - dividerTop: false, - }, - ...getAvailableLocales(), - { - key: 'divider', - label: intl.formatMessage(intlMessages.transcription), - customStyles: Styled.TitleLabel, - disabled: true, - }, { - key: 'transcriptionStatus', - label: intl.formatMessage( - isTranscriptionDisabled() - ? intlMessages.transcriptionOn - : intlMessages.transcriptionOff, - ), - customStyles: isTranscriptionDisabled() - ? Styled.EnableTrascription : Styled.DisableTrascription, - disabled: false, - dividerTop: true, - onClick: toggleTranscription, - }] - ); + const toggleTranslation = () => { + SpeechService.setTranslationLocale(isTranslationDisabled() ? selectedTranslationLocale.current : DISABLED); + }; + + const getAvailableLocalesList = () => { + let items = [{ + key: 'divider', + label: intl.formatMessage(intlMessages.transcription), + customStyles: Styled.TitleLabel, + disabled: true, + }, + ...getAvailableLocales(), + { + key: 'transcriptionStatus', + label: intl.formatMessage( + isTranscriptionDisabled() + ? intlMessages.transcriptionOn + : intlMessages.transcriptionOff, + ), + customStyles: isTranscriptionDisabled() + ? Styled.EnableTrascription : Styled.DisableTrascription, + disabled: false, + onClick: toggleTranscription, + }]; + + if (isTranslationActivated()) { + items = items.concat([ + { + key: 'divider', + label: intl.formatMessage(intlMessages.translation), + customStyles: Styled.TitleLabel, + disabled: true, + dividerTop: true, + }, + ...getAvailableTranslationLocales(), + { + key: 'translationStatus', + label: intl.formatMessage( + isTranslationDisabled() + ? intlMessages.translationOn + : intlMessages.translationOff, + ), + customStyles: isTranslationDisabled() + ? Styled.EnableTraslation : Styled.DisableTraslation, + disabled: isTranscriptionDisabled(), + onClick: toggleTranslation, + } + ]); + } + return items; + }; const onToggleClick = (e) => { e.stopPropagation(); @@ -219,6 +283,7 @@ CaptionsButton.propTypes = { isRTL: PropTypes.bool.isRequired, enabled: PropTypes.bool.isRequired, currentSpeechLocale: PropTypes.string.isRequired, + currentTranslationLocale: PropTypes.string.isRequired, availableVoices: PropTypes.arrayOf(PropTypes.string).isRequired, isSupported: PropTypes.bool.isRequired, isVoiceUser: PropTypes.bool.isRequired, diff --git a/bigbluebutton-html5/imports/ui/components/audio/captions/button/container.jsx b/bigbluebutton-html5/imports/ui/components/audio/captions/button/container.jsx index 44a08b88c9a7..f9eb1caa14b8 100644 --- a/bigbluebutton-html5/imports/ui/components/audio/captions/button/container.jsx +++ b/bigbluebutton-html5/imports/ui/components/audio/captions/button/container.jsx @@ -10,7 +10,9 @@ const Container = (props) =>