web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reorder config file

Browse Source
This commit is contained in:
yflory
2019-02-28 17:08:19 +01:00
parent 17dc4af1aa
commit 9ceebb603d
2 changed files with 195 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server.js
View File

@@ -75,20 +75,15 @@ var setHeaders = (function () {
if (config.padContentSecurity) {
padHeaders['Content-Security-Policy'] = clone(config.padContentSecurity);
}
const ooHeaders = clone(headers);
if (config.ooContentSecurity) {
ooHeaders['Content-Security-Policy'] = clone(config.ooContentSecurity);
}
if (Object.keys(headers).length) {
return function (req, res) {
const h = [/^\/pad(2)?\/inner\.html.*/].some((regex) => {
return regex.test(req.url)
}) ? padHeaders : ([
const h = [
/^\/pad(2)?\/inner\.html.*/,
/^\/sheet\/inner\.html.*/,
/^\/common\/onlyoffice\/.*\/index\.html.*/
].some((regex) => {
return regex.test(req.url)
}) ? ooHeaders : headers);
return regex.test(req.url)
}) ? padHeaders : headers;
for (let header in h) { res.setHeader(header, h[header]); }
};
}