Merge branch 'release-0.28'

Author: longsleep

.gitignore

@@ -19,6 +19,7 @@ vendor/*
 /build/out/
 /.sass-cache
 /extra
+/extra.d
 /src/i18n/*.mo
 server.key
 server.csr

.travis.yml

@@ -3,10 +3,14 @@
 language: go
 
 go:
-  - 1.3
   - 1.4
   - 1.5
   - 1.6
+  - tip
+
+matrix:
+  allow_failures:
+    - go: tip
 
 env:
   - GEM_HOME=/var/lib/gems/1.9.1

AUTHORS

@@ -10,3 +10,4 @@ Leon Klingele <[email protected]>
 
 Translation:
 Curt Frisemo <[email protected]>
+Irek Zaripov <[email protected]>

CHANGELOG.md

@@ -1,3 +1,74 @@
+## 0.28.0
+
+  * Update Git hooks, to auto check translations
+  * Fix a bunch of translations, after checks found issues
+
+
+## 0.27.2
+
+  * Update -X arguments syntax
+  * Add Docker instructions to README.md
+  * Add Dockerfiles to build minimal Docker
+  * Check .po files before committing.
+  * Added script to check style of .po files.
+  * Fixed various style issues in .po files.
+  * Allow custom GOROOT to make Travis happy
+  * Unset GOROOT and GOBIN in Makefile
+  * Update Dockerfile to make sense
+  * Bump go.uuid to 1.1.0
+  * Add Go tip to travis (allowed to fail)
+  * Bump Go requirement to 1.4
+  * Update gorilla websocket build dependency
+
+
+## 0.27.1
+
+  * Compute 'extra.d' relative URL
+  * Compare HMACs in constant time to mitigate timing attack
+  * Use proper variable for extra.d folder detection
+  * Add support for symlinks inside extra.d
+
+
+## 0.27.0
+
+  * Stop to use window.alert() for load errors
+  * Add support for extra.d directory
+  * Hide "call" button when in conference rooms. In conference rooms, everybody automatically calls each other, so there is no need for an explicit "Call" button.
+  * Only install git hook if cloned from git. For source tarballs, the `.git/hooks` folder does not exist, so an error is shown when running `autogen.sh`. With this change, the hook is not installed in such cases.
+  * Added API to leave a room. Previously it was only possible to leave a room by switching to another room. This change allows explicitly leaving a room without re-joining.
+  * Make the room type configurable through NATS.
+  * Include user status in "Joined" event. Previously, each user broadcasted the status after a "Room" event was received. This caused a short time for all other participants where the buddy list showed "Participant X" instead of the real user name.
+  * Fix moving between conference rooms.
+  * Try to recover from (some) lost p2p connection state. When the ICE connection state changes to "disconnected"/"failed", these calls are marked and get re-called for conferences once the connection is back and are allowed to send an "Offer" again. This works in cases where the complete connectivity is lost for one client while being in a conference once it comes back afterwards for him. Doesn't work reliably on Firefox as no "disconnected"/"failed" is triggered there.
+  * Don't add dummy remote streams if call is closed.
+  * Don't show "failed" error if connection was established before.
+  * Major refactoring of call / conference handling. Removed difference between single peer-to-peer calls and conferences with multiple peers. There is only a single code path now that creates calls and stores them in a conference (which holds all active calls). With this also fixed some timing issues that could cause conference peers to not send or receive media streams.
+  * Remove keygen usage from web client, effectlively removing certificate creation through web client (fixes #274).
+  * Update AngularJS to 1.5.6
+  * Update angular-ui-bootstrap to 0.13.4.
+  * Update angular.js to 1.4.6.
+  * Moved room type name to variable.
+  * Move room type names to constants and don't expose roomworker properties.
+  * Reverse data in session ids.
+  * Also send "Conference" message after "Room" messages.
+  * Don't send "Conference" event if user couldn't join room.
+  * Use "safeApply" when handling webrtc done/stop events.
+  * Always show own video when in conference room.
+  * Also hide other hangup buttons in conference rooms.
+  * Hide "Hangup" button in conferences.
+  * Implement new API for tests.
+  * Updated evaluation of Conference messages to support serverside conferences.
+  * Add CSS class with current room type to body including helpers to show/hide elements.
+  * Evaluate room type mapping and send Conference messages for conference rooms. The messages are trigger whenever a new user joins a conference room. For such rooms, clientside Conference messages are ignored.
+  * Make mapping of room name to room type configurable.
+  * Fixed wrong attribute name. Also use cached variable instead of performing attribute lookup.
+  * Fixed updating state if a conference gets downgraded to p2p.
+  * Fixed inconsistent PeerConference creation. There was a case where a three-party conference got downgraded to a p2p session and then upgraded to a three-party conference again, that the two remaining participants created their own PeerConference object resulting in a "split-brain" conference.
+  * Move stream id creation to PeerCall. That way the streams can be registered internally and properly cleaned up on hangup.
+  * spelling
+  * Added translation for Russian
+
+
 ## 0.26.0
 
   * Remove go-tip from travis until it works again.
@@ -639,5 +710,3 @@
 ## 0.15.0
 
   * Initial public release.
-
-

Dockerfile

@@ -1,4 +1,4 @@
-# Spreed WebRTC server in Docker
+# Spreed WebRTC server in Docker (for development)
 #
 # This Dockerfile creates a container which runs Spreed WebRTC as found in the
 # current folder. It is intended for development.
@@ -21,8 +21,8 @@
 # when running the docker container as with `-c` parameter like this:
 #
 #   ```
-#   docker run --rm --name my-spreed-webrtc -p 8080:8080 \
-#       -v `pwd`:/srv/extra -i -t spreed-webrtc` \
+#   docker run --rm --name my-spreed-webrtc -p 8080:8080 -p 8443:8443 \
+#       -v `pwd`:/srv/extra -i -t spreed-webrtc \
 #       -c /srv/extra/server.conf
 #   ```
 #
@@ -45,49 +45,29 @@ ENV DEBIAN_FRONTEND noninteractive
 
 # Base build dependencies.
 RUN apt-get update && apt-get install -qy \
-	golang nodejs build-essential git automake autoconf
+	golang \
+	nodejs \
+	build-essential \
+	git \
+	automake \
+	autoconf
 
 # Add and build Spreed WebRTC server.
 ADD . /srv/spreed-webrtc
 WORKDIR /srv/spreed-webrtc
-RUN ./autogen.sh && ./configure && make pristine && make get && make
+RUN ./autogen.sh && \
+	./configure && \
+	make pristine && \
+	make get && \
+	make
 
-# Create entrypoint script.
-RUN echo '\n\
-set -e\n\
-if [ "$NEWCERT" = "1" -o ! -e /srv/cert.pem ]; then\n\
-	echo "Creating new self signed TLS certificate ..."\n\
-	rm -f /srv/privkey.pem\n\
-	rm -f /srv/cert.pem\n\
-	openssl ecparam -genkey -name secp384r1 -out /srv/privkey.pem\n\
-	openssl req -new -x509 -key /srv/privkey.pem \\\n\
-				-out /srv/cert.pem -days 3650 \\\n\
-				-subj /CN=spreed-webrtc \\\n\
-				-config /etc/ssl/openssl.cnf \\\n\
-				-sha256 -extensions v3_req\n\
+# Add runtime dependencies.
+RUN apt-get update && apt-get install -qy \
+	bsdmainutils \
+	openssl
 
-fi\n\
-echo "TLS certificate:"\n\
-openssl x509 -in /srv/cert.pem -text\n\
-if [ "$NEWSECRETS" = "1" -o ! -e /srv/secrets.conf ]; then\n\
-	echo "Creating new server secrets ..."\n\
-	rm -f /srv/secrets.conf.tmp\n\
-	echo "SESSION_SECRET=$(openssl rand -hex 32)" >>/srv/secrets.conf.tmp\n\
-	echo "ENCRYPTION_SECRET=$(openssl rand -hex 32)" >>/srv/secrets.conf.tmp\n\
-	echo "SERVER_TOKEN=$(openssl rand -hex 32)" >>/srv/secrets.conf.tmp\n\
-	echo "SHARED_SECRET=$(openssl rand -hex 32)" >>/srv/secrets.conf.tmp\n\
-	. /srv/secrets.conf.tmp\n\
-	sed -i -e "s/sessionSecret =.*/sessionSecret = $SESSION_SECRET/" /srv/spreed-webrtc/default.conf\n\
-	sed -i -e "s/encryptionSecret =.*/encryptionSecret = $ENCRYPTION_SECRET/" /srv/spreed-webrtc/default.conf\n\
-	sed -i -e "s/serverToken =.*/serverToken = $SERVER_TOKEN/" /srv/spreed-webrtc/default.conf\n\
-	sed -i -e "s/;sharedsecret_secret =.*/sharedsecret_secret = $SHARED_SECRET/" /srv/spreed-webrtc/default.conf\n\
-	mv /srv/secrets.conf.tmp /srv/secrets.conf\n\
-fi\n\
-echo "Server secrets:"\n\
-cat /srv/secrets.conf\n\
-echo "Staring Spreed WebRTC server ..."\n\
-exec /srv/spreed-webrtc/spreed-webrtc-server "$@"\n'\
->> /srv/entrypoint.sh
+# Add entrypoint.
+COPY scripts/docker_entrypoint.sh /srv/entrypoint.sh
 
 # Create default config file.
 RUN cp -v /srv/spreed-webrtc/server.conf.in /srv/spreed-webrtc/default.conf && \

Dockerfile.build

@@ -0,0 +1,56 @@
+# Spreed WebRTC server Docker builder
+#
+# This Dockerfile creates a container which builds Spreed WebRTC as found in the
+# current folder, and creates a tarball which can be piped into another Docker
+# container for creating minimal sized Docker containers.
+#
+# First create the builder image:
+#
+#   ```
+#   docker build -t spreed-webrtc-builder -f Dockerfile.build .
+#   ```
+# Next run the builder container, piping its output into the creation of the
+# runner container. This creates a minimal size Docker image which can be used
+# to run Spreed WebRTC in production.
+#
+#   ```
+#   docker run --rm spreed-webrtc-builder | docker build -t spreed-webrtc -f Dockerfile.run -
+#   ```
+
+FROM ubuntu:xenial
+MAINTAINER Simon Eisenmann <[email protected]>
+
+# Set locale.
+RUN locale-gen --no-purge en_US.UTF-8
+ENV LC_ALL en_US.UTF-8
+
+ENV DEBIAN_FRONTEND noninteractive
+
+# Base build dependencies.
+RUN apt-get update && apt-get install -qy \
+	golang \
+	nodejs \
+	build-essential \
+	git \
+	automake \
+	autoconf
+
+# Add and build Spreed WebRTC server.
+ADD . /srv/spreed-webrtc
+WORKDIR /srv/spreed-webrtc
+RUN mkdir -p /usr/share/gocode/src
+RUN ./autogen.sh && \
+	./configure && \
+	make pristine && \
+	make get && \
+	make tarball
+RUN rm /srv/spreed-webrtc/dist_*/*.tar.gz
+RUN mv /srv/spreed-webrtc/dist_*/spreed-webrtc-* /srv/spreed-webrtc/dist
+
+# Add gear required by Dockerfile.run.
+COPY Dockerfile.run /
+COPY scripts/docker_entrypoint.sh /
+
+# Running this image produces a tarball suitable to be piped into another
+# Docker build command.
+CMD tar -cf - -C / Dockerfile.run docker_entrypoint.sh /srv/spreed-webrtc/dist

Dockerfile.run

@@ -0,0 +1,91 @@
+# Spreed WebRTC server in minimal Docker (for production)
+#
+# This Dockerfile creates a container which builds Spreed WebRTC as piped in
+# on stdin using another Docker container defined in `Dockerfile.build`.
+#
+# First create the builder image:
+#
+#   ```
+#   docker build -t spreed-webrtc-builder -f Dockerfile.build .
+#   ```
+#
+# Next run the builder container, piping its output into the creation of the
+# runner container:
+#
+#   ```
+#   docker run --rm spreed-webrtc-builder | docker build -t spreed-webrtc -f Dockerfile.run -
+#   ```
+#
+# image. Afterwards run the container like this:
+#
+#   ```
+#   docker run --rm --name my-spreed-webrtc -p 8080:8080 -p 8443:8443 \
+#       -v `pwd`:/srv/extra -i -t spreed-webrtc
+#   ```
+#
+# Now you can either use a frontend proxy like Nginx to provide TLS to Spreed
+# WebRTC and even run it in production like that from the Docker container, or
+# for easy development testing, the container also provides a TLS listener with
+# a self-signed certificate on port 8443.
+#
+# To use custom configuration, use the `server.conf.in` file as template and
+# remove the listeners from [http] and [https] sections. Then provide that file
+# when running the docker container as with `-c` parameter like this:
+#
+#   ```
+#   docker run --rm --name my-spreed-webrtc -p 8080:8080 -p 8443:8443 \
+#       -v `pwd`:/srv/extra -i -t spreed-webrtc \
+#       -c /srv/extra/server.conf
+#   ```
+#
+# And last, this container checks environment variables NEWCERT and NEWSECRETS,
+# on startup. Set those to `1` to regenerate the corresponding values on start.
+# The current certificate and secrets are printed before startup so you can use
+# them easily for other services. Of course, if you want to have persistent cert
+# and secrets, the container needs to be persistent in the first place, so no
+# `--rm` parameter in the example from above in that case.
+#
+
+FROM frolvlad/alpine-glibc:alpine-3.3_glibc-2.23
+MAINTAINER Simon Eisenmann <[email protected]>
+
+ENV LANG=C.UTF-8
+
+# Add dependencies.
+RUN apk add --no-cache \
+	openssl
+
+# Add Spreed WebRTC as provided by Dockerfile.run.
+COPY srv/ /srv
+
+# Move around stuff from tarball to their expected locations.
+RUN mv /srv/spreed-webrtc/dist/loader/* /srv/spreed-webrtc && \
+	mv /srv/spreed-webrtc/dist/www/html /srv/spreed-webrtc && \
+	mv /srv/spreed-webrtc/dist/www/static /srv/spreed-webrtc
+
+# Add entrypoint.
+COPY docker_entrypoint.sh /srv/entrypoint.sh
+
+# Create default config.
+RUN cp -v /srv/spreed-webrtc/server.conf.in /srv/spreed-webrtc/default.conf && \
+	sed -i 's|listen = 127.0.0.1:8080|listen = 0.0.0.0:8080|' /srv/spreed-webrtc/default.conf && \
+	sed -i 's|;root = .*|root = /srv/spreed-webrtc|' /srv/spreed-webrtc/default.conf && \
+	sed -i 's|;listen = 127.0.0.1:8443|listen = 0.0.0.0:8443|' /srv/spreed-webrtc/default.conf && \
+	sed -i 's|;certificate = .*|certificate = /srv/cert.pem|' /srv/spreed-webrtc/default.conf && \
+	sed -i 's|;key = .*|key = /srv/privkey.pem|' /srv/spreed-webrtc/default.conf && \
+	touch /etc/spreed-webrtc-server.conf
+
+# Cleanup.
+RUN rm -rf /tmp/* /var/cache/apk/*
+
+# Add mount point for extra things.
+RUN mkdir /srv/extra
+VOLUME /srv/extra
+
+# Tell about our service.
+EXPOSE 8080
+EXPOSE 8443
+
+# Define entry point with default command.
+ENTRYPOINT ["/bin/sh", "/srv/entrypoint.sh", "-dc", "/srv/spreed-webrtc/default.conf"]
+CMD ["-c", "/etc/spreed-webrtc-server.conf"]

Makefile.am

@@ -21,6 +21,8 @@
 AUTOMAKE_OPTIONS = -Wno-portability
 ACLOCAL_AMFLAGS = -I m4
 
+unexport GOBIN
+
 EXENAME := spreed-webrtc-server
 GOPKG := github.com/strukturag/spreed-webrtc
 GOPATH := "$(CURDIR)/vendor:$(CURDIR)"
@@ -132,7 +134,7 @@ update-i18n:
 	cd $(CURDIR)/src/i18n && $(MAKE) update
 
 release-binary: GOPATH = "$(DIST):$(CURDIR)/vendor:$(CURDIR)"
-release-binary: INTERNALLDFLAGS = -X main.version $(PACKAGE_VERSION) -X main.defaultConfig $(CONFIG_PATH)/$(CONFIG_FILE)
+release-binary: INTERNALLDFLAGS = -X main.version=$(PACKAGE_VERSION) -X main.defaultConfig=$(CONFIG_PATH)/$(CONFIG_FILE)
 release-binary: OUTPUT = $(DIST_BIN)
 release-binary: dist_gopath $(DIST_BIN) binary