Merge branch 'release-0.23'

Author: longsleep

.hound.yml

@@ -1,3 +1,4 @@
 java_script:
   enabled: true
   config_file: .jshint
+  ignore_file: .javascript_ignore

.javascript_ignore

@@ -0,0 +1 @@
+static/js/libs/**.js

README.md

@@ -108,20 +108,6 @@ The latest version of Spreed WebRTC can be found on GitHub:
   and CSS reload directly.
 
 
-## Branding
-
-  Insert logo in `static/img`. Edit `src/styles/global/_branding.scss` to link
-  to desired custom logo. It is also possible to insert the raw svg data.
-
-
-## Skins
-
-  Insert skins in `src/styles/global/skins` and edit the `@import "skins/light";`
-  line in `src/styles/global/_variables.scss`. Available skins are light and
-  dark. It is recommended to create a new skin file if you wish to customize
-  colors.
-
-
 ## Running for production
 
   Spreed WebRTC should be run through a SSL frontend proxy with

build/r.js

@@ -1,5 +1,5 @@
 /**
- * @license r.js 2.1.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * @license r.js 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
@@ -20,7 +20,7 @@ var requirejs, require, define, xpcUtil;
 (function (console, args, readFileFunc) {
     var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
         nodeDefine, exists, reqMain, loadedOptimizedLib, existsForNode, Cc, Ci,
-        version = '2.1.14',
+        version = '2.1.15',
         jsSuffixRegExp = /\.js$/,
         commandOption = '',
         useLibLoaded = {},
@@ -238,7 +238,7 @@ var requirejs, require, define, xpcUtil;
     }
 
     /** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.1.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
@@ -251,7 +251,7 @@ var requirejs, require, define, xpcUtil;
 (function (global) {
     var req, s, head, baseElement, dataMain, src,
         interactiveScript, currentlyAddingScript, mainScript, subPath,
-        version = '2.1.14',
+        version = '2.1.15',
         commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
         cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
         jsSuffixRegExp = /\.js$/,
@@ -22949,7 +22949,7 @@ define('parse', ['./esprimaAdapter', 'lang'], function (esprima, lang) {
         //Like traverse, but skips if branches that would not be processed
         //after has application that results in tests of true or false boolean
         //literal values.
-        var key, child, result, i, params, param,
+        var key, child, result, i, params, param, tempObject,
             hasHas = options && options.has;
 
         fnExpScope = fnExpScope || emptyScope;
@@ -22979,23 +22979,23 @@ define('parse', ['./esprimaAdapter', 'lang'], function (esprima, lang) {
 
             //Build up a "scope" object that informs nested recurse calls if
             //the define call references an identifier that is likely a UMD
-            //wrapped function expresion argument.
+            //wrapped function expression argument.
             if (object.type === 'ExpressionStatement' && object.expression &&
                     object.expression.type === 'CallExpression' && object.expression.callee &&
                     object.expression.callee.type === 'FunctionExpression') {
-                    object = object.expression.callee;
-
-                    if (object.params && object.params.length) {
-                        params = object.params;
-                        fnExpScope = mixin({}, fnExpScope, true);
-                        for (i = 0; i < params.length; i++) {
-                            param = params[i];
-                            if (param.type === 'Identifier') {
-                                fnExpScope[param.name] = true;
-                            }
+                tempObject = object.expression.callee;
+
+                if (tempObject.params && tempObject.params.length) {
+                    params = tempObject.params;
+                    fnExpScope = mixin({}, fnExpScope, true);
+                    for (i = 0; i < params.length; i++) {
+                        param = params[i];
+                        if (param.type === 'Identifier') {
+                            fnExpScope[param.name] = true;
                         }
                     }
                 }
+            }
 
             for (key in object) {
                 if (object.hasOwnProperty(key)) {
@@ -23014,12 +23014,12 @@ define('parse', ['./esprimaAdapter', 'lang'], function (esprima, lang) {
             //wrapping.
             if (typeof result === 'string') {
                 if (hasProp(fnExpScope, result)) {
-                    //Just a plain return, parsing can continue past this
-                    //point.
-                    return;
+                    //result still in scope, keep jumping out indicating the
+                    //identifier still in use.
+                    return result;
                 }
 
-                return result;
+                return;
             }
         }
     };
@@ -26539,7 +26539,8 @@ define('build', function (require) {
                 "excludeShallow": true,
                 "insertRequire": true,
                 "stubModules": true,
-                "deps": true
+                "deps": true,
+                "mainConfigFile": true
             };
 
         for (i = 0; i < ary.length; i++) {

debian/changelog

@@ -1,3 +1,19 @@
+spreed-webrtc-server (0.23.4) precise; urgency=low
+
+  * Cleanup of README.
+  * Fixed a problem where videos were not sized correctly.
+  * Lodash was updated to 3.0.0.
+  * Server now has an option to require authentication to join rooms.
+  * Screen sharing, youtube and presentation modules can now be disabled in server.conf.
+  * Fixed position of buddy list loader animation.
+  * Fixed loaded of anonymous user data when a plugin uses the authorization api.
+  * Refactored session cleanup to fix ghost sessions.
+  * Reorganization to allow better app support.
+  * Updated require.js and r.js to 2.1.5.
+  * Fixed room reset when default room is disabled.
+
+ -- Simon Eisenmann <[email protected]>  Mon, 02 Feb 2015 17:18:53 +0100
+
 spreed-webrtc-server (0.23.3) precise; urgency=low
 
   * Improved room bar room change and leave buttons.

html/main.html

@@ -22,14 +22,7 @@
         <div class="navbar-collapse collapse" collapse="isCollapsed">
             <ul class="nav navbar-nav navbar-right right">
                 <li class="ng-cloak">
-                    <button title="{{_('Share a YouTube video')}}" class="btn aenablebtn btn-youtubevideo" ng-show="status=='connected' || status=='conference' || layout.youtubevideo" ng-model="layout.youtubevideo" btn-checkbox><i class="fa fa-youtube"></i></button>
-                    <button title="{{_('Share a file as presentation')}}" class="btn aenablebtn btn-presentation" ng-show="status=='connected' || status=='conference' || layout.presentation" ng-model="layout.presentation" btn-checkbox><i class="fa fa-folder-open-o"></i></button>
-                    <button title="{{_('Share your screen')}}" class="btn aenablebtn btn-screenshare" ng-disabled="!supported.screensharing" ng-show="status=='connected' || status=='conference' || layout.screenshare" ng-model="layout.screenshare" btn-checkbox><i class="fa fa-desktop"></i></button>
-                    <button title="{{_('Chat')}}" class="btn btn-chat" ng-class="{messagesunseen: chatMessagesUnseen>0}" ng-model="layout.chat" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false"><i class="fa fa-comments-o"></i><span class="badge" ng-show="chatMessagesUnseen" ng-bind="chatMessagesUnseen"></span></button>
-                    <button ng-show="myid && myuserid" title="{{_('Contacts')}}" class="btn btn-contacts" ng-click="openContactsManager()"><i class="fa fa-sitemap"></i></button>
-                    <button title="{{_('Mute microphone')}}" class="btn btn-mutemicrophone amutebtn" ng-model="microphoneMute" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false"><i class="fa"></i></button>
-                    <button title="{{_('Turn camera off')}}" class="btn btn-mutecamera amutebtn" ng-model="cameraMute" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false"><i class="fa"></i></button>
-                    <button title="{{_('Settings')}}" class="btn btn-settings" ng-model="layout.settings" btn-checkbox btn-checkbox-true="true" btn-checkbox-false="false"><i class="fa fa-cog"></i></button>
+                    <menu></menu>
                 </li>
             </ul>
         </div>

server.conf.in

@@ -78,6 +78,9 @@ encryptionSecret = tne-default-encryption-block-key
 ; all users will join this room if enabled. If it is disabled then a room join
 ; form will be shown instead.
 ;defaultRoomEnabled = true
+; Whether a user account is required to join a room. This only has an effect
+; if user accounts are enabled. Optional, defaults to false.
+;authorizeRoomJoin = false
 ; Whether a user account is required to create a room. This only has an effect
 ; if user accounts are enabled. Optional, defaults to false.
 ;authorizeRoomCreation = false
@@ -115,6 +118,13 @@ serverRealm = local
 ; to test your CSP before putting it into production.
 ;contentSecurityPolicyReportOnly =
 
+[modules]
+; Modules provide optional functionality. Modules are enabled by default and
+; can be disabled by setting false to their corresponding configuration.
+;screensharing = true
+;youtube = true
+;presentation = true
+
 [log]
 ;logfile = /var/log/spreed-webrtc-server.log
 

src/app/spreed-webrtc-server/channeling.go renamed to src/app/spreed-webrtc-server/channelling.go

@@ -23,7 +23,6 @@ package main
 
 import (
 	"log"
-	"strings"
 	"time"
 )
 
@@ -34,7 +33,6 @@ const (
 type ChannellingAPI interface {
 	OnConnect(Client, *Session)
 	OnIncoming(ResponseSender, *Session, *DataIncoming)
-	OnDisconnect(*Session)
 }
 
 type channellingAPI struct {
@@ -46,11 +44,9 @@ type channellingAPI struct {
 	ContactManager
 	TurnDataCreator
 	Unicaster
-	Broadcaster
-	buddyImages ImageCache
 }
 
-func NewChannellingAPI(config *Config, roomStatus RoomStatusManager, sessionEncoder SessionEncoder, sessionManager SessionManager, statsCounter StatsCounter, contactManager ContactManager, turnDataCreator TurnDataCreator, unicaster Unicaster, broadcaster Broadcaster, buddyImages ImageCache) ChannellingAPI {
+func NewChannellingAPI(config *Config, roomStatus RoomStatusManager, sessionEncoder SessionEncoder, sessionManager SessionManager, statsCounter StatsCounter, contactManager ContactManager, turnDataCreator TurnDataCreator, unicaster Unicaster) ChannellingAPI {
 	return &channellingAPI{
 		config,
 		roomStatus,
@@ -60,8 +56,6 @@ func NewChannellingAPI(config *Config, roomStatus RoomStatusManager, sessionEnco
 		contactManager,
 		turnDataCreator,
 		unicaster,
-		broadcaster,
-		buddyImages,
 	}
 }
 
@@ -77,40 +71,31 @@ func (api *channellingAPI) OnIncoming(c ResponseSender, session *Session, msg *D
 	case "Hello":
 		//log.Println("Hello", msg.Hello, c.Index())
 		// TODO(longsleep): Filter room id and user agent.
-		api.UpdateSession(session, &SessionUpdate{Types: []string{"Ua"}, Ua: msg.Hello.Ua})
-		if session.Hello && session.Roomid != msg.Hello.Id {
-			api.LeaveRoom(session)
-			api.Broadcast(session, session.DataSessionLeft("soft"))
-		}
+		session.Update(&SessionUpdate{Types: []string{"Ua"}, Ua: msg.Hello.Ua})
 
+		room, err := session.JoinRoom(msg.Hello.Id, msg.Hello.Credentials, c)
 		// NOTE(lcooper): Iid filtered for compatibility's sake.
 		// Evaluate sending unconditionally when supported by all clients.
-		if room, err := api.JoinRoom(msg.Hello.Id, msg.Hello.Credentials, session, c); err == nil {
-			session.Hello = true
-			session.Roomid = msg.Hello.Id
-			if msg.Iid != "" {
+		if msg.Iid != "" {
+			if err == nil {
 				c.Reply(msg.Iid, &DataWelcome{
 					Type:  "Welcome",
 					Room:  room,
 					Users: api.RoomUsers(session),
 				})
-			}
-			api.Broadcast(session, session.DataSessionJoined())
-		} else {
-			session.Hello = false
-			if msg.Iid != "" {
+			} else {
 				c.Reply(msg.Iid, err)
 			}
 		}
 	case "Offer":
 		// TODO(longsleep): Validate offer
-		api.Unicast(session, msg.Offer.To, msg.Offer)
+		session.Unicast(msg.Offer.To, msg.Offer)
 	case "Candidate":
 		// TODO(longsleep): Validate candidate
-		api.Unicast(session, msg.Candidate.To, msg.Candidate)
+		session.Unicast(msg.Candidate.To, msg.Candidate)
 	case "Answer":
 		// TODO(longsleep): Validate Answer
-		api.Unicast(session, msg.Answer.To, msg.Answer)
+		session.Unicast(msg.Answer.To, msg.Answer)
 	case "Users":
 		if session.Hello {
 			sessions := &DataSessions{Type: "Users", Users: api.RoomUsers(session)}
@@ -125,27 +110,27 @@ func (api *channellingAPI) OnIncoming(c ResponseSender, session *Session, msg *D
 		if err := api.Authenticate(session, st, ""); err == nil {
 			log.Println("Authentication success", session.Userid)
 			api.SendSelf(c, session)
-			api.BroadcastSessionStatus(session)
+			session.BroadcastStatus()
 		} else {
 			log.Println("Authentication failed", err, st.Userid, st.Nonce)
 		}
 	case "Bye":
-		api.Unicast(session, msg.Bye.To, msg.Bye)
+		session.Unicast(msg.Bye.To, msg.Bye)
 	case "Status":
 		//log.Println("Status", msg.Status)
-		api.UpdateSession(session, &SessionUpdate{Types: []string{"Status"}, Status: msg.Status.Status})
-		api.BroadcastSessionStatus(session)
+		session.Update(&SessionUpdate{Types: []string{"Status"}, Status: msg.Status.Status})
+		session.BroadcastStatus()
 	case "Chat":
 		// TODO(longsleep): Limit sent chat messages per incoming connection.
 		if !msg.Chat.Chat.NoEcho {
-			api.Unicast(session, session.Id, msg.Chat)
+			session.Unicast(session.Id, msg.Chat)
 		}
 		msg.Chat.Chat.Time = time.Now().Format(time.RFC3339)
 		if msg.Chat.To == "" {
 			// TODO(longsleep): Check if chat broadcast is allowed.
 			if session.Hello {
 				api.CountBroadcastChat()
-				api.Broadcast(session, msg.Chat)
+				session.Broadcast(msg.Chat)
 			}
 		} else {
 			if msg.Chat.Chat.Status != nil && msg.Chat.Chat.Status.ContactRequest != nil {
@@ -159,10 +144,10 @@ func (api *channellingAPI) OnIncoming(c ResponseSender, session *Session, msg *D
 				api.CountUnicastChat()
 			}
 
-			api.Unicast(session, msg.Chat.To, msg.Chat)
+			session.Unicast(msg.Chat.To, msg.Chat)
 			if msg.Chat.Chat.Mid != "" {
 				// Send out delivery confirmation status chat message.
-				api.Unicast(session, session.Id, &DataChat{To: msg.Chat.To, Type: "Chat", Chat: &DataChatMessage{Mid: msg.Chat.Chat.Mid, Status: &DataChatStatus{State: "sent"}}})
+				session.Unicast(session.Id, &DataChat{To: msg.Chat.To, Type: "Chat", Chat: &DataChatMessage{Mid: msg.Chat.Chat.Mid, Status: &DataChatStatus{State: "sent"}}})
 			}
 		}
 	case "Conference":
@@ -173,7 +158,7 @@ func (api *channellingAPI) OnIncoming(c ResponseSender, session *Session, msg *D
 			// Send conference update to anyone.
 			for _, id := range msg.Conference.Conference {
 				if id != session.Id {
-					api.Unicast(session, id, msg.Conference)
+					session.Unicast(id, msg.Conference)
 				}
 			}
 		}
@@ -211,7 +196,7 @@ func (api *channellingAPI) OnIncoming(c ResponseSender, session *Session, msg *D
 		}
 	case "Room":
 		if room, err := api.UpdateRoom(session, msg.Room); err == nil {
-			api.Broadcast(session, room)
+			session.Broadcast(room)
 			c.Reply(msg.Iid, room)
 		} else {
 			c.Reply(msg.Iid, err)
@@ -221,23 +206,6 @@ func (api *channellingAPI) OnIncoming(c ResponseSender, session *Session, msg *D
 	}
 }
 
-func (api *channellingAPI) OnDisconnect(session *Session) {
-	dsl := session.DataSessionLeft("hard")
-	if session.Hello {
-		api.LeaveRoom(session)
-		api.Broadcast(session, dsl)
-	}
-
-	session.RunForAllSubscribers(func(session *Session) {
-		log.Println("Notifying subscriber that we are gone", session.Id, session.Id)
-		api.Unicast(session, session.Id, dsl)
-	})
-
-	api.Unicaster.OnDisconnect(session)
-
-	api.buddyImages.Delete(session.Id)
-}
-
 func (api *channellingAPI) SendSelf(c Responder, session *Session) {
 	token, err := api.EncodeSessionToken(session)
 	if err != nil {
@@ -259,26 +227,3 @@ func (api *channellingAPI) SendSelf(c Responder, session *Session) {
 	}
 	c.Reply("", self)
 }
-
-func (api *channellingAPI) UpdateSession(session *Session, s *SessionUpdate) uint64 {
-	if s.Status != nil {
-		status, ok := s.Status.(map[string]interface{})
-		if ok && status["buddyPicture"] != nil {
-			pic := status["buddyPicture"].(string)
-			if strings.HasPrefix(pic, "data:") {
-				imageId := api.buddyImages.Update(session.Id, pic[5:])
-				if imageId != "" {
-					status["buddyPicture"] = "img:" + imageId
-				}
-			}
-		}
-	}
-
-	return session.Update(s)
-}
-
-func (api *channellingAPI) BroadcastSessionStatus(session *Session) {
-	if session.Hello {
-		api.Broadcast(session, session.DataSessionStatus())
-	}
-}