Made pad2 server more generic and easy to implement

This commit is contained in:
Caleb James DeLisle
2017-08-17 15:41:04 +02:00
parent e04c0b89a1
commit ad9f2ff223
6 changed files with 46 additions and 25 deletions

View File

@@ -17,7 +17,8 @@ module.exports = {
httpHeaders: {
"X-XSS-Protection": "1; mode=block",
"X-Content-Type-Options": "nosniff"
"X-Content-Type-Options": "nosniff",
"Access-Control-Allow-Origin": "*"
},
contentSecurity: [
@@ -45,8 +46,8 @@ module.exports = {
// data: is used by codemirror
"img-src 'self' data: blob:",
// for accounts.cryptpad.fr authentication
"frame-ancestors 'self' accounts.cryptpad.fr",
// for accounts.cryptpad.fr authentication and pad2 cross-domain iframe sandbox
"frame-ancestors *",
].join('; '),
// CKEditor requires significantly more lax content security policy in order to function.
@@ -71,6 +72,13 @@ module.exports = {
httpPort: 3000,
// This is for allowing the cross-domain iframe to function when developing
httpSafePort: 3001,
// This is for deployment in production, CryptPad uses a separate origin (domain) to host the
// cross-domain iframe. It can simply host the same content as CryptPad.
// httpSafeOrigin: "https://some-other-domain.xyz",
/* your server's websocket url is configurable
* (default: '/cryptpad_websocket')
*