Fix/25455 merge 2

akka-bbb-apps/build.sbt

@@ -42,7 +42,7 @@ testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "html", "console",
 testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/scalatest-reports")
 
 Seq(Revolver.settings: _*)
-lazy val bbbAppsAkka = (project in file(".")).settings(name := "bbb-apps-akka", libraryDependencies ++= Dependencies.runtime).settings(compileSettings)
+lazy val bbbAppsAkka = (project in file(".")).settings(name := "bbb-apps-akka", libraryDependencies ++= Dependencies.runtime, dependencyOverrides ++= Dependencies.overrides).settings(compileSettings)
 
 // See https://github.com/scala-ide/scalariform
 // Config file is in ./.scalariform.conf

akka-bbb-apps/deploy.sh

@@ -9,5 +9,7 @@ echo ''
 echo '----------------'
 echo 'bbb-apps-akka updated'
 
+sudo systemctl enable bbb-apps-akka.service
+
 sudo service bbb-apps-akka start
 echo 'starting service bbb-apps-akka'

akka-bbb-apps/project/Dependencies.scala

@@ -15,15 +15,17 @@ object Dependencies {
     val pekkoVersion = "1.0.1"
     val pekkoHttpVersion = "1.0.0"
     val gson = "2.8.9"
-    val jackson = "2.13.5"
-    val logback = "1.2.13"
+    val jackson = "2.18.9"
+    val netty = "4.1.135.Final"
+    val logback = "1.5.38"
+    val slf4j = "2.0.17"
     val quicklens = "1.7.5"
     val spray = "1.3.6"
     val semver = "0.10.2"
     val commonmark = "0.27.0"
 
     // Apache Commons
-    val lang = "3.12.0"
+    val lang = "3.18.0"
     val codec = "1.15"
     val httpcomponents = "4.5.14"
 
@@ -32,14 +34,14 @@ object Dependencies {
 
     // Database
     val slick = "3.4.1"
-    val postgresql = "42.5.0"
+    val postgresql = "42.7.13"
     val slickPg = "0.21.1"
 
     // Test
     val scalaTest = "3.2.11"
     val mockito = "2.23.0"
     val akkaTestKit = "2.6.0"
-    val jacksonDataFormat = "2.13.5"
+    val jacksonDataFormat = "2.18.9"
   }
 
   object Compile {
@@ -117,4 +119,19 @@ object Dependencies {
     Compile.slickPgSprayJson,
     Compile.postgresql,
     Compile.jacksonDataFormat) ++ testing
+
+  // Pin transitively-pulled artifacts to fixed releases; keep the jackson suite aligned.
+  val overrides = Seq(
+    "com.fasterxml.jackson.core" % "jackson-databind" % Versions.jackson,
+    "com.fasterxml.jackson.core" % "jackson-core" % Versions.jackson,
+    "com.fasterxml.jackson.core" % "jackson-annotations" % Versions.jackson,
+    "io.netty" % "netty-handler" % Versions.netty,
+    "io.netty" % "netty-codec" % Versions.netty,
+    "io.netty" % "netty-common" % Versions.netty,
+    "io.netty" % "netty-buffer" % Versions.netty,
+    "io.netty" % "netty-transport" % Versions.netty,
+    "io.netty" % "netty-resolver" % Versions.netty,
+    // logback 1.5.x is an slf4j-2.x provider; pin slf4j-api 2.x so the
+    // ServiceLoader binding resolves (pekko-slf4j is runtime-compatible).
+    "org.slf4j" % "slf4j-api" % Versions.slf4j)
 }

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/pads/PadslHdlrHelpers.scala

@@ -30,16 +30,17 @@ object PadslHdlrHelpers {
   }
 
   def broadcastBNSharedNotesCreateCmdMsg(
-      outGW:                         OutMsgRouter,
-      meetingId:                     String,
-      externalId:                    String,
-      model:                         String,
-      sharedNotesInitialContentJson: Vector[AnyRef]
+      outGW:                             OutMsgRouter,
+      meetingId:                         String,
+      externalId:                        String,
+      model:                             String,
+      sharedNotesInitialContentJson:     Vector[AnyRef],
+      sharedNotesInitialContentMarkdown: String
   ): Unit = {
     val routing = collection.immutable.HashMap("sender" -> "bbb-apps-akka")
     val envelope = BbbCoreEnvelope(BNSharedNotesCreateCmdMsg.NAME, routing)
     val header = BbbCoreHeaderWithMeetingId(BNSharedNotesCreateCmdMsg.NAME, meetingId)
-    val body = BNSharedNotesCreateCmdMsgBody(externalId, model, sharedNotesInitialContentJson)
+    val body = BNSharedNotesCreateCmdMsgBody(externalId, model, sharedNotesInitialContentJson, sharedNotesInitialContentMarkdown)
     val event = BNSharedNotesCreateCmdMsg(header, body)
     val msgEvent = BbbCommonEnvCoreMsg(envelope, event)
 

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/PollHdlrHelpers.scala

@@ -6,6 +6,27 @@ import org.bigbluebutton.core.running.OutMsgRouter
 
 object PollHdlrHelpers {
 
+  // Selects the answer ids that will actually be recorded for a poll vote.
+  //
+  // - A single-response question keeps at most the first requested id; a
+  //   multi-response question keeps every distinct requested id.
+  // - Out-of-range ids (negative, or >= the number of options) are dropped so a
+  //   malformed vote can neither crash the meeting actor via the indexed answer
+  //   access that follows nor violate the poll_response foreign key on
+  //   persistence. Invalid votes are silently ignored.
+  //
+  // validAnswerIds is the range of option indices for the question (empty when
+  // the question has no answers), so an empty range drops every requested id.
+  def selectValidAnswerIds(requestedAnswerIds: Seq[Int], multiResponse: Boolean, validAnswerIds: Range): Seq[Int] = {
+    val deduped =
+      if (!multiResponse && requestedAnswerIds.length > 1) {
+        Seq(requestedAnswerIds.head)
+      } else {
+        requestedAnswerIds.distinct
+      }
+    deduped.filter(validAnswerIds.contains)
+  }
+
   def broadcastPollUpdatedEvent(outGW: OutMsgRouter, meetingId: String, userId: String, pollId: String, poll: SimplePollResultOutVO): Unit = {
     val routing = Routing.addMsgToClientRouting(MessageTypes.BROADCAST_TO_MEETING, meetingId, userId)
     val envelope = BbbCoreEnvelope(PollUpdatedEvtMsg.NAME, routing)

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/RespondToPollReqMsgHdlr.scala

@@ -19,13 +19,15 @@ trait RespondToPollReqMsgHdlr {
         if (poll.stopped) {
           log.info("Ignoring vote from user {} because poll {} is already finished in meeting {}", msg.header.userId, msg.body.pollId, msg.header.meetingId)
         } else {
-          val answers = {
-            if (!poll.questions(0).multiResponse && msg.body.answerIds.length > 1) {
-              Seq(msg.body.answerIds.head)
-            } else {
-              msg.body.answerIds.distinct
-            }
-          }
+          val question = poll.questions.headOption
+          val answerList = question.flatMap(_.answers)
+          // Valid answer ids are the option indices of the poll's question. Any id
+          // outside this range is a malformed/out-of-range vote.
+          val validAnswerIds = answerList.map(_.indices).getOrElse(0 until 0)
+
+          val answers = PollHdlrHelpers.selectValidAnswerIds(
+            msg.body.answerIds, question.exists(_.multiResponse), validAnswerIds
+          )
 
           for {
             (pollId: String, updatedPoll: SimplePollResultOutVO) <- Polls.handleRespondToPollReqMsg(msg.header.userId, poll.id,
@@ -34,8 +36,9 @@ trait RespondToPollReqMsgHdlr {
             PollHdlrHelpers.broadcastPollUpdatedEvent(bus.outGW, liveMeeting.props.meetingProp.intId, msg.header.userId, pollId, updatedPoll)
             for {
               answerId <- answers
+              options <- answerList
             } yield {
-              val answerText = poll.questions(0).answers.get(answerId).key
+              val answerText = options(answerId).key
               PollHdlrHelpers.broadcastUserRespondedToPollRecordMsg(bus.outGW, liveMeeting.props.meetingProp.intId, msg.header.userId, pollId, answerId, answerText, poll.isSecret)
             }
 

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationConversionCompletedSysPubMsgHdlr.scala

@@ -8,6 +8,8 @@ import org.bigbluebutton.core.models.PresentationInPod
 import org.bigbluebutton.core.running.LiveMeeting
 import org.bigbluebutton.core2.message.senders.MsgBuilder
 
+import java.io.File
+import java.net.URI
 import java.time.{Instant, Duration}
 
 trait PresentationConversionCompletedSysPubMsgHdlr {
@@ -58,6 +60,12 @@ trait PresentationConversionCompletedSysPubMsgHdlr {
       pods = pods.addPresentationToPod(pod.id, presWithConvertedName)
 
       PresPresentationDAO.updatePages(presWithConvertedName)
+      if (pres.downloadable) {
+        val originalFilename = new URI(null, null, pres.name, null).getRawPath
+        val originalFileURI = List("presentation", "download", meetingId,
+          s"${pres.id}?presFilename=${pres.id}.${originalDownloadableExtension}&filename=$originalFilename").mkString("", File.separator, "")
+        PresPresentationDAO.updateDownloadUri(pres.id, originalFileURI)
+      }
       if(pres.current) {
         val notifyEvent = MsgBuilder.buildNotifyAllInMeetingEvtMsg(
           meetingId,
@@ -93,4 +101,3 @@ trait PresentationConversionCompletedSysPubMsgHdlr {
 
   }
 }
-

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/db/SharedNotesRevDAO.scala

@@ -49,7 +49,7 @@ object SharedNotesRevDAO {
   def insertNextRev(meetingId: String, sharedNotesExtId: String, userId: String) = {
     DatabaseConnection.enqueue(
       sqlu"""
-          insert into "sharedNotes_rev"("meetingId", "sharedNotesExtId", "userId", "rev")
+          insert into "sharedNotes_rev"("meetingId", "sharedNotesExtId", "userId", "rev", "createdAt")
            select
              ${meetingId} as "meetingId",
              ${sharedNotesExtId} as "sharedNotesExtId",
@@ -58,7 +58,8 @@ object SharedNotesRevDAO {
                 from "sharedNotes_rev"
                 where "meetingId" = ${meetingId}
                 and "sharedNotesExtId" = ${sharedNotesExtId}
-             ),0) + 1 as "rev"
+             ),0) + 1 as "rev",
+             current_timestamp as "createdAt"
           """
     )
   }

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala

@@ -378,7 +378,8 @@ class MeetingActor(
       } else {
         PadslHdlrHelpers.broadcastBNSharedNotesCreateCmdMsg(
           outGW, liveMeeting.props.meetingProp.intId,
-          sharedNotesPadId, sharedNotesPadId, liveMeeting.props.meetingProp.sharedNotesInitialContentJson
+          sharedNotesPadId, sharedNotesPadId, liveMeeting.props.meetingProp.sharedNotesInitialContentJson,
+          liveMeeting.props.meetingProp.sharedNotesInitialContentMarkdown
         )
       }
     }

akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala

@@ -234,6 +234,7 @@ class AnalyticsActor(val includeChat: Boolean) extends Actor with ActorLogging {
 
       // Breakouts
       case m: CreateBreakoutRoomsCmdMsg => logMessage(msg)
+      case m: ChangeUserBreakoutReqMsg => logMessage(msg)
 
       case _ => // ignore message
     }

akka-bbb-apps/src/test/scala/org/bigbluebutton/core/apps/polls/PollHdlrHelpersSpec.scala

@@ -0,0 +1,66 @@
+package org.bigbluebutton.core.apps.polls
+
+import org.scalatest.flatspec.AnyFlatSpec
+
+// Exercises the answer-id bounds filter that keeps a malformed poll vote from
+// reaching the indexed answer access in the handler (which would crash the
+// meeting actor) or the poll_response foreign key on persistence. The logic
+// lives in the PollHdlrHelpers object so it can be tested in isolation, without
+// standing up a LiveMeeting / MessageBus / poll fixtures.
+//
+// NOTE: extends AnyFlatSpec directly rather than the shared UnitSpec, which
+// currently does not compile against the resolved ScalaTest 3.2.x (UnitSpec
+// still imports the pre-3.2 org.scalatest.FlatSpec / Matchers packages). Same
+// choice WhiteboardModelSpec made.
+class PollHdlrHelpersSpec extends AnyFlatSpec {
+
+  import PollHdlrHelpers.selectValidAnswerIds
+
+  // A two-option question: valid indices are 0 and 1.
+  private val validAnswerIds = 0 until 2
+
+  it should "drop an id past the last option (999)" in {
+    assert(selectValidAnswerIds(Seq(999), multiResponse = false, validAnswerIds) == Seq.empty)
+  }
+
+  it should "drop a negative id (-1)" in {
+    assert(selectValidAnswerIds(Seq(-1), multiResponse = false, validAnswerIds) == Seq.empty)
+  }
+
+  it should "drop Int.MaxValue without an index-out-of-bounds crash" in {
+    assert(selectValidAnswerIds(Seq(2147483647), multiResponse = false, validAnswerIds) == Seq.empty)
+  }
+
+  it should "keep a valid id (0)" in {
+    assert(selectValidAnswerIds(Seq(0), multiResponse = false, validAnswerIds) == Seq(0))
+  }
+
+  it should "return empty for an empty vote (no-op)" in {
+    assert(selectValidAnswerIds(Seq.empty, multiResponse = false, validAnswerIds) == Seq.empty)
+  }
+
+  it should "keep every valid id when the question is multi-response" in {
+    assert(selectValidAnswerIds(Seq(0, 1), multiResponse = true, validAnswerIds) == Seq(0, 1))
+  }
+
+  it should "keep only the first id when the question is single-response" in {
+    assert(selectValidAnswerIds(Seq(0, 1), multiResponse = false, validAnswerIds) == Seq(0))
+  }
+
+  it should "drop a single-response vote whose first id is out of range" in {
+    // Single-response keeps only the head, then bounds-filters it: an
+    // out-of-range head leaves nothing, it does not fall through to a later id.
+    assert(selectValidAnswerIds(Seq(999, 0), multiResponse = false, validAnswerIds) == Seq.empty)
+  }
+
+  it should "drop every id when the question has no answers (empty valid range)" in {
+    // Mirrors the handler's answers=None path: with no answer options the valid
+    // range is empty, so nothing survives the filter.
+    val noOptions = 0 until 0
+    assert(selectValidAnswerIds(Seq(0, 1, 999), multiResponse = true, noOptions) == Seq.empty)
+  }
+
+  it should "collapse duplicate valid ids on a multi-response vote" in {
+    assert(selectValidAnswerIds(Seq(1, 1, 0), multiResponse = true, validAnswerIds) == Seq(1, 0))
+  }
+}

akka-bbb-fsesl/build.sbt

@@ -43,7 +43,7 @@ testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "html", "console",
 testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/scalatest-reports")
 
 Seq(Revolver.settings: _*)
-lazy val bbbFseslAkka = (project in file(".")).settings(name := "bbb-fsesl-akka", libraryDependencies ++= Dependencies.runtime).settings(compileSettings)
+lazy val bbbFseslAkka = (project in file(".")).settings(name := "bbb-fsesl-akka", libraryDependencies ++= Dependencies.runtime, dependencyOverrides ++= Dependencies.overrides).settings(compileSettings)
 
 // See https://github.com/scala-ide/scalariform
 // Config file is in ./.scalariform.conf

akka-bbb-fsesl/project/Dependencies.scala

@@ -14,10 +14,13 @@ object Dependencies {
     // Libraries
     val pekkoVersion = "1.0.1"
     val pekkoHttpVersion = "1.0.0"
-    val logback = "1.2.13"
+    val logback = "1.5.38"
+    val jackson = "2.18.9"
+    val netty = "4.1.135.Final"
+    val slf4j = "2.0.17"
 
     // Apache Commons
-    val lang = "3.12.0"
+    val lang = "3.18.0"
     val codec = "1.15"
 
     // BigBlueButton
@@ -83,4 +86,21 @@ object Dependencies {
     Compile.bbbFseslClient,
     Compile.pekkoHttp,
     Compile.pekkoHttpSprayJson) ++ testing
+
+  // Pin transitively-pulled artifacts to fixed releases; keep the jackson suite aligned.
+  val overrides = Seq(
+    "com.fasterxml.jackson.core" % "jackson-databind" % Versions.jackson,
+    "com.fasterxml.jackson.core" % "jackson-core" % Versions.jackson,
+    "com.fasterxml.jackson.core" % "jackson-annotations" % Versions.jackson,
+    "com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % Versions.jackson,
+    "com.fasterxml.jackson.module" %% "jackson-module-scala" % Versions.jackson,
+    "io.netty" % "netty-handler" % Versions.netty,
+    "io.netty" % "netty-codec" % Versions.netty,
+    "io.netty" % "netty-common" % Versions.netty,
+    "io.netty" % "netty-buffer" % Versions.netty,
+    "io.netty" % "netty-transport" % Versions.netty,
+    "io.netty" % "netty-resolver" % Versions.netty,
+    // logback 1.5.x is an slf4j-2.x provider; pin slf4j-api 2.x so the
+    // ServiceLoader binding resolves (pekko-slf4j is runtime-compatible).
+    "org.slf4j" % "slf4j-api" % Versions.slf4j)
 }

bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Meeting2x.scala

@@ -14,6 +14,7 @@ case class MeetingProp(
     intId:                                  String,
     meetingCameraCap:                       Int,
     sharedNotesInitialContentJson:          Vector[AnyRef],
+    sharedNotesInitialContentMarkdown:      String = "",
     sharedNotesEditor:                        String,
     maxPinnedCameras:                       Int,
     cameraBridge:                           String,

bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/PadsMsgs.scala

@@ -29,7 +29,7 @@ case class PadCreateReqMsgBody(externalId: String, name: String)
 // apps -> shared-notes-server
 object BNSharedNotesCreateCmdMsg { val NAME = "BNSharedNotesCreateCmdMsg" }
 case class BNSharedNotesCreateCmdMsg(header: BbbCoreHeaderWithMeetingId, body: BNSharedNotesCreateCmdMsgBody) extends BbbCoreMsg
-case class BNSharedNotesCreateCmdMsgBody(externalId: String, model: String, initialContentJson: Vector[AnyRef])
+case class BNSharedNotesCreateCmdMsgBody(externalId: String, model: String, initialContentJson: Vector[AnyRef], initialContentMarkdown: String = "")
 
 // shared-notes-server -> apps
 object BNSharedNotesCreatedEvtMsg { val NAME = "BNSharedNotesCreatedEvtMsg" }

bbb-common-web/src/main/java/org/bigbluebutton/api/ApiParams.java

@@ -24,6 +24,8 @@ public class ApiParams {
     public static final String ALLOW_START_STOP_RECORDING = "allowStartStopRecording";
     public static final String SHARED_NOTES_EDITOR = "sharedNotesEditor";
     public static final String SHARED_NOTES_INITIAL_CONTENT_JSON_URL = "sharedNotesInitialContentJsonUrl";
+    public static final String SHARED_NOTES_INITIAL_CONTENT_MARKDOWN = "sharedNotesInitialContentMarkdown";
+    public static final String SHARED_NOTES_INITIAL_CONTENT_MARKDOWN_URL = "sharedNotesInitialContentMarkdownUrl";
     public static final String ATTENDEE_PW = "attendeePW";
     public static final String AUTO_START_RECORDING = "autoStartRecording";
     public static final String BANNER_COLOR = "bannerColor";