From cb9099fb1e995fefa01da23fc84ab04c41199e0b Mon Sep 17 00:00:00 2001
From: chandi <git@chandi.it>
Date: Mon, 13 Dec 2021 17:53:06 +0100
Subject: [PATCH] fix and reenable etherpad authorization

---
 docker-compose.tmpl.yml          | 1 +
 mod/etherpad/bbb-etherpad-plugin | 2 +-
 mod/nginx/bbb/notes.nginx        | 8 +++-----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/docker-compose.tmpl.yml b/docker-compose.tmpl.yml
index ee9fc58..1528cbc 100644
--- a/docker-compose.tmpl.yml
+++ b/docker-compose.tmpl.yml
@@ -43,6 +43,7 @@ services:
     restart: unless-stopped
     depends_on:
         - redis
+        - etherpad
     healthcheck:
       test: wget --no-proxy --no-verbose --tries=1 --spider http://10.7.7.2:8090/bigbluebutton/api || exit 1
       start_period: 2m
diff --git a/mod/etherpad/bbb-etherpad-plugin b/mod/etherpad/bbb-etherpad-plugin
index dccf33f..068ded5 160000
--- a/mod/etherpad/bbb-etherpad-plugin
+++ b/mod/etherpad/bbb-etherpad-plugin
@@ -1 +1 @@
-Subproject commit dccf33f8e9ced8ee94520535b487f5f76fbe02f2
+Subproject commit 068ded573380087e120713d1ccc3c86713ec8c88
diff --git a/mod/nginx/bbb/notes.nginx b/mod/nginx/bbb/notes.nginx
index 7fe3945..95bde11 100644
--- a/mod/nginx/bbb/notes.nginx
+++ b/mod/nginx/bbb/notes.nginx
@@ -33,7 +33,7 @@ location /pad/socket.io/socket.io.js {
     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/;
@@ -49,10 +49,8 @@ location /pad/socket.io {
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "Upgrade";
 
-    # this is currently broken
-    # TODO: fix & reenable
-    #auth_request /bigbluebutton/connection/checkAuthorization;
-    #auth_request_set $auth_status $upstream_status;
+    auth_request /bigbluebutton/connection/checkAuthorization;
+    auth_request_set $auth_status $upstream_status;
 }
 
 location /static {