From 19929c455317a5a57bc327070ce7987d51655033 Mon Sep 17 00:00:00 2001
From: Zachary Chai <zachary.chai@blindsidenetworks.com>
Date: Tue, 21 Mar 2017 11:25:00 -0400
Subject: [PATCH] strip spaces and newlines from meeting names

---
 app/controllers/landing_controller.rb | 4 ++--
 config/routes.rb                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/landing_controller.rb b/app/controllers/landing_controller.rb
index a955b0c5..598f9155 100644
--- a/app/controllers/landing_controller.rb
+++ b/app/controllers/landing_controller.rb
@@ -56,7 +56,7 @@ class LandingController < ApplicationController
   private
 
   def render_meeting
-    @meeting_id = params[:id]
+    @meeting_id = params[:id].strip
     params[:action] = 'meetings'
     render :action => 'meetings'
   end
@@ -71,7 +71,7 @@ class LandingController < ApplicationController
     end
 
     if @user.encrypted_id != params[:id]
-      @meeting_id = params[:id]
+      @meeting_id = params[:id].strip
     end
     @meeting_running = bbb_get_meeting_info("#{@user.encrypted_id}-#{@meeting_id}")[:returncode]
     @main_room = @meeting_id.blank? || @meeting_id == @user.encrypted_id
diff --git a/config/routes.rb b/config/routes.rb
index 15caf951..f4897097 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -44,7 +44,7 @@ Rails.application.routes.draw do
     post '/:room_id/:id/callback', to: 'bbb#callback' #, defaults: {format: 'json'}
 
     # routes shared between meetings and rooms
-    get '/(:room_id)/:id/join', to: 'bbb#join', defaults: {room_id: nil, format: 'json'}
+    get '/(:room_id)/:id/join', to: 'bbb#join', defaults: {room_id: nil, format: 'json'}, :constraints => {:id => /[^\/]+/} # override the constraint to allow '.' and disallow '/'
     get '/(:room_id)/:id', to: 'landing#resource', as: :meeting_room, defaults: {room_id: nil}, :constraints => {:id => /[^\/]+/} # override the constraint to allow '.' and disallow '/'
   end