Merge branch 'release-0.23'

Author: longsleep

.hound.yml

@@ -5,4 +5,4 @@ java_script:
 
 scss:
   enabled: true
-  config_file: .scss.yml
+  config_file: src/styles/scss.yml

README.md

@@ -43,9 +43,11 @@ $ make
 
 ## Build seperately
 
-Get Go external dependencies first with ``make get``.
+There are several make targets available. Get Go external dependencies at
+least once with ``make get``, all the other targets depend on this.
 
 ```bash
+$ make get
 $ make assets
 $ make binary
 ```
@@ -121,8 +123,8 @@ Spreed WebRTC should be run through a SSL frontend proxy with
 support for Websockets. Example configuration for Nginx can be
 found in `doc/NGINX.txt`.
 
-In addion for real work use one also needs a STUN/TURN server
-configured with shared secret support.
+In addion for real world use, one also needs a STUN/TURN server
+configured (with shared secret support).
 
 See https://code.google.com/p/rfc5766-turn-server/ for a free
 open source TURN server implementation. Make sure to use a recent

debian/changelog

@@ -1,3 +1,19 @@
+spreed-webrtc-server (0.23.7) precise; urgency=low
+
+  * Updated SCSS to match coding style.
+  * Updated sjcl.js to 1.0.2.
+  * Fixed possible reconnect loop.
+  * TURN Ttl refresh timer is no longer lost when a room was joined.
+  * Fixed a possible dead lock when a hanging connection was replaced.
+  * Fixed authentication id logging.
+  * Avoid broken local video aspect ratio when camera changes aspect ratio while capturing (Mac OS).
+  * 1080p and 720p now can fail back to lower resolution when the camera fails to provide the requested resolution.
+  * Chat messages are now limited to 200k characters in web client.
+  * Channeling API now discards all incoming messages larger than 1MB.
+  * Video component now corretly exits from full screen in all cases.
+
+ -- Simon Eisenmann <[email protected]>  Thu, 05 Mar 2015 18:00:55 +0100
+
 spreed-webrtc-server (0.23.6) precise; urgency=low
 
   * Fixed Youtube module.

src/app/spreed-webrtc-server/channelling_api.go

@@ -113,7 +113,7 @@ func (api *channellingAPI) OnIncoming(c ResponseSender, session *Session, msg *D
 		}
 
 		if err := api.Authenticate(session, st, ""); err == nil {
-			log.Println("Authentication success", session.Userid)
+			log.Println("Authentication success", session.Userid())
 			api.SendSelf(c, session)
 			session.BroadcastStatus()
 		} else {

src/app/spreed-webrtc-server/client.go

@@ -71,8 +71,7 @@ func (client *client) OnText(b Buffer) {
 	if incoming, err := client.DecodeIncoming(b); err == nil {
 		client.OnIncoming(client, client.session, incoming)
 	} else {
-		log.Println("OnText error while decoding JSON", err)
-		log.Printf("JSON:\n%s\n", b)
+		log.Println("OnText error while processing incoming message", err)
 	}
 }
 

src/app/spreed-webrtc-server/connection.go

@@ -104,8 +104,12 @@ func (c *connection) Close() {
 		c.mutex.Unlock()
 		return
 	}
-	c.ws.Close()
 	c.isClosed = true
+	c.mutex.Unlock()
+	// Unlock while we close the websocket connection.
+	c.ws.Close()
+	// Lock again to clean up the queue and send out the signal.
+	c.mutex.Lock()
 	for {
 		head := c.queue.Front()
 		if head == nil {

src/app/spreed-webrtc-server/hub.go

@@ -154,8 +154,12 @@ func (h *hub) OnConnect(client Client, session *Session) {
 	log.Printf("Created client %d with id %s\n", client.Index(), session.Id)
 	// Register connection or replace existing one.
 	if ec, ok := h.clients[session.Id]; ok {
-		log.Printf("Closing obsolete client %d with id %s\n", ec.Index(), session.Id)
-		ec.ReplaceAndClose()
+		// Clean up old client at the end and make sure to run this in another go routine,
+		// to avoid blocking the new client if the old one hangs or whatever.
+		go func() {
+			log.Printf("Closing obsolete client %d (replaced with %d) with id %s\n", ec.Index(), client.Index(), session.Id)
+			ec.ReplaceAndClose()
+		}()
 	}
 	h.clients[session.Id] = client
 	h.mutex.Unlock()

src/app/spreed-webrtc-server/incoming_codec.go

@@ -24,6 +24,7 @@ package main
 import (
 	"bytes"
 	"encoding/json"
+	"errors"
 	"log"
 )
 
@@ -42,18 +43,23 @@ type Codec interface {
 }
 
 type incomingCodec struct {
-	buffers BufferCache
+	buffers       BufferCache
+	incomingLimit int
 }
 
-func NewCodec() Codec {
-	return &incomingCodec{NewBufferCache(1024, bytes.MinRead)}
+func NewCodec(incomingLimit int) Codec {
+	return &incomingCodec{NewBufferCache(1024, bytes.MinRead), incomingLimit}
 }
 
 func (codec incomingCodec) NewBuffer() Buffer {
 	return codec.buffers.New()
 }
 
 func (codec incomingCodec) DecodeIncoming(b Buffer) (*DataIncoming, error) {
+	length := b.GetBuffer().Len()
+	if length > codec.incomingLimit {
+		return nil, errors.New("Incoming message size limit exceeded")
+	}
 	incoming := &DataIncoming{}
 	return incoming, json.Unmarshal(b.Bytes(), incoming)
 }

src/app/spreed-webrtc-server/main.go

@@ -280,6 +280,9 @@ func runner(runtime phoenix.Runtime) error {
 		log.Printf("Loaded extra templates from: %s", extraFolder)
 	}
 
+	// Define incoming channeling API limit it byte. Larger messages will be discarded.
+	incomingCodecLimit := 1024 * 1024 // 1MB
+
 	// Create realm string from config.
 	computedRealm := fmt.Sprintf("%s.%s", serverRealm, config.Token)
 
@@ -336,7 +339,7 @@ func runner(runtime phoenix.Runtime) error {
 
 	// Add handlers.
 	buddyImages := NewImageCache()
-	codec := NewCodec()
+	codec := NewCodec(incomingCodecLimit)
 	roomManager := NewRoomManager(config, codec)
 	hub := NewHub(config, sessionSecret, encryptionSecret, turnSecret, codec)
 	tickets := NewTickets(sessionSecret, encryptionSecret, computedRealm)

src/styles/_shame.scss

@@ -23,54 +23,60 @@
 
 // Remove boostrap 3 modal scroll bar.
 .modal {
-    overflow-y: auto;
+  overflow-y: auto;
 }
 
 // Toastr fontawesome support.
 #toast-container > .toast {
-    background-image: none !important;
+  background-image: none !important;
 }
+
 #toast-container > .toast:before {
-    position: fixed;
-    font-family: FontAwesome;
-    font-size: 20px;
-    line-height: 20px;
-    float: left;
-    color: #fff;
-    padding-right: 0.5em;
-    margin: auto 0.5em auto -1.5em;
+  color: #fff;
+  float: left;
+  font-family: FontAwesome;
+  font-size: 20px;
+  line-height: 20px;
+  margin: auto .5em auto -1.5em;
+  padding-right: .5em;
+  position: fixed;
 }
+
 #toast-container > .toast-warning:before {
-    content: "\f05a";
+  content: '\f05a';
 }
+
 #toast-container > .toast-error:before {
-    content: "\f05a";
+  content: '\f05a';
 }
+
 #toast-container > .toast-info:before {
-    content: "\f05a";
+  content: '\f05a';
 }
+
 #toast-container > .toast-success:before {
-    content: "\f05a";
+  content: '\f05a';
 }
 
 // No shadows for toastr.
-#toast-container > :hover, #toast-container > div {
-	box-shadow: none !important;
+#toast-container > :hover,
+#toast-container > div {
+  box-shadow: none !important;
 }
 
 // Update colors for toaster.
 .toast-info {
-	background-color: #5bc0de;
+  background-color: #5bc0de;
 }
 
 // Update position of toastr close icon.
 .toast-close-button {
-	top: -0.6em;
-	font-size: 1em;
+  font-size: 1em;
+  top: -.6em;
 }
 
 // No opacity for toastr.
 #toast-container > div {
-	opacity: 1;
-	filter: alpha(opacity=100);
-}
+  filter: alpha(opacity=100);
+  opacity: 1;
+}