mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-21 20:47:08 -05:00
Merge pull request #792 from overleaf/msm-hotfix-2-4-2
Hotfix 2.4.2 - fix anon read/write sharing
This commit is contained in:
commit
f3fc0e93e9
3 changed files with 65 additions and 0 deletions
10
hotfix/2.4.2/Dockerfile
Normal file
10
hotfix/2.4.2/Dockerfile
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
FROM sharelatex/sharelatex:2.4.1
|
||||||
|
|
||||||
|
|
||||||
|
# Patch: Fixes anonymous read/write sharing
|
||||||
|
COPY anonymous-metadata.patch ${baseDir}
|
||||||
|
RUN cd ${baseDir} && patch -p0 < anonymous-metadata.patch
|
||||||
|
|
||||||
|
# Patch: Fixes left footer with html text
|
||||||
|
COPY left-footer-skip-translation.patch ${baseDir}
|
||||||
|
RUN cd ${baseDir} && patch -p0 < left-footer-skip-translation.patch
|
43
hotfix/2.4.2/anonymous-metadata.patch
Normal file
43
hotfix/2.4.2/anonymous-metadata.patch
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
--- /var/www/sharelatex/web/app/src/router.js 2020-09-14 20:21:39.741433000 +0000
|
||||||
|
+++ /var/www/sharelatex/web/app/src/router.js 2020-09-14 20:13:08.000000000 +0000
|
||||||
|
@@ -607,16 +607,17 @@
|
||||||
|
ProjectDownloadsController.downloadMultipleProjects
|
||||||
|
)
|
||||||
|
|
||||||
|
+ console.log(`allowAnonymousReadAndWriteSharing: ${Settings.allowAnonymousReadAndWriteSharing}`)
|
||||||
|
webRouter.get(
|
||||||
|
'/project/:project_id/metadata',
|
||||||
|
AuthorizationMiddleware.ensureUserCanReadProject,
|
||||||
|
- AuthenticationController.requireLogin(),
|
||||||
|
+ Settings.allowAnonymousReadAndWriteSharing ? (req, res, next) => { next() } : AuthenticationController.requireLogin(),
|
||||||
|
MetaController.getMetadata
|
||||||
|
- )
|
||||||
|
+ )
|
||||||
|
webRouter.post(
|
||||||
|
'/project/:project_id/doc/:doc_id/metadata',
|
||||||
|
AuthorizationMiddleware.ensureUserCanReadProject,
|
||||||
|
- AuthenticationController.requireLogin(),
|
||||||
|
+ Settings.allowAnonymousReadAndWriteSharing ? (req, res, next) => { next() } : AuthenticationController.requireLogin(),
|
||||||
|
MetaController.broadcastMetadataForDoc
|
||||||
|
)
|
||||||
|
privateApiRouter.post(
|
||||||
|
--- /var/www/sharelatex/web/app/src/Features/Contacts/ContactRouter.js 2020-09-14 20:21:52.243779000 +0000
|
||||||
|
+++ /var/www/sharelatex/web/app/src/Features/Contacts/ContactRouter.js 2020-09-14 20:13:08.000000000 +0000
|
||||||
|
@@ -5,6 +5,8 @@
|
||||||
|
* DS102: Remove unnecessary code created because of implicit returns
|
||||||
|
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
|
||||||
|
*/
|
||||||
|
+const Settings = require('settings-sharelatex')
|
||||||
|
+
|
||||||
|
const AuthenticationController = require('../Authentication/AuthenticationController')
|
||||||
|
const ContactController = require('./ContactController')
|
||||||
|
|
||||||
|
@@ -12,7 +14,7 @@
|
||||||
|
apply(webRouter, apiRouter) {
|
||||||
|
return webRouter.get(
|
||||||
|
'/user/contacts',
|
||||||
|
- AuthenticationController.requireLogin(),
|
||||||
|
+ Settings.allowAnonymousReadAndWriteSharing ? (req, res, next) => { next() } : AuthenticationController.requireLogin(),
|
||||||
|
ContactController.getContacts
|
||||||
|
)
|
||||||
|
}
|
12
hotfix/2.4.2/left-footer-skip-translation.patch
Normal file
12
hotfix/2.4.2/left-footer-skip-translation.patch
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
|
||||||
|
--- /var/www/sharelatex/web/app/views/layout/footer.pug
|
||||||
|
+++ /var/www/sharelatex/web/app/app/views/layout/footer.pug
|
||||||
|
@@ -32,7 +32,7 @@ footer.site-footer
|
||||||
|
if item.url
|
||||||
|
a(href=item.url, class=item.class) !{translate(item.text)}
|
||||||
|
else
|
||||||
|
- | !{translate(item.text)}
|
||||||
|
+ | !{item.text}
|
||||||
|
|
||||||
|
ul.col-md-3.text-right
|
||||||
|
|
Loading…
Reference in a new issue