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..f9c062e7fe53 --- /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 fd661bbc2aa6..850ca00d9b75 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 @@ -317,6 +317,12 @@ class ReceivedJsonMsgHandlerActor( case UpdateWebcamsOnlyForModeratorCmdMsg.NAME => routeGenericMsg[UpdateWebcamsOnlyForModeratorCmdMsg](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 9d56a2d39871..a8de63506f1e 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._ @@ -138,6 +139,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 wbApp = new WhiteboardApp2x @@ -527,6 +529,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 4a60d8bf6711..2de4a52060d0 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 @@ -151,6 +151,11 @@ class AnalyticsActor(val includeChat: Boolean) extends Actor with ActorLogging { case m: SetGuestLobbyMessageCmdMsg => logMessage(msg) case m: GuestLobbyMessageChangedEvtMsg => 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 fa6df81aaa7a..c8b28204d379 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 @@ -115,6 +115,9 @@ class RedisRecorderActor( case m: WebcamsOnlyForModeratorChangedEvtMsg => handleWebcamsOnlyForModeratorChangedEvtMsg(m) case m: MeetingEndingEvtMsg => handleEndAndKickAllSysMsg(m) + // Upload + case m: FileUploadedEvtMsg => handleFileUploadedEvtMsg(m) + // Recording case m: RecordingChapterBreakSysMsg => handleRecordingChapterBreakSysMsg(m) @@ -549,6 +552,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 24708df88674..4eb5ee33fc09 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 @@ -50,6 +50,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.domain.MeetingLayout; import org.bigbluebutton.api.messaging.MessageListener; import org.bigbluebutton.api.messaging.converters.messages.DestroyMeetingMessage; @@ -287,6 +288,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); } @@ -624,6 +652,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)); } @@ -737,6 +781,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); } @@ -1119,6 +1170,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 GuestStatusChangedEventMsg) { 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 521b0887a540..a82545068773 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 @@ -107,6 +107,8 @@ public class ParamsProcessorUtil { private boolean defaultLockSettingsLockOnJoinConfigurable; private Long maxPresentationFileUpload = 30000000L; // 30MB + private Long maxUploadSize = 900000000L; // 900MB - but probably doesn't matter + private String uploadDir; private Integer clientLogoutTimerInMinutes = 0; private Integer meetingExpireIfNoUserJoinedInMinutes = 5; @@ -1060,6 +1062,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 c0c272ebad93..0afe9ba395d7 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 @@ -127,4 +127,27 @@ public static void makePresentationDownloadable( } } } + + 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 6876281fd8ea..8416313c982b 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 @@ -89,6 +89,9 @@ public class Meeting { private Boolean allowModsToEjectCameras = false; private Boolean meetingKeepEvents; + private HashMap uploadRequests = new HashMap(); + private HashMap uploadedFiles = new HashMap(); + private Integer meetingExpireIfNoUserJoinedInMinutes = 5; private Integer meetingExpireWhenLastUserLeftInMinutes = 1; private Integer userInactivityInspectTimerInMinutes = 120; @@ -166,6 +169,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 getPads() { return pads; } @@ -202,6 +215,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 45c3a3fae395..2de4bb390161 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 @@ -45,6 +45,14 @@ void ejectDuplicateUser(String meetingID, String internalUserId, String fullname 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 ef488e9b7f3e..e76aed0bb253 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 @@ -269,6 +269,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 8d18d36f6b1c..c2a6e541f68c 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 @@ -115,6 +115,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 66ae0538abfc..b6559331009f 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 a06888ad5d99..3168dcf58f90 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: GuestPolicyChangedEvtMsg => handleGuestPolicyChangedEvtMsg(m) @@ -161,6 +162,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 32920259414c..fb8a122aa031 100755 --- a/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js +++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js @@ -20,6 +20,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 clearNote from '/imports/api/note/server/modifiers/clearNote'; +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'; @@ -54,6 +56,8 @@ export default function meetingHasEnded(meetingId) { clearUserInfo(meetingId); clearConnectionStatus(meetingId); clearNote(meetingId); + clearUploadRequest(meetingId); + clearUploadedFile(meetingId); clearLocalSettings(meetingId); clearMeetingTimeRemaining(meetingId); clearRecordMeeting(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/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx index 2e78a288d618..028b43eef748 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 @@ -3,6 +3,7 @@ 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/modal/service'; import withShortcutHelper from '/imports/ui/components/shortcut-help/service'; import ExternalVideoModal from '/imports/ui/components/external-video-player/modal/container'; @@ -22,6 +23,7 @@ const propTypes = { shortcuts: PropTypes.string, handleTakePresenter: PropTypes.func.isRequired, allowExternalVideo: PropTypes.bool.isRequired, + isMediaUploadEnabled: PropTypes.bool.isRequired, stopExternalVideoShare: PropTypes.func.isRequired, }; @@ -42,6 +44,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', @@ -91,12 +101,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) { @@ -117,6 +129,7 @@ class ActionsDropdown extends PureComponent { intl, amIPresenter, allowExternalVideo, + isMediaUploadEnabled, handleTakePresenter, isSharingVideo, isPollingEnabled, @@ -131,6 +144,8 @@ class ActionsDropdown extends PureComponent { pollBtnLabel, presentationLabel, takePresenter, + uploadMediaLabel, + uploadMediaDesc, } = intlMessages; const { @@ -201,6 +216,15 @@ class ActionsDropdown extends PureComponent { }) } + if (amIPresenter && isMediaUploadEnabled) { + actions.push({ + icon: "upload", + label: formatMessage(uploadMediaLabel), + key: this.uploadMediaId, + onClick: this.handleUploadMediaClick, + }) + } + return actions; } @@ -242,6 +266,16 @@ class ActionsDropdown extends PureComponent { return presentationItemElements; } + handleExternalVideoClick() { + const { mountModal } = this.props; + mountModal(); + } + + 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 72865374c5ac..a60d056afcf8 100755 --- a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx @@ -31,6 +31,7 @@ class ActionsBar extends PureComponent { isPresentationDisabled, isThereCurrentPresentation, allowExternalVideo, + isMediaUploadEnabled, setEmojiStatus, currentUser, shortcuts, @@ -55,6 +56,7 @@ class ActionsBar extends PureComponent { isPollingEnabled, isSelectRandomUserEnabled, allowExternalVideo, + isMediaUploadEnabled, handleTakePresenter, intl, isSharingVideo, diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx index 44691e1ddd44..5736dd772fd6 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 LayoutContext from '../layout/context'; import { isVideoBroadcasting } from '/imports/ui/components/screenshare/service'; @@ -70,6 +71,7 @@ export default withTracker(() => ({ isOldMinimizeButtonEnabled: OLD_MINIMIZE_BUTTON_ENABLED, isThereCurrentPresentation: Presentations.findOne({ meetingId: Auth.meetingID, current: true }, { fields: {} }), + isMediaUploadEnabled: MediaUploadService.isEnabled(), allowExternalVideo: Meteor.settings.public.externalVideoPlayer.enabled, setEmojiStatus: UserListService.setEmojiStatus, }))(injectIntl(ActionsBarContainer)); diff --git a/bigbluebutton-html5/imports/ui/components/chat/service.js b/bigbluebutton-html5/imports/ui/components/chat/service.js index dc0137a0102b..c6c12659d29c 100755 --- a/bigbluebutton-html5/imports/ui/components/chat/service.js +++ b/bigbluebutton-html5/imports/ui/components/chat/service.js @@ -94,11 +94,18 @@ const reduceGroupMessages = (previous, current) => { const lastMessage = previous[previous.length - 1]; const currentMessage = current; currentMessage.content = [{ +// const content = { id: current.id, text: current.message, time: current.timestamp, color: current.color, }]; +// }; +// // I (Pedro) do not like this + //-> [21.05.05 for BBB2.3] It is transferring "upload" under curreneMessage.content, + // which is done now by ui/component/components-data/chat-context/context.jsx +// if (current.upload) content['upload'] = current.upload; +// currentMessage.content = [content]; if (!lastMessage) { return previous.concat(currentMessage); } diff --git a/bigbluebutton-html5/imports/ui/components/chat/time-window-list/time-window-chat-item/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/time-window-list/time-window-chat-item/component.jsx index f802b13081a6..3b401d13e368 100644 --- a/bigbluebutton-html5/imports/ui/components/chat/time-window-list/time-window-chat-item/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/chat/time-window-list/time-window-chat-item/component.jsx @@ -6,6 +6,7 @@ import UserAvatar from '/imports/ui/components/user-avatar/component'; import cx from 'classnames'; import ChatLogger from '/imports/ui/components/chat/chat-logger/ChatLogger'; import MessageChatItem from './message-chat-item/component'; +import UploadService from '/imports/ui/components/upload/service'; import PollService from '/imports/ui/components/poll/service'; import Icon from '/imports/ui/components/icon/component'; import { styles } from './styles'; @@ -88,21 +89,30 @@ class TimeWindowChatItem extends PureComponent { return (
- {messages.map(message => ( - message.text !== '' - ? ( + {messages.map(message => { + const { + id, + time, + upload, + } = message; + + const text = upload ? UploadService.getNotification(upload, intl) : message.text; + + if (text === '') return null; + + return ( - ) : null - ))} + ); + })}
); diff --git a/bigbluebutton-html5/imports/ui/components/components-data/chat-context/context.jsx b/bigbluebutton-html5/imports/ui/components/components-data/chat-context/context.jsx index 738fcce96a7a..7dc06ebc2e6a 100644 --- a/bigbluebutton-html5/imports/ui/components/components-data/chat-context/context.jsx +++ b/bigbluebutton-html5/imports/ui/components/components-data/chat-context/context.jsx @@ -67,15 +67,17 @@ const generateStateWithNewMessage = (msg, state, msgType = MESSAGE_TYPES.HISTORY const indexValue = chatIndex ? (chatIndex + 1) : 1; const messageKey = key + '-' + indexValue; + const content = [{ id: msg.id, text: msg.message, time: msg.timestamp }]; + if (msg.upload) { + content[0].upload = msg.upload; + } const tempGroupMessage = { [messageKey]: { ...restMsg, key: messageKey, lastTimestamp: msg.timestamp, read: msg.chatId === PUBLIC_CHAT_KEY && msg.timestamp <= getLoginTime() ? true : !!removedMessagesReadState[msg.id], - content: [ - { id: msg.id, text: msg.message, time: msg.timestamp }, - ], + content, } }; diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx index e6a744ca755d..08419e0b32df 100644 --- a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx @@ -95,8 +95,8 @@ class VideoPlayer extends Component { file: { attributes: { controls: isPresenter ? 'controls' : '', - autoplay: 'autoplay', - playsinline: 'playsinline', + autoPlay: 'autoplay', + playsInline: 'playsinline', }, }, facebook: { diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx index 51b5a93f4791..bd56a7ce6f63 100644 --- a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx @@ -1,7 +1,9 @@ import React, { Component } from 'react'; import { withModalMounter } from '/imports/ui/components/modal/service'; +import Icon from '/imports/ui/components/icon/component'; import Modal from '/imports/ui/components/modal/simple/component'; import Button from '/imports/ui/components/button/component'; +import UploadMediaService from '/imports/ui/components/upload/media/service'; import { defineMessages, injectIntl } from 'react-intl'; import { isUrlValid } from '../service'; @@ -33,6 +35,10 @@ const intlMessages = defineMessages({ id: 'app.externalVideo.close', description: 'Close', }, + filename: { + id: 'app.externalVideo.filename', + description: 'Media filename', + }, note: { id: 'app.externalVideo.noteLabel', description: 'provides hint about Shared External videos', @@ -54,6 +60,7 @@ class ExternalVideoModal extends Component { this.updateVideoUrlHandler = this.updateVideoUrlHandler.bind(this); this.renderUrlError = this.renderUrlError.bind(this); this.updateVideoUrlHandler = this.updateVideoUrlHandler.bind(this); + this.onMediaFileClick = this.onMediaFileClick.bind(this); } startWatchingHandler() { @@ -72,6 +79,18 @@ class ExternalVideoModal extends Component { this.setState({ url: ev.target.value }); } + onMediaFileClick(id) { + const { + startWatching, + closeModal, + } = this.props; + + const url = UploadMediaService.getDownloadURL(id); + + startWatching(url.trim()); + closeModal(); + } + renderUrlError() { const { intl } = this.props; const { url } = this.state; @@ -89,6 +108,51 @@ class ExternalVideoModal extends Component { ); } + renderItem(item) { + const { intl } = this.props; + + return ( + this.onMediaFileClick(item.uploadId)} + > + + + + + {item.filename} + + + ); + } + + renderFiles() { + const { + intl, + files, + } = this.props; + + if (files.length === 0) return null; + + return ( +
+ + + + + + + + {files.map(item => this.renderItem(item))} + +
+ {intl.formatMessage(intlMessages.filename)} +
+
+ ); + } + render() { const { intl, closeModal } = this.props; const { url, sharing } = this.state; @@ -123,12 +187,9 @@ class ExternalVideoModal extends Component {
{intl.formatMessage(intlMessages.note)}
- - -
{this.renderUrlError()}
- + {this.renderFiles()}