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

using the userSecret to control the permissions for raise/lower hand

Browse Source
This commit is contained in:
Anton Georgiev 2014-11-13 15:04:51 -05:00
parent 65d858e737
commit c275778b19
3 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
labs/meteor-client/app/client/main.coffee
View File

@ -80,7 +80,7 @@ Template.header.events
"click .lowerHand": (event) ->
$(".tooltip").hide()
Meteor.call('userLowerHand', getInSession("meetingId"), getInSession("DBID"), getInSession("userId"), getInSession("DBID") )
Meteor.call('userLowerHand', getInSession("meetingId"), getInSession("userId"), getInSession("userId"), getInSession("userSecret"))
"click .muteIcon": (event) ->
$(".tooltip").hide()
@ -90,7 +90,7 @@ Template.header.events
#Meteor.log.info "navbar raise own hand from client"
console.log "navbar raise own hand from client"
$(".tooltip").hide()
Meteor.call('userRaiseHand', getInSession("meetingId"), getInSession("DBID"), getInSession("userId"), getInSession("DBID") )
Meteor.call('userRaiseHand', getInSession("meetingId"), getInSession("userId"), getInSession("userId"), getInSession("userSecret"))
# "click .settingsIcon": (event) ->
# alert "settings"

2
labs/meteor-client/app/client/views/users/user_item.coffee
View File

@ -8,4 +8,4 @@ Template.displayUserIcons.events
# the _id of the person whose land is to be lowered
# the userId of the person who is lowering the hand
console.log "lower hand- client click handler"
Meteor.call('userLowerHand', getInSession("meetingId"), @_id, getInSession("userId"), getInSession("DBID") )
Meteor.call('userLowerHand', getInSession("meetingId"), @userId, getInSession("userId"), getInSession("userSecret"))

62
labs/meteor-client/app/server/collection_methods/users.coffee
View File

@ -52,21 +52,17 @@ Meteor.methods
Meteor.log.info "did not have enough information to send a mute_user_request"
# meetingId: the meetingId which both users are in
# user_id: the _id of the user to have their hand lowered
# toLowerUserId: the userid of the user to have their hand lowered
# loweredByUserId: userId of person lowering
# loweredBy_id: _id of person lowering
userLowerHand: (meetingId, toLowerUser_Id, loweredByUserId, loweredBy_id) ->
requester = Meteor.Users.findOne({'meetingId': meetingId, 'userId': loweredByUserId, '_id': loweredBy_id})
if requester?
# Allow if person lowering the hand is the presenter, or they're lowering their own hand
unless requester.user.presenter or loweredBy_id is toLowerUser_Id or requester.role is "MODERATOR"
return
toLower = Meteor.Users.findOne({'meetingId': meetingId, '_id': toLowerUser_Id})
if toLower?
# loweredBySecret: the secret of the requestor
userLowerHand: (meetingId, toLowerUserId, loweredByUserId, loweredBySecret) ->
requester = Meteor.Users.findOne({meetingId:meetingId, userId: loweredByUserId})
if loweredBySecret is requester.userSecret
# check for permission:
if requester.user.role is "MODERATOR" or loweredByUserId is toLowerUserId # TODO make this const?
message =
"payload":
"userid": toLower.userId
"userid": toLowerUserId
"meeting_id": meetingId
"raise_hand": false
"lowered_by": loweredByUserId
@ -77,26 +73,28 @@ Meteor.methods
# publish to pubsub
publish Meteor.config.redis.channels.toBBBApps.users, message
return
else
Meteor.log.info "in meetingId=#{meetingId} userId=#{loweredByUserId} tried to lower the hand of userId=#{toLowerUserId} without permission"
else
Meteor.log.info "in meetingId=#{meetingId} userId=#{loweredByUserId} tried to lower the hand of userId=#{toLowerUserId} without permission"
return
# meetingId: the meetingId which both users are in
# user_id: the _id of the user to have their hand raised
# loweredByUserId: userId of person raising
# loweredBy_id: _id of person raising
userRaiseHand: (meetingId, user_id, raisedByUserId, raisedBy_id) ->
requester = Meteor.Users.findOne({'meetingId': meetingId, 'userId': raisedByUserId, '_id': raisedBy_id})
if requester?
# Allow if person raising the hand is the presenter, or they're raising their own hand
unless requester.user.presenter or raisedBy_id is user_id or requester.role is "MODERATOR"
return
toRaise = Meteor.Users.findOne({'meetingId': meetingId, '_id': user_id})
if toRaise?
# toRaiseUserId: the userid of the user to have their hand lowered
# raisedByUserId: userId of person lowering
# raisedBySecret: the secret of the requestor
userRaiseHand: (meetingId, toRaiseUserId, raisedByUserId, raisedBySecret) ->
requester = Meteor.Users.findOne({meetingId:meetingId, userId: raisedByUserId})
if raisedBySecret is requester.userSecret
# check for permission:
if raisedByUserId is toRaiseUserId # TODO make this const?
message =
"payload":
"userid": toRaise.userId
"userid": toRaiseUserId
"meeting_id": meetingId
"raise_hand": true
"raised_by": raisedByUserId
"raise_hand": false
"lowered_by": raisedByUserId
"header":
"timestamp": new Date().getTime()
"name": "user_raised_hand_message"
@ -104,6 +102,14 @@ Meteor.methods
# publish to pubsub
publish Meteor.config.redis.channels.toBBBApps.users, message
return
else
Meteor.log.info "in meetingId=#{meetingId} userId=#{raisedByUserId} tried to raise the hand of userId=#{toRaiseUserId} without permission"
else
Meteor.log.info "in meetingId=#{meetingId} userId=#{loweredByUserId} tried to raise the hand of userId=#{toLowerUserId} without permission"
return
userLogout: (meetingId, userId) ->
Meteor.log.info "a user is logging out from #{meetingId}:" + userId
@ -200,4 +206,4 @@ Meteor.methods
webcam_stream: user.webcam_stream
id = Meteor.Users.insert(entry)
Meteor.log.info "added user id=[#{id}]:#{user.name}. Users.size is now #{Meteor.Users.find({meetingId: meetingId}).count()}"
Meteor.log.info "added user userSecret=#{entry.userSecret} id=[#{id}]:#{user.name}. Users.size is now #{Meteor.Users.find({meetingId: meetingId}).count()}"