Dev2.6.9 with all translate client

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.  

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)
+  }
+}

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)
+}

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)
+    }
+  }
+}

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)

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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package org.bigbluebutton.core.record.events
+
+trait AbstractUploadRecordEvent extends RecordEvent {
+  setModule("UPLOAD")
+}

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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+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"
+}

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)

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)

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)

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)

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) {