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

move presentation upload token to presentationPods

Browse Source
This commit is contained in:
Anton Georgiev 2017-11-03 13:55:44 -04:00
parent 4b3dd41c13
commit 57bd43f8a8
3 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationUploadTokenReqMsgHdlr.scala
View File

@ -1,51 +1,18 @@
package org.bigbluebutton.core.apps.presentation
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.core.apps.presentationpod.PresentationPodsApp
import org.bigbluebutton.core.bus.MessageBus
import org.bigbluebutton.core.domain.MeetingState2x
import org.bigbluebutton.core.models.Users2x
import org.bigbluebutton.core.running.LiveMeeting
import org.bigbluebutton.core.util.RandomStringGenerator
trait PresentationUploadTokenReqMsgHdlr {
this: PresentationApp2x =>
def handle(
msg: PresentationUploadTokenReqMsg,
liveMeeting: LiveMeeting, bus: MessageBus
): Unit = {
def handle(msg: PresentationUploadTokenReqMsg, state: MeetingState2x,
liveMeeting: LiveMeeting, bus: MessageBus): Unit = {
// TODO move these in Pods
def generateToken(podId: String, userId: String): String = {
"LALA-" + RandomStringGenerator.randomAlphanumericString(8) + podId + "-" + userId
}
def userIsAllowedToUploadInPod(podId: String, userId: String): Boolean = {
true
}
def handlePresentationUploadTokenReqMsg(msg: PresentationUploadTokenReqMsg): Unit = {
log.info("handlePresentationUploadTokenReqMsg" + liveMeeting.props.meetingProp.intId +
" userId=" + msg.header.userId + " filename=" + msg.body.filename)
/* for {
// pod <- findPodWithId(msg.body.podId)
token <- generateToken(msg.body.podId, msg.header.userId)
} yield {
broadcastEvent(msg, token)
} */
if (userIsAllowedToUploadInPod(msg.body.podId, msg.header.userId)) {
val token = generateToken(msg.body.podId, msg.header.userId)
broadcastPresentationUploadTokenPassResp(msg, token)
broadcastPresentationUploadTokenSysPubMsg(msg, token)
} else {
broadcastPresentationUploadTokenFailResp(msg)
}
}
handlePresentationUploadTokenReqMsg(msg)
// helpers
def broadcastPresentationUploadTokenPassResp(msg: PresentationUploadTokenReqMsg, token: String): Unit = {
// send back to client
val routing = Routing.addMsgToClientRouting(MessageTypes.DIRECT, liveMeeting.props.meetingProp.intId, msg.header.userId)
@ -82,6 +49,29 @@ trait PresentationUploadTokenReqMsgHdlr {
bus.outGW.send(msgEvent)
}
def userIsAllowedToUploadInPod(podId: String, userId: String): Boolean = {
if (Users2x.userIsInPresenterGroup(liveMeeting.users2x, userId)) {
for {
pod <- PresentationPodsApp.getPresentationPod(state, podId)
} yield {
return pod.currentPresenter == userId
}
}
false
}
log.info("handlePresentationUploadTokenReqMsg" + liveMeeting.props.meetingProp.intId +
" userId=" + msg.header.userId + " filename=" + msg.body.filename)
if (userIsAllowedToUploadInPod(msg.body.podId, msg.header.userId)) {
val token = PresentationPodsApp.generateToken(msg.body.podId, msg.header.userId)
broadcastPresentationUploadTokenPassResp(msg, token)
broadcastPresentationUploadTokenSysPubMsg(msg, token)
} else {
broadcastPresentationUploadTokenFailResp(msg)
}
}
}

5
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPodsApp.scala
View File

@ -3,6 +3,7 @@ package org.bigbluebutton.core.apps.presentationpod
import org.bigbluebutton.common2.domain._
import org.bigbluebutton.core.domain._
import org.bigbluebutton.core.models._
import org.bigbluebutton.core.util.RandomStringGenerator
object PresentationPodsApp {
@ -75,5 +76,9 @@ object PresentationPodsApp {
defPod.copy(ownerId = newOwnerId)
}
}
def generateToken(podId: String, userId: String): String = {
"LALA-" + RandomStringGenerator.randomAlphanumericString(8) + podId + "-" + userId
}
}

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

@ -289,7 +289,7 @@ class MeetingActor(
// Presentation
case m: ResizeAndMovePagePubMsg => presentationApp2x.handle(m, liveMeeting, msgBus)
case m: PresentationUploadTokenReqMsg => presentationApp2x.handle(m, liveMeeting, msgBus)
case m: PresentationUploadTokenReqMsg => presentationApp2x.handle(m, state, liveMeeting, msgBus) // passing state but not modifying it
case m: PreuploadedPresentationsSysPubMsg => presentationApp2x.handle(m, liveMeeting, msgBus)
case m: PresentationConversionUpdateSysPubMsg => presentationApp2x.handle(m, liveMeeting, msgBus)
case m: PresentationPageCountErrorSysPubMsg => presentationApp2x.handle(m, liveMeeting, msgBus)