From 0d52b6def6ebc7fdc4493041028cb8c2105ae654 Mon Sep 17 00:00:00 2001
From: chandi <git@chandi.it>
Date: Thu, 30 Jul 2020 12:07:03 +0200
Subject: [PATCH] apply v2.2.21 changes

---
 mod/html5/Dockerfile      |  4 ++--
 mod/html5/settings.yml    |  2 +-
 mod/nginx/bbb/notes.nginx | 26 +++++++++++++++++++++-----
 mod/nginx/bbb/sip.nginx   |  3 +++
 sample.env                |  6 +++---
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/mod/html5/Dockerfile b/mod/html5/Dockerfile
index 31def3a..2897746 100644
--- a/mod/html5/Dockerfile
+++ b/mod/html5/Dockerfile
@@ -14,7 +14,7 @@ USER meteor
 ENV METEOR_VERSION 1.8.1
 RUN curl -sL https://install.meteor.com?release=$METEOR_VERSION | sed s/--progress-bar/-sL/g | /bin/sh
 
-ENV TAG v2.2.20
+ENV TAG v2.2.21
 RUN cd ~ \
     && svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bigbluebutton-html5 \
     && mv ~/bigbluebutton-html5 ~/source \
@@ -51,4 +51,4 @@ USER meteor
 ENTRYPOINT ["/entrypoint.sh"]
 
 # lets set the tag again, so that it is include in the image for later version retrieval
-ENV TAG v2.2.20
+ENV TAG v2.2.21
diff --git a/mod/html5/settings.yml b/mod/html5/settings.yml
index f85505c..02f04ca 100644
--- a/mod/html5/settings.yml
+++ b/mod/html5/settings.yml
@@ -11,7 +11,7 @@ public:
     appName: BigBlueButton HTML5 Client
     bbbServerVersion: 2.2
     copyright: "©2020 BigBlueButton Inc."
-    html5ClientBuild: 968
+    html5ClientBuild: 980
     helpLink: https://bigbluebutton.org/html5/
     lockOnJoin: true
     cdn: ""
diff --git a/mod/nginx/bbb/notes.nginx b/mod/nginx/bbb/notes.nginx
index 6a1b0ce..17f1e43 100644
--- a/mod/nginx/bbb/notes.nginx
+++ b/mod/nginx/bbb/notes.nginx
@@ -1,15 +1,21 @@
 # https://github.com/ether/etherpad-lite/wiki/How-to-put-Etherpad-Lite-behind-a-reverse-Proxy
-location ~ "^\/pad\/p\/(\w+)$" {
-    rewrite                /pad/(.*) /$1 break;
-    rewrite                ^/pad$ /pad/ permanent;
+location /pad/p/ {
+    rewrite /pad/p/(.*) /p/$1 break;
+    rewrite ^/pad/p$ /pad/p/ permanent;
     proxy_pass             http://etherpad:9001;
     proxy_pass_header      Server;
     proxy_redirect         / /pad;
     proxy_set_header       Host $host;
     proxy_buffering off;
 
-    auth_request /bigbluebutton/connection/checkAuthorization;
-    auth_request_set $auth_status $upstream_status;
+    # there is currently no viable source for building the
+    # bbb-etherpad including sesstiontokens which got introduced in v2.2.21
+    # https://github.com/bigbluebutton/bigbluebutton/issues/10159
+    #
+    # We disable the authentication for now.
+    
+    # auth_request /bigbluebutton/connection/checkAuthorization;
+    # auth_request_set $auth_status $upstream_status;
 }
 
 location /pad {
@@ -22,6 +28,13 @@ location /pad {
     proxy_buffering off;
 }
 
+location /pad/socket.io/socket.io.js {
+    rewrite /pad/socket.io/socket.io.js /socket.io/socket.io.js break;
+    proxy_pass http://etherpad:9001/;
+    proxy_set_header Host $host;
+    proxy_buffering off;
+}
+
 location /pad/socket.io {
     rewrite /pad/socket.io/(.*) /socket.io/$1 break;
     proxy_pass http://etherpad:9001/;
@@ -36,6 +49,9 @@ location /pad/socket.io {
     # WebSocket proxying - from http://nginx.org/en/docs/http/websocket.html
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "Upgrade";
+
+    # auth_request /bigbluebutton/connection/checkAuthorization;
+    # auth_request_set $auth_status $upstream_status;
 }
 
 location /static {
diff --git a/mod/nginx/bbb/sip.nginx b/mod/nginx/bbb/sip.nginx
index 4cd05c0..ee4993e 100644
--- a/mod/nginx/bbb/sip.nginx
+++ b/mod/nginx/bbb/sip.nginx
@@ -9,4 +9,7 @@ location /ws {
         proxy_send_timeout 6h;
         client_body_timeout 6h;
         send_timeout 6h;
+        
+        auth_request /bigbluebutton/connection/checkAuthorization;
+        auth_request_set $auth_status $upstream_status;
 }
\ No newline at end of file
diff --git a/sample.env b/sample.env
index 46e6280..8782e2a 100644
--- a/sample.env
+++ b/sample.env
@@ -72,11 +72,11 @@ SIP_IP_ALLOWLIST=
 CLIENT_TITLE=BigBlueButton
 
 # use following lines to replace the default welcome message and footer
-WELCOME_MESSAGE=Welcome to <b>%%CONFNAME%%</b>!<br><br>For help on using BigBlueButton see these (short) <a href="event:http://www.bigbluebutton.org/html5"><u>tutorial videos</u></a>.<br><br>To join the audio bridge click the phone button.  Use a headset to avoid causing background noise for others.
-WELCOME_FOOTER=This server is running <a href="http://docs.bigbluebutton.org/" target="_blank"><u>BigBlueButton</u></a>.
+WELCOME_MESSAGE=Welcome to <b>%%CONFNAME%%</b>!<br><br>For help on using BigBlueButton see these (short) <a href="https://www.bigbluebutton.org/html5" target="_blank"><u>tutorial videos</u></a>.<br><br>To join the audio bridge click the phone button.  Use a headset to avoid causing background noise for others.
+WELCOME_FOOTER=This server is running <a href="https://docs.bigbluebutton.org/" target="_blank"><u>BigBlueButton</u></a>.
 
 # use following line for an additional SIP dial-in message
-#WELCOME_FOOTER=This server is running <a href="http://docs.bigbluebutton.org/" target="_blank"><u>BigBlueButton</u></a>. <br><br>To join this meeting by phone, dial:<br>  INSERT_YOUR_PHONE_NUMBER_HERE<br>Then enter %%CONFNUM%% as the conference PIN number.
+#WELCOME_FOOTER=This server is running <a href="https://docs.bigbluebutton.org/" target="_blank"><u>BigBlueButton</u></a>. <br><br>To join this meeting by phone, dial:<br>  INSERT_YOUR_PHONE_NUMBER_HERE<br>Then enter %%CONFNUM%% as the conference PIN number.
 
 # for a different default presentation, place the pdf file in ./conf/ and
 # adjust the following path