dani
/
vroom
mirror of https://github.com/dani/vroom.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Various coding style update and small bug fixes

Browse Source
master
Daniel Berteaud 9 years ago
parent bb309c7177
commit 552b598458
1 changed files with 172 additions and 181 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 279
      vroom.pl

279
vroom.pl
Unescape View File

@ -42,6 +42,7 @@ foreach my $dir (qw/assets/){
# Optional features # Optional features
our $optf = {}; our $optf = {};
# Create etherpad api client if enabled # Create etherpad api client if enabled
if ($config->{'etherpad.uri'} =~ m/https?:\/\/.*/ && $config->{'etherpad.api_key'} ne ''){ if ($config->{'etherpad.uri'} =~ m/https?:\/\/.*/ && $config->{'etherpad.api_key'} ne ''){
my $etherpad = eval { require Etherpad }; my $etherpad = eval { require Etherpad };
@ -122,10 +123,10 @@ plugin 'RenderFile';
# Take a string as argument and check if it's a valid room name # Take a string as argument and check if it's a valid room name
helper valid_room_name => sub { helper valid_room_name => sub {
my $self = shift; my $self = shift;
my ($name) = @_; my $name = shift;
my $ret = {}; my $ret = {};
# A few names are reserved # A few names are reserved
my @reserved = qw(about help feedback feedback_thanks goodbye admin localize api my @reserved = qw(about help feedback feedback_thanks goodbye admin locales api
missing dies kicked invitation js css img fonts snd documentation); missing dies kicked invitation js css img fonts snd documentation);
if (!$name || $name !~ m/^[\w\-]{1,49}$/ || grep { $name eq $_ } @reserved){ if (!$name || $name !~ m/^[\w\-]{1,49}$/ || grep { $name eq $_ } @reserved){
return 0; return 0;
@ -136,7 +137,7 @@ helper valid_room_name => sub {
# Check arg is a valid ID number # Check arg is a valid ID number
helper valid_id => sub { helper valid_id => sub {
my $self = shift; my $self = shift;
my ($id) = @_; my $id = shift;
if (!$id || $id !~ m/^\d+$/){ if (!$id || $id !~ m/^\d+$/){
return 0; return 0;
} }
@ -146,20 +147,20 @@ helper valid_id => sub {
# Check email address format # Check email address format
helper valid_email => sub { helper valid_email => sub {
my $self = shift; my $self = shift;
my ($email) = @_; my $email = shift;
return Email::Valid->address($email); return Email::Valid->address($email);
}; };
# Validate a date in YYYY-MM-DD format # Validate a date in YYYY-MM-DD format
# Also accept YYYY-MM-DD hh:mm:ss # Also accepts YYYY-MM-DD hh:mm:ss
helper valid_date => sub { helper valid_date => sub {
my $self = shift; my $self = shift;
my ($date) = @_; my $date = shift;
if ($date =~ m/^\d{4}\-\d{1,2}\-\d{1,2}(\s+\d{1,2}:\d{1,2}:\d{1,2})?$/){ if ($date !~ m/^\d{4}\-\d{1,2}\-\d{1,2}(\s+\d{1,2}:\d{1,2}:\d{1,2})?$/){
return 1;
}
$self->app->log->debug("$date is not a valid date"); $self->app->log->debug("$date is not a valid date");
return 0; return 0;
}
return 1;
}; };
########################## ##########################
@ -190,9 +191,8 @@ helper get_opt_features => sub {
# Log an event # Log an event
helper log_event => sub { helper log_event => sub {
my $self = shift; my $self = shift;
my ($event) = @_; my $event = shift;
if (!$event->{event} || if (!$event->{event} || !$event->{msg}){
!$event->{msg}){
$self->app->log->debug("Oops, invalid event received"); $self->app->log->debug("Oops, invalid event received");
return 0; return 0;
} }
@ -215,7 +215,8 @@ helper log_event => sub {
# Return a list of event between 2 dates # Return a list of event between 2 dates
helper get_event_list => sub { helper get_event_list => sub {
my $self = shift; my $self = shift;
my ($start,$end) = @_; my $start = shift;
my $end = shift;
# Check both start and end dates seems valid # Check both start and end dates seems valid
if (!$self->valid_date($start) || !$self->valid_date($end)){ if (!$self->valid_date($start) || !$self->valid_date($end)){
$self->app->log->debug("Invalid date submitted while looking for events"); $self->app->log->debug("Invalid date submitted while looking for events");
@ -227,17 +228,10 @@ helper get_event_list => sub {
WHERE `date`>=? WHERE `date`>=?
AND `date`<=?'); AND `date`<=?');
}; };
if ($@){
$self->app->log->debug("DB error: $@");
return 0;
}
# We want both dates to be inclusive, as the default time is 00:00:00 # We want both dates to be inclusive, as the default time is 00:00:00
# if not given, append 23:59:59 to the end date # if not given, append 23:59:59 to the end date
$sth->execute($start,$end . ' 23:59:59'); $end .= ' 23:59:59' if ($end !~ /\s+\d{1,2}:\d{1,2}:\d{1,2}$/);
if ($sth->err){ $sth->execute($start, $end);
$self->app->log->debug("DB error: " . $sth->errstr . " (code " . $sth->err . ")");
return 0;
}
# Everything went fine, return the list of event as a hashref # Everything went fine, return the list of event as a hashref
return $sth->fetchall_hashref('id'); return $sth->fetchall_hashref('id');
}; };
@ -322,7 +316,7 @@ helper login => sub {
# Force the session cookie to expire on logout # Force the session cookie to expire on logout
helper logout => sub { helper logout => sub {
my $self = shift; my $self = shift;
my ($room) = @_; my $room = shift;
# Logout from etherpad # Logout from etherpad
if ($optf->{etherpad} && $self->session($room) && $self->session($room)->{etherpadSessionId}){ if ($optf->{etherpad} && $self->session($room) && $self->session($room)->{etherpadSessionId}){
$optf->{etherpad}->delete_session($self->session($room)->{etherpadSessionId}); $optf->{etherpad}->delete_session($self->session($room)->{etherpadSessionId});
@ -346,10 +340,10 @@ helper logout => sub {
}; };
# Create a new room in the DB # Create a new room in the DB
# Requires two args: the name of the room and the session name of the creator # Requires one arg: the name of the room
helper create_room => sub { helper create_room => sub {
my $self = shift; my $self = shift;
my ($name) = @_; my $name = shift;
# Convert room names to lowercase # Convert room names to lowercase
if ($name ne lc $name){ if ($name ne lc $name){
$name = lc $name; $name = lc $name;
@ -358,6 +352,7 @@ helper create_room => sub {
if (!$self->valid_room_name($name)){ if (!$self->valid_room_name($name)){
return 0; return 0;
} }
# Fail if the room already exists
if ($self->get_room_by_name($name)){ if ($self->get_room_by_name($name)){
return 0; return 0;
} }
@ -371,27 +366,24 @@ helper create_room => sub {
CONVERT_TZ(NOW(), @@session.time_zone, \'+00:00\') CONVERT_TZ(NOW(), @@session.time_zone, \'+00:00\')
)'); )');
}; };
$sth->execute( $sth->execute($name);
$name
);
$self->log_event({ $self->log_event({
event => 'room_create', event => 'room_create',
msg => "Room $name created" msg => "Room $name created"
}); });
# Etherpad integration ? If so, create the corresponding pad # Create a pad if enabled
if ($optf->{etherpad}){ if ($optf->{etherpad}){
$self->create_pad($name); $self->create_pad($name);
} }
return 1; return 1;
}; };
# Take a string as argument # Takse a string as argument
# Return a room object if a room with that name is found # Return a room object if a room with that name is found
# Else return undef # Else return undef
helper get_room_by_name => sub { helper get_room_by_name => sub {
my $self = shift; my $self = shift;
my ($name) = @_; my $name = shift;
my $res = $self->valid_room_name($name);
if (!$self->valid_room_name($name)){ if (!$self->valid_room_name($name)){
return 0; return 0;
} }
@ -407,7 +399,7 @@ helper get_room_by_name => sub {
# Same as get_room_by_name, but take a room ID as argument # Same as get_room_by_name, but take a room ID as argument
helper get_room_by_id => sub { helper get_room_by_id => sub {
my $self = shift; my $self = shift;
my ($id) = @_; my $id = shift;
if (!$self->valid_id($id)){ if (!$self->valid_id($id)){
return 0; return 0;
} }
@ -423,11 +415,8 @@ helper get_room_by_id => sub {
# Update a room, take a room object as argument (hashref) # Update a room, take a room object as argument (hashref)
helper modify_room => sub { helper modify_room => sub {
my $self = shift; my $self = shift;
my ($room) = @_; my $room = shift;
if (!$self->valid_id($room->{id})){ if (!$self->valid_id($room->{id}) || !$self->valid_room_name($room->{name})){
return 0;
}
if (!$self->valid_room_name($room->{name})){
return 0; return 0;
} }
my $old_room = $self->get_room_by_id($room->{id}); my $old_room = $self->get_room_by_id($room->{id});
@ -438,9 +427,9 @@ helper modify_room => sub {
($room->{max_members} > $config->{'rooms.max_members'} && $config->{'rooms.max_members'} > 0)){ ($room->{max_members} > $config->{'rooms.max_members'} && $config->{'rooms.max_members'} > 0)){
$room->{max_members} = 0; $room->{max_members} = 0;
} }
if (($room->{locked} && $room->{locked} !~ m/^0|1$/) || if ((!$room->{locked} || $room->{locked} !~ m/^0|1$/) ||
($room->{ask_for_name} && $room->{ask_for_name} !~ m/^0|1$/) || (!$room->{ask_for_name} || $room->{ask_for_name} !~ m/^0|1$/) ||
($room->{persistent} && $room->{persistent} !~ m/^0|1$/) || (!$room->{persistent} || $room->{persistent} !~ m/^0|1$/) ||
$room->{max_members} !~ m/^\d+$/){ $room->{max_members} !~ m/^\d+$/){
return 0; return 0;
} }
@ -465,8 +454,10 @@ helper modify_room => sub {
); );
my $msg = "Room " . $room->{name} ." modified"; my $msg = "Room " . $room->{name} ." modified";
my $mods = ''; my $mods = '';
# Now, log which fields have been modified
foreach my $field (keys %$room){ foreach my $field (keys %$room){
if (($old_room->{$field} // '' ) ne ($room->{$field} // '')){ if (($old_room->{$field} // '' ) ne ($room->{$field} // '')){
# Just hide passwords
if ($field =~ m/_password$/){ if ($field =~ m/_password$/){
$old_room->{$field} = ($old_room->{$field}) ? '<hidden>' : '<unset>'; $old_room->{$field} = ($old_room->{$field}) ? '<hidden>' : '<unset>';
$room->{$field} = ($room->{$field}) ? '<hidden>' : '<unset>'; $room->{$field} = ($room->{$field}) ? '<hidden>' : '<unset>';
@ -488,15 +479,13 @@ helper modify_room => sub {
# Set the role of a peer # Set the role of a peer
helper set_peer_role => sub { helper set_peer_role => sub {
my $self = shift; my $self = shift;
my ($data) = @_; my $data = shift;
# Check the peer exists and is already in the room # Check the peer exists and is already in the room
if (!$data->{peer_id} || if (!$data->{peer_id} ||
!$peers->{$data->{peer_id}}){ !$peers->{$data->{peer_id}}){
return 0; return 0;
} }
$peers->{$data->{peer_id}}->{role} = $data->{role}; $peers->{$data->{peer_id}}->{role} = $data->{role};
$self->app->log->info("Peer " . $data->{peer_id} . " has now the " .
$data->{role} . " role");
$self->log_event({ $self->log_event({
event => 'peer_role', event => 'peer_role',
msg => "Peer " . $data->{peer_id} . " has now the " . msg => "Peer " . $data->{peer_id} . " has now the " .
@ -508,14 +497,14 @@ helper set_peer_role => sub {
# Return the role of a peer, take a peer object as arg ($data = { peer_id => XYZ }) # Return the role of a peer, take a peer object as arg ($data = { peer_id => XYZ })
helper get_peer_role => sub { helper get_peer_role => sub {
my $self = shift; my $self = shift;
my ($peer_id) = @_; my $peer_id = shift;
return $peers->{$peer_id}->{role}; return $peers->{$peer_id}->{role};
}; };
# Promote a peer to owner # Promote a peer to owner
helper promote_peer => sub { helper promote_peer => sub {
my $self = shift; my $self = shift;
my ($peer_id) = @_; my $peer_id = shift;
return $self->set_peer_role({ return $self->set_peer_role({
peer_id => $peer_id, peer_id => $peer_id,
role => 'owner' role => 'owner'
@ -541,7 +530,8 @@ helper purge_rooms => sub {
my $sth = eval { my $sth = eval {
$self->db->prepare('SELECT `name`,`etherpad_group` $self->db->prepare('SELECT `name`,`etherpad_group`
FROM `rooms` FROM `rooms`
WHERE `last_activity` < DATE_SUB(CONVERT_TZ(NOW(), @@session.time_zone, \'+00:00\'), INTERVAL ' . $config->{'rooms.inactivity_timeout'} . ' MINUTE) WHERE `last_activity` < DATE_SUB(CONVERT_TZ(NOW(), @@session.time_zone, \'+00:00\'),
INTERVAL ' . $config->{'rooms.inactivity_timeout'} . ' MINUTE)
AND `persistent`=\'0\' AND `owner_password` IS NULL'); AND `persistent`=\'0\' AND `owner_password` IS NULL');
}; };
$sth->execute; $sth->execute;
@ -553,7 +543,8 @@ helper purge_rooms => sub {
$sth = eval { $sth = eval {
$self->db->prepare('SELECT `name`,`etherpad_group` $self->db->prepare('SELECT `name`,`etherpad_group`
FROM `rooms` FROM `rooms`
WHERE `last_activity` < DATE_SUB(CONVERT_TZ(NOW(), @@session.time_zone, \'+00:00\'), INTERVAL ' . $config->{'rooms.reserved_inactivity_timeout'} . ' MINUTE) WHERE `last_activity` < DATE_SUB(CONVERT_TZ(NOW(), @@session.time_zone, \'+00:00\'),
INTERVAL ' . $config->{'rooms.reserved_inactivity_timeout'} . ' MINUTE)
AND `persistent`=\'0\' AND `owner_password` IS NOT NULL') AND `persistent`=\'0\' AND `owner_password` IS NOT NULL')
}; };
$sth->execute; $sth->execute;
@ -586,7 +577,7 @@ helper purge_rooms => sub {
# delete just a specific room, by name # delete just a specific room, by name
helper delete_room => sub { helper delete_room => sub {
my $self = shift; my $self = shift;
my ($room) = @_; my $room = shift;
$self->app->log->debug("Removing room $room"); $self->app->log->debug("Removing room $room");
my $data = $self->get_room_by_name($room); my $data = $self->get_room_by_name($room);
if (!$data){ if (!$data){
@ -624,7 +615,7 @@ helper get_room_list => sub {
# so we can detect unused rooms # so we can detect unused rooms
helper update_room_last_activity => sub { helper update_room_last_activity => sub {
my $self = shift; my $self = shift;
my ($name) = @_; my $name = shift;
my $data = $self->get_room_by_name($name); my $data = $self->get_room_by_name($name);
if (!$data){ if (!$data){
return 0; return 0;
@ -647,7 +638,7 @@ helper get_supported_lang => sub {
# Generate a random token # Generate a random token
helper get_random => sub { helper get_random => sub {
my $self = shift; my $self = shift;
my ($entropy) = @_; my $entropy = shift;
return Session::Token->new(entropy => $entropy)->get; return Session::Token->new(entropy => $entropy)->get;
}; };
@ -665,7 +656,8 @@ helper get_random_name => sub {
# Add an email address to the list of notifications # Add an email address to the list of notifications
helper add_notification => sub { helper add_notification => sub {
my $self = shift; my $self = shift;
my ($room,$email) = @_; my $room = shift;
my $email = shift;
my $data = $self->get_room_by_name($room); my $data = $self->get_room_by_name($room);
if (!$data || !$self->valid_email($email)){ if (!$data || !$self->valid_email($email)){
return 0; return 0;
@ -686,7 +678,8 @@ helper add_notification => sub {
# Take the room and an array ref of emails # Take the room and an array ref of emails
helper update_email_notifications => sub { helper update_email_notifications => sub {
my $self = shift; my $self = shift;
my ($room,$emails) = @_; my $room = shift;
my $emails = shift;
my $data = $self->get_room_by_name($room); my $data = $self->get_room_by_name($room);
if (!$data){ if (!$data){
return 0; return 0;
@ -721,10 +714,6 @@ helper update_email_notifications => sub {
); );
# Now, insert new emails # Now, insert new emails
foreach my $email (@new){ foreach my $email (@new){
# Skip empty inputs
if ($email eq ''){
next;
}
$self->add_notification($room,$email) || return 0; $self->add_notification($room,$email) || return 0;
} }
return 1; return 1;
@ -733,8 +722,9 @@ helper update_email_notifications => sub {
# Return the list of email addresses # Return the list of email addresses
helper get_email_notifications => sub { helper get_email_notifications => sub {
my $self = shift; my $self = shift;
my ($room) = @_; my $room = shift;
$room = $self->get_room_by_name($room) || return undef; $room = $self->get_room_by_name($room);
return 0 if (!$room);
my $sth = eval { my $sth = eval {
$self->db->prepare('SELECT `id`,`email` $self->db->prepare('SELECT `id`,`email`
FROM `email_notifications` FROM `email_notifications`
@ -754,11 +744,10 @@ helper choose_moh => sub {
# Add a invitation # Add a invitation
helper add_invitation => sub { helper add_invitation => sub {
my $self = shift; my $self = shift;
my ($room,$email) = @_; my $room = shift;
my $email = shift;
my $data = $self->get_room_by_name($room); my $data = $self->get_room_by_name($room);
if (!$data){ return 0 if (!$data);
return 0;
}
my $token = $self->get_random(256); my $token = $self->get_random(256);
my $sth = eval { my $sth = eval {
$self->db->prepare('INSERT INTO `email_invitations` $self->db->prepare('INSERT INTO `email_invitations`
@ -782,7 +771,7 @@ helper add_invitation => sub {
# just like get_room # just like get_room
helper get_invitation_by_token => sub { helper get_invitation_by_token => sub {
my $self = shift; my $self = shift;
my ($token) = @_; my $token = shift;
my $sth = eval { my $sth = eval {
$self->db->prepare('SELECT * $self->db->prepare('SELECT *
FROM `email_invitations` FROM `email_invitations`
@ -796,7 +785,7 @@ helper get_invitation_by_token => sub {
# Find invitations which have a unprocessed repsponse # Find invitations which have a unprocessed repsponse
helper get_invitation_list => sub { helper get_invitation_list => sub {
my $self = shift; my $self = shift;
my ($session) = @_; my $session = shift;
my $sth = eval { my $sth = eval {
$self->db->prepare('SELECT * $self->db->prepare('SELECT *
FROM `email_invitations` FROM `email_invitations`
@ -812,7 +801,9 @@ helper get_invitation_list => sub {
# so the organizer can get it # so the organizer can get it
helper respond_to_invitation => sub { helper respond_to_invitation => sub {
my $self = shift; my $self = shift;
my ($token,$response,$message) = @_; my $token = shift;
my $response = shift;
my $message = shift;
my $sth = eval { my $sth = eval {
$self->db->prepare('UPDATE `email_invitations` $self->db->prepare('UPDATE `email_invitations`
SET `response`=?, SET `response`=?,
@ -834,7 +825,7 @@ helper respond_to_invitation => sub {
# Mark a invitation response as processed # Mark a invitation response as processed
helper mark_invitation_processed => sub { helper mark_invitation_processed => sub {
my $self = shift; my $self = shift;
my ($token) = @_; my $token = shift;
my $sth = eval { my $sth = eval {
$self->db->prepare('UPDATE `email_invitations` $self->db->prepare('UPDATE `email_invitations`
SET `processed`=\'1\' SET `processed`=\'1\'
@ -843,7 +834,7 @@ helper mark_invitation_processed => sub {
$sth->execute($token); $sth->execute($token);
$self->log_event({ $self->log_event({
event => 'invalidate_invitation', event => 'invalidate_invitation',
msg => "Marking invitation ID $token as processed, it won't be usable anymore" msg => "Marking invitation $token as processed, it won't be usable anymore"
}); });
return 1; return 1;
}; };
@ -864,14 +855,13 @@ helper purge_invitations => sub {
# Check an invitation token is valid # Check an invitation token is valid
helper check_invite_token => sub { helper check_invite_token => sub {
my $self = shift; my $self = shift;
my ($room,$token) = @_; my $room = shift;
my $token = shift;
# Expire invitations before checking if it's valid # Expire invitations before checking if it's valid
$self->purge_invitations; $self->purge_invitations;
my $ret = 0; my $ret = 0;
my $data = $self->get_room_by_name($room); my $data = $self->get_room_by_name($room);
if (!$data || !$token){ return 0 if (!$data || !$token);
return 0;
}
$self->app->log->debug("Checking if invitation with token $token is valid for room $room"); $self->app->log->debug("Checking if invitation with token $token is valid for room $room");
my $sth = eval { my $sth = eval {
$self->db->prepare('SELECT COUNT(`id`) $self->db->prepare('SELECT COUNT(`id`)
@ -899,11 +889,9 @@ helper check_invite_token => sub {
# Create a pad (and the group if needed) # Create a pad (and the group if needed)
helper create_pad => sub { helper create_pad => sub {
my $self = shift; my $self = shift;
my ($room) = @_; my $room = shift;
my $data = $self->get_room_by_name($room); my $data = $self->get_room_by_name($room);
if (!$optf->{etherpad} || !$data){ return 0 if (!$optf->{etherpad} || !$data);
return 0;
}
# Create the etherpad group if not already done # Create the etherpad group if not already done
# and register it in the DB # and register it in the DB
if (!$data->{etherpad_group} || $data->{etherpad_group} eq ''){ if (!$data->{etherpad_group} || $data->{etherpad_group} eq ''){
@ -932,7 +920,7 @@ helper create_pad => sub {
# Create an etherpad session for a user # Create an etherpad session for a user
helper create_etherpad_session => sub { helper create_etherpad_session => sub {
my $self = shift; my $self = shift;
my ($room) = @_; my $room = shift;
my $data = $self->get_room_by_name($room); my $data = $self->get_room_by_name($room);
if (!$optf->{etherpad} || !$data || !$data->{etherpad_group}){ if (!$optf->{etherpad} || !$data || !$data->{etherpad_group}){
return 0; return 0;
@ -953,10 +941,11 @@ helper create_etherpad_session => sub {
return 1; return 1;
}; };
# Get an API key by id # Get an API key by token
# just used to check if the key exists
helper get_key_by_token => sub { helper get_key_by_token => sub {
my $self = shift; my $self = shift;
my ($token) = @_; my $token = shift;
if (!$token || $token eq ''){ if (!$token || $token eq ''){
return 0; return 0;
} }
@ -974,13 +963,10 @@ helper get_key_by_token => sub {
# Associate an API key to a room, and set the corresponding role # Associate an API key to a room, and set the corresponding role
helper associate_key_to_room => sub { helper associate_key_to_room => sub {
my $self = shift; my $self = shift;
my (%data) = @_; my $data = shift;
my $data = \%data;
my $room = $self->get_room_by_name($data->{room}); my $room = $self->get_room_by_name($data->{room});
my $key = $self->get_key_by_token($data->{key}); my $key = $self->get_key_by_token($data->{key});
if (!$room || !$key){ return 0 if (!$room || !$key);
return 0;
}
my $sth = eval { my $sth = eval {
$self->db->prepare('INSERT INTO `room_keys` $self->db->prepare('INSERT INTO `room_keys`
(`room_id`,`key_id`,`role`) (`room_id`,`key_id`,`role`)
@ -999,11 +985,9 @@ helper associate_key_to_room => sub {
# Make an API key admin of every rooms # Make an API key admin of every rooms
helper make_key_admin => sub { helper make_key_admin => sub {
my $self = shift; my $self = shift;
my ($token) = @_; my $token = shift;
my $key = $self->get_key_by_token($token); my $key = $self->get_key_by_token($token);
if (!$key){ return 0 if (!$key);
return 0;
}
my $sth = eval { my $sth = eval {
$self->db->prepare('UPDATE `api_keys` $self->db->prepare('UPDATE `api_keys`
SET `admin`=\'1\' SET `admin`=\'1\'
@ -1020,7 +1004,8 @@ helper make_key_admin => sub {
# Get the role of an API key for a room # Get the role of an API key for a room
helper get_key_role => sub { helper get_key_role => sub {
my $self = shift; my $self = shift;
my ($token,$room) = @_; my $token = shift;
my $room = shift;
my $key = $self->get_key_by_token($token); my $key = $self->get_key_by_token($token);
if (!$key){ if (!$key){
$self->app->log->debug("Invalid API key"); $self->app->log->debug("Invalid API key");
@ -1051,12 +1036,9 @@ helper get_key_role => sub {
# Check if a key can perform an action against a room # Check if a key can perform an action against a room
helper key_can_do_this => sub { helper key_can_do_this => sub {
my $self = shift; my $self = shift;
my (%data) = @_; my $data = shift;
my $data = \%data;
my $actions = API_ACTIONS; my $actions = API_ACTIONS;
if (!$data->{action}){ return 0 if (!$data->{action});
return 0;
}
# Anonymous actions # Anonymous actions
if ($actions->{anonymous}->{$data->{action}}){ if ($actions->{anonymous}->{$data->{action}}){
return 1; return 1;
@ -1078,7 +1060,7 @@ helper key_can_do_this => sub {
if ($role eq 'owner' && ($actions->{owner}->{$data->{action}} || $actions->{participant}->{$data->{action}})){ if ($role eq 'owner' && ($actions->{owner}->{$data->{action}} || $actions->{participant}->{$data->{action}})){
return 1; return 1;
} }
# If this key as simple partitipant priv in this room, only allow participant actions # If this key has simple participant priv in this room, only allow participant actions
elsif ($role eq 'participant' && $actions->{participant}->{$data->{action}}){ elsif ($role eq 'participant' && $actions->{participant}->{$data->{action}}){
return 1; return 1;
} }
@ -1089,9 +1071,7 @@ helper key_can_do_this => sub {
helper get_room_members => sub { helper get_room_members => sub {
my $self = shift; my $self = shift;
my $room = shift; my $room = shift;
if (!$self->get_room_by_name($room)){ return 0 if (!$self->get_room_by_name($room));
return 0;
}
my @p; my @p;
foreach my $peer (keys $peers){ foreach my $peer (keys $peers){
if ($peers->{$peer}->{room} && if ($peers->{$peer}->{room} &&
@ -1108,9 +1088,9 @@ helper signal_broadcast_room => sub {
my $data = shift; my $data = shift;
# Send a message to all members of the same room as the sender # Send a message to all members of the same room as the sender
# ecept the sender himself # except the sender himself
foreach my $peer (keys %$peers){ foreach my $peer (keys %$peers){
next if ($peer eq $data->{from}); next if $peer eq $data->{from};
next if !$peers->{$data->{from}}->{room}; next if !$peers->{$data->{from}}->{room};
next if !$peers->{$peer}->{room}; next if !$peers->{$peer}->{room};
next if $peers->{$peer}->{room} ne $peers->{$data->{from}}->{room}; next if $peers->{$peer}->{room} ne $peers->{$data->{from}}->{room};
@ -1151,9 +1131,7 @@ helper get_turn_creds => sub {
chomp $pass; chomp $pass;
return ($user, $pass); return ($user, $pass);
} }
else {
return (undef, undef); return (undef, undef);
}
}; };
# Format room config as a hash to be sent in JSON response # Format room config as a hash to be sent in JSON response
@ -1174,12 +1152,11 @@ helper get_room_conf => sub {
# Export events in XLSX # Export events in XLSX
helper export_events_xlsx => sub { helper export_events_xlsx => sub {
my $self = shift; my $self = shift;
my ($from,$to) = @_; my $from = shift;
my $to = shift;
my $tmp = File::Temp->new( DIR => $config->{'directories.tmp'}, SUFFIX => '.xlsx' )->filename; my $tmp = File::Temp->new( DIR => $config->{'directories.tmp'}, SUFFIX => '.xlsx' )->filename;
my $events = $self->get_event_list($from, $to); my $events = $self->get_event_list($from, $to);
if (!$events){ return 0 if (!$events);
return 0;
}
my $xlsx = Excel::Writer::XLSX->new($tmp); my $xlsx = Excel::Writer::XLSX->new($tmp);
my $sheet = $xlsx->add_worksheet; my $sheet = $xlsx->add_worksheet;
my @headers = qw(id date from_ip user event message); my @headers = qw(id date from_ip user event message);
@ -1201,6 +1178,8 @@ helper export_events_xlsx => sub {
$events->{$e}->{message} $events->{$e}->{message}
); );
$sheet->write($row, 0, \@details); $sheet->write($row, 0, \@details);
# Adapt row heigh depending on the number of new lines
# in the message
my $cr = scalar(split("\n", $events->{$e}->{message})); my $cr = scalar(split("\n", $events->{$e}->{message}));
if ($cr > 1){ if ($cr > 1){
$sheet->set_row($row, $cr*12); $sheet->set_row($row, $cr*12);
@ -1210,6 +1189,31 @@ helper export_events_xlsx => sub {
return $tmp; return $tmp;
}; };
# Disconnect a peer from the signaling channel
helper disconnect_peer => sub {
my $self = shift;
my $id = shift;
return 0 if (!$id || !$peers->{$id});
if ($id && $peers->{$id} && $peers->{$id}->{room}){
$self->log_event({
event => 'room_leave',
msg => "Peer $id closed websocket connection, leaving room " . $peers->{$id}->{room}
});
}
$self->signal_broadcast_room({
from => $id,
msg => Protocol::SocketIO::Message->new(
type => 'event',
data => {
name => 'remove',
args => [{ id => $id, type => 'video' }]
}
)
});
$self->update_room_last_activity($peers->{$id}->{room});
delete $peers->{$id};
};
# Socket.IO handshake # Socket.IO handshake
get '/socket.io/:ver' => sub { get '/socket.io/:ver' => sub {
my $self = shift; my $self = shift;
@ -1285,11 +1289,12 @@ websocket '/socket.io/:ver/websocket/:id' => sub {
$self->finish; $self->finish;
return; return;
} }
# We build a list of peers, except this new one so we can send it # Lets build the list of the other peers in the room to send to this new one
# to the new peer, and he'll be able to contact all those peers
my $others = {}; my $others = {};
foreach my $peer (keys %$peers){ foreach my $peer (keys %$peers){
next if ($peer eq $id); next if $peer eq $id;
next if !$peers->{$peer}->{room};
next if $peers->{$peer}->{room} ne $room;
$others->{$peer} = $peers->{$peer}->{details}; $others->{$peer} = $peers->{$peer}->{details};
} }
$peers->{$id}->{details} = { $peers->{$id}->{details} = {
@ -1368,7 +1373,7 @@ websocket '/socket.io/:ver/websocket/:id' => sub {
# Heartbeat reply, update timestamp # Heartbeat reply, update timestamp
elsif ($msg->type eq 'heartbeat'){ elsif ($msg->type eq 'heartbeat'){
$peers->{$id}->{last} = time; $peers->{$id}->{last} = time;
# Update room last activity ~ every 40 heartbeat, so about every 2 minutes # Update room last activity ~ every 40 heartbeats, so about every 2 minutes
if ((int (rand 200)) <= 5){ if ((int (rand 200)) <= 5){
$self->update_room_last_activity($peers->{$id}->{room}); $self->update_room_last_activity($peers->{$id}->{room});
} }
@ -1377,24 +1382,8 @@ websocket '/socket.io/:ver/websocket/:id' => sub {
# Triggerred when a websocket connection ends # Triggerred when a websocket connection ends
$self->on(finish => sub { $self->on(finish => sub {
my ($self, $code, $reason) = @_; my $self = shift;
if ($id && $peers->{$id} && $peers->{$id}->{room}){ $self->disconnect_peer($id);
$self->log_event({
event => 'room_leave',
msg => "Peer $id closed websocket connection, leaving room " . $peers->{$id}->{room}
});
}
$self->signal_broadcast_room({
from => $id,
msg => Protocol::SocketIO::Message->new(
type => 'event',
data => {
name => 'remove',
args => [{ id => $id, type => 'video' }]
}
)
});
$self->update_room_last_activity($peers->{$id}->{room});
delete $peers->{$id}; delete $peers->{$id};
}); });
@ -1407,7 +1396,7 @@ websocket '/socket.io/:ver/websocket/:id' => sub {
Mojo::IOLoop->recurring( 3 => sub { Mojo::IOLoop->recurring( 3 => sub {
foreach my $id (keys %{$peers}){ foreach my $id (keys %{$peers}){
# This shouldn't happen, but better to log an error and fix it rather # This shouldn't happen, but better to log an error and fix it rather
# than looping indefinitly on a bogus entry if something went wron # than looping indefinitly on a bogus entry if something went wrong
if (!$peers->{$id}->{socket}){ if (!$peers->{$id}->{socket}){
app->log->debug("Garbage found in peers (peer $id has no socket)\n"); app->log->debug("Garbage found in peers (peer $id has no socket)\n");
delete $peers->{$id}; delete $peers->{$id};
@ -1417,7 +1406,7 @@ Mojo::IOLoop->recurring( 3 => sub {
elsif ($peers->{$id}->{last} < time - 15){ elsif ($peers->{$id}->{last} < time - 15){
app->log->debug("Peer $id didn't reply in 15 sec, disconnecting"); app->log->debug("Peer $id didn't reply in 15 sec, disconnecting");
$peers->{$id}->{socket}->finish; $peers->{$id}->{socket}->finish;
delete $peers->{$id}; app->disconnect_peer($id);
} }
elsif ($peers->{$id}->{check_invitations}) { elsif ($peers->{$id}->{check_invitations}) {
my $invitations = app->get_invitation_list($peers->{$id}->{id}); my $invitations = app->get_invitation_list($peers->{$id}->{id});
@ -1577,8 +1566,7 @@ get '/locales/(:lang).js' => sub {
my $self = shift; my $self = shift;
my $usr_lang = $self->languages; my $usr_lang = $self->languages;
my $req_lang = $self->stash('lang'); my $req_lang = $self->stash('lang');
$req_lang = (grep { $_ eq $req_lang } $self->get_supported_lang) ? $req_lang = 'en' unless grep { $_ eq $req_lang } $self->get_supported_lang;
$req_lang : 'en';
# Temporarily switch to the requested locale # Temporarily switch to the requested locale
# eg, we can be in en and ask for /locales/fr.js # eg, we can be in en and ask for /locales/fr.js
$self->languages($req_lang); $self->languages($req_lang);
@ -1602,7 +1590,10 @@ get '/locales/(:lang).js' => sub {
my $res = 'locale = ' . Mojo::JSON::to_json($strings) . ';'; my $res = 'locale = ' . Mojo::JSON::to_json($strings) . ';';
$res .= 'fallback_locale = ' . Mojo::JSON::to_json($fallback_strings) . ';'; $res .= 'fallback_locale = ' . Mojo::JSON::to_json($fallback_strings) . ';';
# And send the response # And send the response
$self->render(text => $res, format => 'application/javascript;charset=UTF-8'); return $self->render(
text => $res,
format => 'application/javascript;charset=UTF-8'
);
}; };
# API requests handler # API requests handler
@ -1639,11 +1630,11 @@ any '/api' => sub {
} }
# Now, lets check if the key can do the requested action # Now, lets check if the key can do the requested action
my $res = $self->key_can_do_this( my $res = $self->key_can_do_this({
token => $token, token => $token,
action => $req->{action}, action => $req->{action},
param => $req->{param} param => $req->{param}
); });
# This action isn't possible with the privs associated to the API Key # This action isn't possible with the privs associated to the API Key
if (!$res){ if (!$res){
@ -1747,11 +1738,11 @@ any '/api' => sub {
return $self->render(json => $json, status => 500); return $self->render(json => $json, status => 500);
} }
$json->{err} = ''; $json->{err} = '';
$self->associate_key_to_room( $self->associate_key_to_room({
room => $req->{param}->{room}, room => $req->{param}->{room},
key => $token, key => $token,
role => 'owner' role => 'owner'
); });
return $self->render(json => $json); return $self->render(json => $json);
} }
@ -1801,11 +1792,11 @@ any '/api' => sub {
if ($self->session('peer_id')){ if ($self->session('peer_id')){
$self->set_peer_role({ peer_id => $self->session('peer_id'), role => $role }); $self->set_peer_role({ peer_id => $self->session('peer_id'), role => $role });
} }
$self->associate_key_to_room( $self->associate_key_to_room({
room => $room->{name}, room => $room->{name},
key => $token, key => $token,
role => $role role => $role
); });
return $self->render( return $self->render(
json => { json => {
msg => $self->l('AUTH_SUCCESS'), msg => $self->l('AUTH_SUCCESS'),
@ -1905,7 +1896,7 @@ any '/api' => sub {
$room->{ask_for_name} = ($req->{param}->{ask_for_name}) ? '1' : '0'; $room->{ask_for_name} = ($req->{param}->{ask_for_name}) ? '1' : '0';
$room->{max_members} = $req->{param}->{max_members}; $room->{max_members} = $req->{param}->{max_members};
# Room persistence can only be set by admins # Room persistence can only be set by admins
if ($req->{param}->{persistent} ne '' && $self->key_can_do_this(token => $token, action => 'set_persistent')){ if ($req->{param}->{persistent} ne '' && $self->key_can_do_this({token => $token, action => 'set_persistent'})){
$room->{persistent} = ($req->{param}->{persistent} eq Mojo::JSON::true) ? '1' : '0'; $room->{persistent} = ($req->{param}->{persistent} eq Mojo::JSON::true) ? '1' : '0';
} }
foreach my $pass (qw/join_password owner_password/){ foreach my $pass (qw/join_password owner_password/){
@ -2099,11 +2090,11 @@ any '/api' => sub {
if ($api_role ne 'owner' && if ($api_role ne 'owner' &&
$self->get_peer_role($peer_id) && $self->get_peer_role($peer_id) &&
$self->get_peer_role($peer_id) eq 'owner'){ $self->get_peer_role($peer_id) eq 'owner'){
$self->associate_key_to_room( $self->associate_key_to_room({
room => $room->{name}, room => $room->{name},
key => $token, key => $token,
role => 'owner' role => 'owner'
); });
if (!$res){ if (!$res){
return $self->render( return $self->render(
json => { json => {
@ -2340,11 +2331,11 @@ get '/:room' => sub {
); );
} }
if ($self->check_invite_token($room,$token)){ if ($self->check_invite_token($room,$token)){
$self->associate_key_to_room( $self->associate_key_to_room({
room => $room, room => $room,
key => $self->session('key'), key => $self->session('key'),
role => 'participant' role => 'participant'
); });
} }
# pad doesn't exist yet ? # pad doesn't exist yet ?
if ($optf->{etherpad} && !$data->{etherpad_group}){ if ($optf->{etherpad} && !$data->{etherpad_group}){

Write Preview
Loading…
Cancel
Save