BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused ValidateConnAuthTokenSysMsg

Browse Source
This commit is contained in:
Gustavo Trott 2024-08-02 15:51:57 -03:00
parent 8623443704
commit 2073b07c5c
7 changed files with 3 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,7 +135,6 @@ class BigBlueButtonActor(
case m: CreateMeetingReqMsg => handleCreateMeetingReqMsg(m)
case m: RegisterUserReqMsg => handleRegisterUserReqMsg(m)
case m: CheckAlivePingSysMsg => handleCheckAlivePingSysMsg(m)
case m: ValidateConnAuthTokenSysMsg => handleValidateConnAuthTokenSysMsg(m)
case _: UserGraphqlConnectionEstablishedSysMsg => //Ignore
case _: UserGraphqlConnectionClosedSysMsg => //Ignore
case _: CheckGraphqlMiddlewareAlivePongSysMsg => //Ignore
@ -143,18 +142,6 @@ class BigBlueButtonActor(
}
}
def handleValidateConnAuthTokenSysMsg(msg: ValidateConnAuthTokenSysMsg): Unit = {
RunningMeetings.findWithId(meetings, msg.body.meetingId) match {
case Some(meeting) =>
meeting.actorRef forward msg
case None =>
val event = MsgBuilder.buildValidateConnAuthTokenSysRespMsg(msg.body.meetingId, msg.body.userId,
false, msg.body.connId, msg.body.app)
outGW.send(event)
}
}
def handleRegisterUserReqMsg(msg: RegisterUserReqMsg): Unit = {
log.debug("RECEIVED RegisterUserReqMsg msg {}", msg)
for {

30
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/meeting/ValidateConnAuthTokenSysMsgHdlr.scala
View File

@ -1,30 +0,0 @@
package org.bigbluebutton.core.apps.meeting
import org.bigbluebutton.common2.msgs.ValidateConnAuthTokenSysMsg
import org.bigbluebutton.core.models.RegisteredUsers
import org.bigbluebutton.core.running.{ LiveMeeting, OutMsgRouter }
import org.bigbluebutton.core2.message.senders.MsgBuilder
trait ValidateConnAuthTokenSysMsgHdlr {
val liveMeeting: LiveMeeting
val outGW: OutMsgRouter
def handleValidateConnAuthTokenSysMsg(msg: ValidateConnAuthTokenSysMsg): Unit = {
val regUser = RegisteredUsers.getRegisteredUserWithToken(
msg.body.authToken,
msg.body.userId,
liveMeeting.registeredUsers
)
regUser match {
case Some(u) =>
val event = MsgBuilder.buildValidateConnAuthTokenSysRespMsg(msg.body.meetingId, msg.body.userId,
true, msg.body.connId, msg.body.app)
outGW.send(event)
case None =>
val event = MsgBuilder.buildValidateConnAuthTokenSysRespMsg(msg.body.meetingId, msg.body.userId,
false, msg.body.connId, msg.body.app)
outGW.send(event)
}
}
}

2
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
View File

@ -67,8 +67,6 @@ class ReceivedJsonMsgHandlerActor(
route[DestroyMeetingSysCmdMsg](meetingManagerChannel, envelope, jsonNode)
case EjectUserFromMeetingSysMsg.NAME =>
routeGenericMsg[EjectUserFromMeetingSysMsg](envelope, jsonNode)
case ValidateConnAuthTokenSysMsg.NAME =>
route[ValidateConnAuthTokenSysMsg](meetingManagerChannel, envelope, jsonNode)
// Guests
case GetGuestsWaitingApprovalReqMsg.NAME =>

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

@ -38,7 +38,6 @@ import org.bigbluebutton.ClientSettings.{ getConfigPropertyValueByPathAsBooleanO
import org.bigbluebutton.common2.msgs
import scala.concurrent.duration._
import org.bigbluebutton.core.apps.layout.LayoutApp2x
import org.bigbluebutton.core.apps.meeting.ValidateConnAuthTokenSysMsgHdlr
import org.bigbluebutton.core.apps.plugin.PluginHdlrs
import org.bigbluebutton.core.apps.users.ChangeLockSettingsInMeetingCmdMsgHdlr
import org.bigbluebutton.core.db.{ MeetingDAO, NotificationDAO, TimerDAO, UserStateDAO }
@ -91,7 +90,6 @@ class MeetingActor(
with DestroyMeetingSysCmdMsgHdlr
with ChangeLockSettingsInMeetingCmdMsgHdlr
with ClientToServerLatencyTracerMsgHdlr
with ValidateConnAuthTokenSysMsgHdlr
with UserActivitySignCmdMsgHdlr {
object CheckVoiceRecordingInternalMsg
@ -265,7 +263,6 @@ class MeetingActor(
// Handling RegisterUserReqMsg as it is forwarded from BBBActor and
// its type is not BbbCommonEnvCoreMsg
case m: RegisterUserReqMsg => usersApp.handleRegisterUserReqMsg(m)
case m: ValidateConnAuthTokenSysMsg => handleValidateConnAuthTokenSysMsg(m)
//API Msgs
case m: GetUserApiMsg => usersApp.handleGetUserApiMsg(m, sender)
@ -764,11 +761,9 @@ class MeetingActor(
timerApp2x.handle(m, liveMeeting, msgBus)
updateUserLastActivity(m.header.userId)
case m: ValidateConnAuthTokenSysMsg => handleValidateConnAuthTokenSysMsg(m)
case m: UserActivitySignCmdMsg => handleUserActivitySignCmdMsg(m)
case m: UserActivitySignCmdMsg => handleUserActivitySignCmdMsg(m)
case _ => log.warning("***** Cannot handle " + msg.envelope.name)
case _ => log.warning("***** Cannot handle " + msg.envelope.name)
}
}

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

@ -161,8 +161,6 @@ class AnalyticsActor(val includeChat: Boolean) extends Actor with ActorLogging {
// System
case m: ClientToServerLatencyTracerMsg => traceMessage(msg)
case m: ServerToClientLatencyTracerMsg => traceMessage(msg)
case m: ValidateConnAuthTokenSysMsg => traceMessage(msg)
case m: ValidateConnAuthTokenSysRespMsg => traceMessage(msg)
// Recording
case m: RecordingChapterBreakSysMsg => logMessage(msg)

12
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/MsgBuilder.scala
View File

@ -1,7 +1,7 @@
package org.bigbluebutton.core2.message.senders
import org.bigbluebutton.common2.domain.DefaultProps
import org.bigbluebutton.common2.msgs.{ BbbCommonEnvCoreMsg, BbbCoreEnvelope, BbbCoreHeaderWithMeetingId, MessageTypes, NotifyAllInMeetingEvtMsg, NotifyAllInMeetingEvtMsgBody, NotifyRoleInMeetingEvtMsg, NotifyRoleInMeetingEvtMsgBody, NotifyUserInMeetingEvtMsg, NotifyUserInMeetingEvtMsgBody, Routing, ValidateConnAuthTokenSysRespMsg, ValidateConnAuthTokenSysRespMsgBody, _ }
import org.bigbluebutton.common2.msgs.{ BbbCommonEnvCoreMsg, BbbCoreEnvelope, BbbCoreHeaderWithMeetingId, MessageTypes, NotifyAllInMeetingEvtMsg, NotifyAllInMeetingEvtMsgBody, NotifyRoleInMeetingEvtMsg, NotifyRoleInMeetingEvtMsgBody, NotifyUserInMeetingEvtMsg, NotifyUserInMeetingEvtMsgBody, Routing, _ }
import org.bigbluebutton.core.models.{ GuestWaiting, PresentationPod }
object MsgBuilder {
@ -97,16 +97,6 @@ object MsgBuilder {
BbbCommonEnvCoreMsg(envelope, event)
}
def buildValidateConnAuthTokenSysRespMsg(meetingId: String, userId: String,
authzed: Boolean, connId: String, app: String): BbbCommonEnvCoreMsg = {
val routing = Routing.addMsgToClientRouting(MessageTypes.DIRECT, meetingId, userId)
val envelope = BbbCoreEnvelope(ValidateConnAuthTokenSysRespMsg.NAME, routing)
val header = BbbCoreHeaderWithMeetingId(ValidateConnAuthTokenSysRespMsg.NAME, meetingId)
val body = ValidateConnAuthTokenSysRespMsgBody(meetingId, userId, connId, authzed, app)
val event = ValidateConnAuthTokenSysRespMsg(header, body)
BbbCommonEnvCoreMsg(envelope, event)
}
def buildPresenterAssignedEvtMsg(meetingId: String, intId: String, name: String, assignedBy: String): BbbCommonEnvCoreMsg = {
val routing = Routing.addMsgToClientRouting(MessageTypes.BROADCAST_TO_MEETING, meetingId, intId)
val envelope = BbbCoreEnvelope(PresenterAssignedEvtMsg.NAME, routing)

16
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/SystemMsgs.scala
View File

@ -148,22 +148,6 @@ case class RecordingChapterBreakSysMsg(
) extends BbbCoreMsg
case class RecordingChapterBreakSysMsgBody(meetingId: String, timestamp: Long)
object ValidateConnAuthTokenSysMsg { val NAME = "ValidateConnAuthTokenSysMsg" }
case class ValidateConnAuthTokenSysMsg(
header: BbbCoreBaseHeader,
body: ValidateConnAuthTokenSysMsgBody
) extends BbbCoreMsg
case class ValidateConnAuthTokenSysMsgBody(meetingId: String, userId: String, authToken: String,
connId: String, app: String)
object ValidateConnAuthTokenSysRespMsg { val NAME = "ValidateConnAuthTokenSysRespMsg" }
case class ValidateConnAuthTokenSysRespMsg(
header: BbbCoreHeaderWithMeetingId,
body: ValidateConnAuthTokenSysRespMsgBody
) extends BbbCoreMsg
case class ValidateConnAuthTokenSysRespMsgBody(meetingId: String, userId: String,
connId: String, authzed: Boolean, app: String)
object PublishedRecordingSysMsg { val NAME = "PublishedRecordingSysMsg" }
case class PublishedRecordingSysMsg(header: BbbCoreBaseHeader, body: PublishedRecordingSysMsgBody) extends BbbCoreMsg
case class PublishedRecordingSysMsgBody(recordId: String)