public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cookies: Use `Lax` instead of `Strict` for `SameSite`

pull/4392/head
Richard Hansen 2020-10-02 22:32:44 -04:00 committed by John McLear
parent 3ab0f30ac8
commit bf53162cdd
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/node/hooks/express/webaccess.js
View File

@ -228,8 +228,6 @@ exports.expressConfigure = (hook_name, args, cb) => {
exports.secret = settings.sessionKey; exports.secret = settings.sessionKey;
} }
const sameSite = settings.ssl ? 'Strict' : 'Lax';
args.app.sessionStore = exports.sessionStore; args.app.sessionStore = exports.sessionStore;
args.app.use(sessionModule({ args.app.use(sessionModule({
secret: exports.secret, secret: exports.secret,
@ -239,12 +237,9 @@ exports.expressConfigure = (hook_name, args, cb) => {
name: 'express_sid', name: 'express_sid',
proxy: true, proxy: true,
cookie: { cookie: {
/* // `Strict` is not used because it has few security benefits but significant usability
* Firefox started enforcing sameSite, see https://github.com/ether/etherpad-lite/issues/3989 // drawbacks vs. `Lax`. See https://stackoverflow.com/q/41841880 for discussion.
* for details. In response we set it based on if SSL certs are set in Etherpad. Note that if sameSite: 'Lax',
* You use Nginx or so for reverse proxy this may cause problems. Use Certificate pinning to remedy.
*/
sameSite: sameSite,
/* /*
* The automatic express-session mechanism for determining if the * The automatic express-session mechanism for determining if the
* application is being served over ssl is similar to the one used for * application is being served over ssl is similar to the one used for

4
src/static/js/pad_utils.js
View File

@ -532,7 +532,9 @@ padutils.binarySearch = require('./ace2_common').binarySearch;
// window object. // window object.
if (typeof window !== 'undefined') { if (typeof window !== 'undefined') {
exports.Cookies = require('js-cookie/src/js.cookie'); exports.Cookies = require('js-cookie/src/js.cookie');
exports.Cookies.defaults.sameSite = window.location.protocol === 'https:' ? 'Strict' : 'Lax'; // `Strict` is not used because it has few security benefits but significant usability drawbacks
// vs. `Lax`. See https://stackoverflow.com/q/41841880 for discussion.
exports.Cookies.defaults.sameSite = 'Lax';
exports.Cookies.defaults.secure = window.location.protocol === 'https:'; exports.Cookies.defaults.secure = window.location.protocol === 'https:';
} }
exports.randomString = randomString; exports.randomString = randomString;