change checksum handling & show active meetings

This commit is contained in:
Josh 2017-06-07 11:06:31 -04:00
parent 24c8952e59
commit f5095b1e4d
7 changed files with 195 additions and 10 deletions

View File

@ -19,7 +19,7 @@
width: 100px;
}
.previously-joined {
.previously-joined, .actives {
list-style-type: none;
margin:auto;
width: 200px;

View File

@ -0,0 +1,21 @@
# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
#
# Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
#
# This program is free software; you can redistribute it and/or modify it under the
# terms of the GNU Lesser General Public License as published by the Free Software
# Foundation; either version 3.0 of the License, or (at your option) any later
# version.
#
# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License along
# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
class RefreshMeetingsChannel < ApplicationCable::Channel
def subscribed
stream_from "refresh_meetings"
end
end

View File

@ -111,8 +111,8 @@ class BbbController < ApplicationController
head(:ok) && return unless validate_checksum
begin
data = JSON.parse(read_body(request))
treat_callback_event(data["event"])
data = JSON.parse(params['event'])
treat_callback_event(data)
rescue Exception => e
logger.error "Error parsing webhook data. Data: #{data}, exception: #{e.inspect}"
@ -242,6 +242,15 @@ class BbbController < ApplicationController
else
logger.error "Bad format for event #{event}, won't process"
end
elsif eventName == "meeting_created_message"
# Fire an Actioncable event that updates _previously_joined for the client.
actioncable_event('create', params['id'])
elsif eventName == "meeting_destroyed_event"
actioncable_event('destroy', params['id'])
elsif eventName == "user_joined_message"
actioncable_event('join', params['id'], event['payload']['user']['role'])
elsif eventName == "user_left_message"
actioncable_event('leave', params['id'], event['payload']['user']['role'])
else
logger.info "Callback event will not be treated. Event name: #{eventName}"
end
@ -249,15 +258,31 @@ class BbbController < ApplicationController
render head(:ok) && return
end
def actioncable_event(method, id, role = 'none')
ActionCable.server.broadcast 'refresh_meetings',
method: method,
meeting: id,
role: role
end
# Validates the checksum received in a callback call.
# If the checksum doesn't match, renders an ok and aborts execution.
def validate_checksum
secret = ENV['BIGBLUEBUTTON_SECRET']
checksum = params["checksum"]
data = read_body(request)
# Decode and break the body into parts.
parts = URI.decode_www_form(read_body(request))
# Convert the data into the correct checksum format, replace ruby hash arrows.
converted_data = {parts[0][0]=>parts[0][1],parts[1][0]=>parts[1][1].to_i}.to_s.gsub!('=>', ':')
# Manually remove the space between the two elements.
converted_data[converted_data.rindex("timestamp") - 2] = ''
callback_url = uri_remove_param(request.original_url, "checksum")
checksum_str = "#{callback_url}#{data}#{secret}"
checksum_str = "#{callback_url}#{converted_data}#{secret}"
calculated_checksum = Digest::SHA1.hexdigest(checksum_str)
if calculated_checksum != checksum

View File

@ -34,6 +34,10 @@ class LandingController < ApplicationController
end
end
def send_data
render json: bbb.get_meetings
end
def wait_for_moderator
render layout: false
end

View File

@ -13,9 +13,142 @@
# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
%>
<div class="previously-joined-wrapper hidden">
<div class="list-group text-center">
<h4><%= t('previous_meetings') %></h4>
<ul class="previously-joined"></ul>
<% if current_user %>
<div class="previously-joined-wrapper hidden">
<div class = 'row'>
<div class = 'col-xs-4 col-xs-offset-2'>
<div class="list-group text-center">
<h4><%= t('previous_meetings') %></h4>
<ul class="previously-joined"></ul>
</div>
</div>
<div class = 'col-xs-4'>
<div class="list-group text-center">
<h4><%= t('active_meetings') %></h4>
<ul class="actives"></ul>
</div>
</div>
</div>
</div>
</div>
<% end %>
<script>
MEETINGS = {}
// Only need to register for logged in users.
if($('body').data('current-user')){
App.messages = App.cable.subscriptions.create('RefreshMeetingsChannel', {
received: function(data) {
console.log(data)
if(isPreviouslyJoined(data['meeting'])){
if(data['method'] == 'create'){
// Create an empty meeting.
MEETINGS[data['meeting']] = {'name': data['meeting'],
'participants': 0,
'moderators': 0}
renderActiveMeeting(MEETINGS[data['meeting']])
} else if(data['method'] == 'destroy'){
removeActiveMeeting(MEETINGS[data['meeting']])
delete MEETINGS[data['meeting']]
} else if(data['method'] == 'join'){
handleUser(data, 1)
updateMeetingText(MEETINGS[data['meeting']])
} else if(data['method'] == 'leave'){
handleUser(data, -1)
}
}
}
});
}
handleUser = function(data, n){
if(data['role'] == 'MODERATOR'){
MEETINGS[data['meeting']]['moderators'] += n
} else {
MEETINGS[data['meeting']]['participants'] += n
}
updateMeetingText(MEETINGS[data['meeting']])
}
updateMeetingText = function(meeting){
$('#' + meeting['name']).html('<a>' + meeting['name'] + '</a> <i>(' +
meeting['participants'] + ((meeting['participants'] == 1) ? ' user, ' : ' users, ') +
meeting['moderators'] + ((meeting['moderators'] == 1) ? ' mod)' : ' mods)'))
}
initialPopulate = function(){
$.get(window.location.origin + '/rooms/' + $('body').data('current-user') + '/request', function(data){
meetings = data['meetings']
for(var i = 0; i < meetings.length; i++){
name = meetings[i]['meetingName']
participants = parseInt(meetings[i]['participantCount'])
moderators = parseInt(meetings[i]['moderatorCount'])
// Create meeting.
MEETINGS[name] = {'name': name,
'participants': participants - moderators,
'moderators': moderators}
if(isPreviouslyJoined(name)){
renderActiveMeeting(MEETINGS[name])
// remove it.
}
}
});
}
isPreviouslyJoined = function(meeting){
joinedMeetings = localStorage.getItem('joinedRooms-' + $('body').data('current-user')).split(',');
return joinedMeetings.indexOf(meeting) >= 0
}
renderActiveMeeting = function(m){
var meeting_item = $('<li id = ' + m['name'] + '><a>' + m['name'] + '</a>' +
' <i>(' + m['participants'] + ' users, ' + m['moderators'] + ' mods)</i>' + '</li>')
$('.actives').append(meeting_item);
// Set up join on click.
meeting_item.click(function(){
joinMeeting(name);
});
}
removeActiveMeeting = function(meeting){
$('#' + meeting['name']).remove()
//$(".actives:contains('" + meeting['name'] + "')").remove()
}
// Directly join a meeting from active meetings.
joinMeeting = function(meeting_name){
var name = $('.meeting-user-name').val();
Meeting.getInstance().setUserName(localStorage.getItem('lastJoinedName'));
Meeting.getInstance().setMeetingId(meeting_name);
// a user name is set, join the user into the session
if (name !== undefined && name !== null) {
var jqxhr = Meeting.getInstance().getJoinMeetingResponse();
if (jqxhr) {
jqxhr.done(function(data) {
if (data.messageKey === 'wait_for_moderator') {
waitForModerator(Meeting.getInstance().getURL());
} else {
$(location).attr("href", data.response.join_url);
}
});
jqxhr.fail(function(xhr, status, error) {
console.info("meeting join failed");
});
} else {
$('.meeting-user-name').parent().addClass('has-error');
}
// if not user name was set it means we must ask for a name
} else {
$(location).attr("href", Meeting.getInstance().getURL());
}
}
if($('body').data('current-user')){ initialPopulate() }
</script>

View File

@ -37,6 +37,7 @@
en-US:
actions: Actions
active_meetings: (active meetings)
admin_room_title: Welcome %{user}
are_you: Are you %{name}?
are_you_sure: Are you sure?

View File

@ -48,6 +48,7 @@ Rails.application.routes.draw do
post '/:room_id/:id/callback', to: 'bbb#callback', :constraints => {:id => disallow_slash, :room_id => disallow_slash}
# routes shared between meetings and rooms
get '/(:room_id)/request', to: 'landing#send_data', :defaults => { :format => 'xml' }
get '/(:room_id)/:id/join', to: 'bbb#join', defaults: {room_id: nil, format: 'json'}, :constraints => {:id => disallow_slash, :room_id => disallow_slash}
get '/(:room_id)/:id', to: 'landing#resource', as: :meeting_room, defaults: {room_id: nil}, :constraints => {:id => disallow_slash, :room_id => disallow_slash}
end