Use runuser instead of sudo

.github/workflows/automated-tests.yml

@@ -13,6 +13,7 @@ on:
     paths-ignore:
       - "docs/**"
       - "**/*.md"
+      - "bigbluebutton-html5/public/locales/*.json"
 permissions:
   contents: read
 concurrency:
@@ -53,7 +54,7 @@ jobs:
             build-list: bbb-playback bbb-playback-notes bbb-playback-podcast bbb-playback-presentation bbb-playback-screenshare bbb-playback-video bbb-record-core
           - package: bbb-graphql-server
             build-name: bbb-graphql-server
-            build-list: bbb-graphql-server bbb-graphql-middleware
+            build-list: bbb-graphql-server bbb-graphql-middleware bbb-graphql-actions-adapter-server
           - package: bbb-etherpad
             cache-files-list: bbb-etherpad.placeholder.sh
             cache-urls-list: https://api.github.com/repos/mconf/ep_pad_ttl/commits https://api.github.com/repos/alangecker/bbb-etherpad-plugin/commits https://api.github.com/repos/mconf/ep_redis_publisher/commits https://api.github.com/repos/alangecker/bbb-etherpad-skin/commits
@@ -252,17 +253,23 @@ jobs:
           apt --purge -y remove apache2-bin
           '
       - name: Install BBB
-        timeout-minutes: 15
+        timeout-minutes: 25
         run: |
           sudo -i <<EOF
           set -e
-          cd /root/ && wget -nv https://raw.githubusercontent.com/bigbluebutton/bbb-install/v2.8.x-release/bbb-install.sh -O bbb-install.sh
-          cat bbb-install.sh | sed "s|> /etc/apt/sources.list.d/bigbluebutton.list||g" | bash -s -- -v jammy-28-develop -s bbb-ci.test -j -d /certs/
+          cd /root/ && wget -nv https://raw.githubusercontent.com/bigbluebutton/bbb-install/v3.0.x-release/bbb-install.sh -O bbb-install.sh
+          cat bbb-install.sh | sed "s|> /etc/apt/sources.list.d/bigbluebutton.list||g" | bash -s -- -v jammy-30-dev -s bbb-ci.test -j -d /certs/
           bbb-conf --salt bbbci
           echo "NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/bbb-dev/bbb-dev-ca.crt" >> /usr/share/meteor/bundle/bbb-html5-with-roles.conf
           sed -i "s/\"minify\": true,/\"minify\": false,/" /usr/share/etherpad-lite/settings.json
           bbb-conf --restart
           EOF
+      - name: List systemctl services
+        timeout-minutes: 1
+        run: |
+          sudo -i <<EOF
+          systemctl --type=service --state=running,exited,failed --all --no-pager --no-legend
+          EOF
       - name: Install test dependencies
         working-directory: ./bigbluebutton-tests/playwright
         run: |

.gitlab-ci.yml

@@ -12,7 +12,7 @@ stages:
 
 # define which docker image to use for builds
 default:
-  image: bigbluebutton/bbb-build:bbb28-2023-07-18
+  image: bigbluebutton/bbb-build:v3.0.x-release--2023-09-26-152524
 
 # This stage uses git to find out since when each package has been unmodified.
 # it then checks an API endpoint on the package server to find out for which of

SECURITY.md

@@ -9,7 +9,7 @@ We actively support BigBlueButton through the community forums and through secur
 | 2.5.x (or earlier)  | :x:    |
 | 2.6.x   | :white_check_mark: |
 | 2.7.x   | :white_check_mark: |
-| 2.8.x   | :x: |
+| 3.0.x   | :x: |
 
 We have released 2.7 to the community and are going to support both 2.6 and 2.7 together for the coming months (while we're actively developing the next release).  Also, BigBlueButton 2.5 is now end of life.
 

akka-bbb-apps/project/Dependencies.scala

@@ -1,7 +1,6 @@
 package org.bigbluebutton.build
 
 import sbt._
-import Keys._
 
 object Dependencies {
 
@@ -37,6 +36,7 @@ object Dependencies {
     val scalaTest = "3.2.11"
     val mockito = "2.23.0"
     val akkaTestKit = "2.6.0"
+    val jacksonDataFormat = "2.13.5"
   }
 
   object Compile {
@@ -64,7 +64,11 @@ object Dependencies {
     val slick = "com.typesafe.slick" %% "slick" % Versions.slick
     val slickHikaricp = "com.typesafe.slick" %% "slick-hikaricp" % Versions.slick
     val slickPg = "com.github.tminglei" %% "slick-pg" % Versions.slickPg
+    val slickPgSprayJson = "com.github.tminglei" %% "slick-pg_spray-json" % Versions.slickPg
+
     val postgresql = "org.postgresql" % "postgresql" % Versions.postgresql
+    val jacksonDataFormat = "com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % Versions.jacksonDataFormat
+    val snakeYaml = "org.yaml" % "snakeyaml"
   }
 
   object Test {
@@ -101,5 +105,7 @@ object Dependencies {
     Compile.slick,
     Compile.slickHikaricp,
     Compile.slickPg,
-    Compile.postgresql) ++ testing
+    Compile.slickPgSprayJson,
+    Compile.postgresql,
+    Compile.jacksonDataFormat) ++ testing
 }

akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala

@@ -4,17 +4,15 @@ import org.apache.pekko.actor.ActorSystem
 import org.apache.pekko.event.Logging
 import org.apache.pekko.http.scaladsl.Http
 import org.apache.pekko.stream.ActorMaterializer
-import org.bigbluebutton.common2.redis.{ MessageSender, RedisConfig, RedisPublisher }
+import org.bigbluebutton.common2.redis.{MessageSender, RedisConfig, RedisPublisher}
 import org.bigbluebutton.core._
 import org.bigbluebutton.core.bus._
 import org.bigbluebutton.core.pubsub.senders.ReceivedJsonMsgHandlerActor
 import org.bigbluebutton.core2.AnalyticsActor
 import org.bigbluebutton.core2.FromAkkaAppsMsgSenderActor
-import org.bigbluebutton.endpoint.redis.AppsRedisSubscriberActor
-import org.bigbluebutton.endpoint.redis.{ RedisRecorderActor, ExportAnnotationsActor }
-import org.bigbluebutton.endpoint.redis.LearningDashboardActor
+import org.bigbluebutton.endpoint.redis.{AppsRedisSubscriberActor, ExportAnnotationsActor, GraphqlActionsActor, LearningDashboardActor, RedisRecorderActor}
 import org.bigbluebutton.common2.bus.IncomingJsonMessageBus
-import org.bigbluebutton.service.{ HealthzService, MeetingInfoActor, MeetingInfoService }
+import org.bigbluebutton.service.{HealthzService, MeetingInfoActor, MeetingInfoService}
 
 object Boot extends App with SystemConfiguration {
 
@@ -69,6 +67,12 @@ object Boot extends App with SystemConfiguration {
     "LearningDashboardActor"
   )
 
+  val graphqlActionsActor = system.actorOf(
+    GraphqlActionsActor.props(system),
+    "GraphqlActionsActor"
+  )
+
+  ClientSettings.loadClientSettingsFromFile()
   recordingEventBus.subscribe(redisRecorderActor, outMessageChannel)
   val incomingJsonMessageBus = new IncomingJsonMessageBus
 
@@ -85,6 +89,9 @@ object Boot extends App with SystemConfiguration {
   outBus2.subscribe(learningDashboardActor, outBbbMsgMsgChannel)
   bbbMsgBus.subscribe(learningDashboardActor, analyticsChannel)
 
+  eventBus.subscribe(graphqlActionsActor, meetingManagerChannel)
+  bbbMsgBus.subscribe(graphqlActionsActor, analyticsChannel)
+
   val bbbActor = system.actorOf(BigBlueButtonActor.props(system, eventBus, bbbMsgBus, outGW, healthzService), "bigbluebutton-actor")
   eventBus.subscribe(bbbActor, meetingManagerChannel)
 

akka-bbb-apps/src/main/scala/org/bigbluebutton/ClientSettings.scala

@@ -0,0 +1,118 @@
+package org.bigbluebutton
+
+import org.bigbluebutton.common2.util.YamlUtil
+import org.slf4j.LoggerFactory
+
+import java.io.{ ByteArrayInputStream, File }
+import scala.io.BufferedSource
+import scala.util.{ Failure, Success, Try }
+
+object ClientSettings extends SystemConfiguration {
+  var clientSettingsFromFile: Map[String, Object] = Map("" -> "")
+  val logger = LoggerFactory.getLogger(this.getClass)
+
+  def loadClientSettingsFromFile() = {
+    val clientSettingsFile = scala.io.Source.fromFile(clientSettingsPath, "UTF-8")
+
+    val clientSettingsFileOverrideToCheck = new File(clientSettingsPathOverride)
+
+    val clientSettingsFileOverride = if (clientSettingsFileOverrideToCheck.exists())
+      scala.io.Source.fromFile(
+        clientSettingsPathOverride,
+        "UTF-8"
+      )
+    else new BufferedSource(new ByteArrayInputStream(Array[Byte]()))
+
+    clientSettingsFromFile =
+      common2.util.YamlUtil.mergeImmutableMaps(
+        common2.util.YamlUtil.toMap[Object](clientSettingsFile.mkString) match {
+          case Success(value) => value
+          case Failure(exception) =>
+            println("Error while fetching client Settings: ", exception)
+            Map[String, Object]()
+        },
+        common2.util.YamlUtil.toMap[Object](clientSettingsFileOverride.mkString) match {
+          case Success(value) => value
+          case Failure(exception) =>
+            println("Error while fetching client override Settings: ", exception)
+            Map[String, Object]()
+        }
+      )
+  }
+
+  def getClientSettingsWithOverride(clientSettingsOverrideJson: String): Map[String, Object] = {
+    if (clientSettingsOverrideJson.nonEmpty) {
+      val scalaMapClientOverride = common2.util.JsonUtil.toMap[Object](clientSettingsOverrideJson)
+      scalaMapClientOverride match {
+        case Success(clientSettingsOverrideAsMap) => YamlUtil.mergeImmutableMaps(clientSettingsFromFile, clientSettingsOverrideAsMap)
+        case Failure(msg) =>
+          logger.debug("No valid JSON override of client configuration in create call: {}", msg)
+          clientSettingsFromFile
+      }
+    } else clientSettingsFromFile
+  }
+
+  def getConfigPropertyValueByPath(map: Map[String, Any], path: String): Option[Any] = {
+    val keys = path.split("\\.")
+
+    def getRecursive(map: Map[String, Any], keys: Seq[String]): Option[Any] = {
+      keys match {
+        case Seq(head, tail @ _*) =>
+          map.get(head) match {
+            case Some(innerMap: Map[String, Any]) => getRecursive(innerMap, tail)
+            case otherValue if tail.isEmpty       => otherValue
+            case _                                => None
+          }
+        case _ => None
+      }
+    }
+
+    getRecursive(map, keys)
+  }
+
+  def getPluginsFromConfig(config: Map[String, Any]): Map[String, Plugin] = {
+    var pluginsFromConfig: Map[String, Plugin] = Map()
+
+    val pluginsConfig = getConfigPropertyValueByPath(config, "public.plugins")
+    pluginsConfig match {
+      case Some(plugins: List[Map[String, Any]]) =>
+        for {
+          plugin <- plugins
+        } yield {
+          if (plugin.contains("name") && plugin.contains("url")) {
+
+            val pluginName = plugin("name").toString
+            val pluginUrl = plugin("url").toString
+            var pluginDataChannels: Map[String, DataChannel] = Map()
+            if (plugin.contains("dataChannels")) {
+              plugin("dataChannels") match {
+                case dataChannels: List[Map[String, Any]] =>
+                  for {
+                    dataChannel <- dataChannels
+                  } yield {
+                    if (dataChannel.contains("name") && dataChannel.contains("writePermission")) {
+                      val channelName = dataChannel("name").toString
+                      val writePermission = dataChannel("writePermission")
+                      writePermission match {
+                        case wPerm: List[String] => pluginDataChannels += (channelName -> DataChannel(channelName, wPerm))
+                        case _                   => logger.warn(s"Invalid writePermission for channel $channelName in plugin $pluginName")
+                      }
+                    }
+                  }
+                case _ => logger.warn(s"Plugin $pluginName has an invalid dataChannels format")
+              }
+            }
+
+            pluginsFromConfig += (pluginName -> Plugin(pluginName, pluginUrl, pluginDataChannels))
+          }
+        }
+      case _ => logger.warn(s"Invalid plugins config found.")
+    }
+
+    pluginsFromConfig
+  }
+
+  case class DataChannel(name: String, writePermission: List[String])
+  case class Plugin(name: String, url: String, dataChannels: Map[String, DataChannel])
+
+}

akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala

@@ -1,6 +1,9 @@
 package org.bigbluebutton
 
-import scala.util.Try
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
+
+import scala.util.{ Failure, Success, Try }
 import com.typesafe.config.ConfigFactory
 
 trait SystemConfiguration {
@@ -77,6 +80,13 @@ trait SystemConfiguration {
 
   lazy val analyticsIncludeChat = Try(config.getBoolean("analytics.includeChat")).getOrElse(true)
 
+  lazy val clientSettingsPath = Try(config.getString("client.clientSettingsFilePath")).getOrElse(
+    "/usr/share/meteor/bundle/programs/server/assets/app/config/settings.yml"
+  )
+  lazy val clientSettingsPathOverride = Try(config.getString("client.clientSettingsOverrideFilePath")).getOrElse(
+    "/etc/bigbluebutton/bbb-html5.yml"
+  )
+
   // Grab the "interface" parameter from the http config
   val httpHost = config.getString("http.interface")
   // Grab the "port" parameter from the http config

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

@@ -75,13 +75,15 @@ class BigBlueButtonActor(
   private def handleBbbCommonEnvCoreMsg(msg: BbbCommonEnvCoreMsg): Unit = {
     msg.core match {
 
-      case m: CreateMeetingReqMsg         => handleCreateMeetingReqMsg(m)
-      case m: RegisterUserReqMsg          => handleRegisterUserReqMsg(m)
-      case m: GetAllMeetingsReqMsg        => handleGetAllMeetingsReqMsg(m)
-      case m: GetRunningMeetingsReqMsg    => handleGetRunningMeetingsReqMsg(m)
-      case m: CheckAlivePingSysMsg        => handleCheckAlivePingSysMsg(m)
-      case m: ValidateConnAuthTokenSysMsg => handleValidateConnAuthTokenSysMsg(m)
-      case _                              => log.warning("Cannot handle " + msg.envelope.name)
+      case m: CreateMeetingReqMsg                   => handleCreateMeetingReqMsg(m)
+      case m: RegisterUserReqMsg                    => handleRegisterUserReqMsg(m)
+      case m: GetAllMeetingsReqMsg                  => handleGetAllMeetingsReqMsg(m)
+      case m: GetRunningMeetingsReqMsg              => handleGetRunningMeetingsReqMsg(m)
+      case m: CheckAlivePingSysMsg                  => handleCheckAlivePingSysMsg(m)
+      case m: ValidateConnAuthTokenSysMsg           => handleValidateConnAuthTokenSysMsg(m)
+      case _: UserGraphqlConnectionStablishedSysMsg => //Ignore
+      case _: UserGraphqlConnectionClosedSysMsg     => //Ignore
+      case _                                        => log.warning("Cannot handle " + msg.envelope.name)
     }
   }
 

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

@@ -16,15 +16,15 @@ object TimerModel {
 
   def reset(model: TimerModel) : Unit = {
     model.accumulated = 0
-    model.startedAt = 0
+    model.startedAt = if (model.running) System.currentTimeMillis() else 0
     model.endedAt = 0
   }
 
   def setIsActive(model: TimerModel, active: Boolean): Unit = {
     model.isActive = active
   }
 
-  def getIsACtive(model: TimerModel): Boolean = {
+  def getIsActive(model: TimerModel): Boolean = {
     model.isActive
   }
 

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/audiocaptions/UpdateTranscriptPubMsgHdlr.scala

@@ -2,8 +2,8 @@ package org.bigbluebutton.core.apps.audiocaptions
 
 import org.bigbluebutton.common2.msgs._
 import org.bigbluebutton.core.bus.MessageBus
-import org.bigbluebutton.core.db.AudioCaptionDAO
-import org.bigbluebutton.core.models.AudioCaptions
+import org.bigbluebutton.core.db.CaptionDAO
+import org.bigbluebutton.core.models.{AudioCaptions, Users2x}
 import org.bigbluebutton.core.running.LiveMeeting
 
 import java.sql.Timestamp
@@ -66,7 +66,12 @@ trait UpdateTranscriptPubMsgHdlr {
 
       val transcript = AudioCaptions.parseTranscript(msg.body.transcript)
 
-      AudioCaptionDAO.insertOrUpdateAudioCaption(msg.body.transcriptId, meetingId, msg.header.userId, transcript, new Timestamp(System.currentTimeMillis()))
+
+      for {
+        u <- Users2x.findWithIntId(liveMeeting.users2x, msg.header.userId)
+      } yield {
+        CaptionDAO.insertOrUpdateAudioCaption(msg.body.transcriptId, meetingId, msg.header.userId, transcript, u.speechLocale)
+      }
 
       broadcastEvent(
         msg.header.userId,

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/CreateBreakoutRoomsCmdMsgHdlr.scala

@@ -70,7 +70,7 @@ trait CreateBreakoutRoomsCmdMsgHdlr extends RightsManagementTrait {
         breakout.freeJoin,
         liveMeeting.props.voiceProp.dialNumber,
         breakout.voiceConf,
-        msg.body.durationInMinutes * 60,
+        msg.body.durationInMinutes,
         liveMeeting.props.password.moderatorPass,
         liveMeeting.props.password.viewerPass,
         presId, presSlide, msg.body.record,

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/UpdateBreakoutRoomsTimeMsgHdlr.scala

@@ -4,7 +4,7 @@ import org.bigbluebutton.common2.msgs._
 import org.bigbluebutton.core.api.{ SendTimeRemainingAuditInternalMsg, UpdateBreakoutRoomTimeInternalMsg }
 import org.bigbluebutton.core.apps.{ PermissionCheck, RightsManagementTrait }
 import org.bigbluebutton.core.bus.BigBlueButtonEvent
-import org.bigbluebutton.core.db.BreakoutRoomDAO
+import org.bigbluebutton.core.db.{ BreakoutRoomDAO, MeetingDAO }
 import org.bigbluebutton.core.domain.MeetingState2x
 import org.bigbluebutton.core.running.{ MeetingActor, OutMsgRouter }
 import org.bigbluebutton.core2.message.senders.{ MsgBuilder, Sender }
@@ -78,6 +78,7 @@ trait UpdateBreakoutRoomsTimeMsgHdlr extends RightsManagementTrait {
 
           log.debug("Updating {} minutes for breakout rooms time in meeting {}", msg.body.timeInMinutes, props.meetingProp.intId)
           BreakoutRoomDAO.updateRoomsDuration(props.meetingProp.intId, newDurationInSeconds)
+          MeetingDAO.updateMeetingDurationByParentMeeting(props.meetingProp.intId, newDurationInSeconds)
           breakoutModel.setTime(newDurationInSeconds)
         }
       }

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

@@ -2,6 +2,7 @@ package org.bigbluebutton.core.apps.pads
 
 import org.bigbluebutton.common2.msgs._
 import org.bigbluebutton.core.bus.MessageBus
+import org.bigbluebutton.core.db.CaptionDAO
 import org.bigbluebutton.core.models.Pads
 import org.bigbluebutton.core.running.LiveMeeting
 
@@ -40,6 +41,7 @@ trait PadPatchSysMsgHdlr {
           broadcastEditCaptionHistoryEvent(msg.body.userId, msg.body.start, msg.body.end, group.name, locale, msg.body.text)
           val tail = liveMeeting.captionModel.getTextTail(group.name)
           broadcastPadTailEvent(group.externalId, tail)
+          CaptionDAO.insertOrUpdatePadCaption(liveMeeting.props.meetingProp.intId, locale, msg.body.userId, tail)
         }
       }
       case _ =>