From 4ee76cf2b48d85af092912db3cc73ce63bb73225 Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Thu, 16 Sep 2021 16:52:56 +0200 Subject: [PATCH] CE/SP hotfixes `2.7.1` and `3.0.1` (#5046) Removes `/disconnectAllUsers`, that was exposed to all users Fixes broken image when `ENABLE_CONVERSIONS` is set to `false` GitOrigin-RevId: 6ef04e1bff91ac46d3587075328bba2636bb23e2 --- server-ce/hotfix/2.7.1/Dockerfile | 5 +++++ .../hotfix/2.7.1/remove-disconnect-endpoint.patch | 14 ++++++++++++++ server-ce/hotfix/3.0.1/Dockerfile | 5 +++++ .../hotfix/3.0.1/remove-disconnect-endpoint.patch | 14 ++++++++++++++ 4 files changed, 38 insertions(+) create mode 100644 server-ce/hotfix/2.7.1/Dockerfile create mode 100644 server-ce/hotfix/2.7.1/remove-disconnect-endpoint.patch create mode 100644 server-ce/hotfix/3.0.1/Dockerfile create mode 100644 server-ce/hotfix/3.0.1/remove-disconnect-endpoint.patch diff --git a/server-ce/hotfix/2.7.1/Dockerfile b/server-ce/hotfix/2.7.1/Dockerfile new file mode 100644 index 0000000000..5d7cb3e268 --- /dev/null +++ b/server-ce/hotfix/2.7.1/Dockerfile @@ -0,0 +1,5 @@ +FROM sharelatex/sharelatex:2.7.0 + +# Patch: fixes overleaf.com onboarding email being sent in CE/SP +COPY remove-disconnect-endpoint.patch . +RUN patch -p0 < remove-disconnect-endpoint.patch diff --git a/server-ce/hotfix/2.7.1/remove-disconnect-endpoint.patch b/server-ce/hotfix/2.7.1/remove-disconnect-endpoint.patch new file mode 100644 index 0000000000..c1328a2da2 --- /dev/null +++ b/server-ce/hotfix/2.7.1/remove-disconnect-endpoint.patch @@ -0,0 +1,14 @@ +--- /var/www/sharelatex/web/app/src/router.js +--- /var/www/sharelatex/web/app/src/router.js +@@ -995,11 +995,6 @@ function initialize(webRouter, privateApiRouter, publicApiRouter) { + AdminController.unregisterServiceWorker + ) + +- privateApiRouter.post( +- '/disconnectAllUsers', +- AdminController.disconnectAllUsers +- ) +- + privateApiRouter.get('/perfTest', (req, res) => res.send('hello')) + + publicApiRouter.get('/status', (req, res) => { diff --git a/server-ce/hotfix/3.0.1/Dockerfile b/server-ce/hotfix/3.0.1/Dockerfile new file mode 100644 index 0000000000..3db2819e8e --- /dev/null +++ b/server-ce/hotfix/3.0.1/Dockerfile @@ -0,0 +1,5 @@ +FROM sharelatex/sharelatex:3.0.0 + +# Patch: fixes overleaf.com onboarding email being sent in CE/SP +COPY remove-disconnect-endpoint.patch . +RUN patch -p0 < remove-disconnect-endpoint.patch diff --git a/server-ce/hotfix/3.0.1/remove-disconnect-endpoint.patch b/server-ce/hotfix/3.0.1/remove-disconnect-endpoint.patch new file mode 100644 index 0000000000..c1328a2da2 --- /dev/null +++ b/server-ce/hotfix/3.0.1/remove-disconnect-endpoint.patch @@ -0,0 +1,14 @@ +--- /var/www/sharelatex/web/app/src/router.js +--- /var/www/sharelatex/web/app/src/router.js +@@ -995,11 +995,6 @@ function initialize(webRouter, privateApiRouter, publicApiRouter) { + AdminController.unregisterServiceWorker + ) + +- privateApiRouter.post( +- '/disconnectAllUsers', +- AdminController.disconnectAllUsers +- ) +- + privateApiRouter.get('/perfTest', (req, res) => res.send('hello')) + + publicApiRouter.get('/status', (req, res) => {