Skip to content

Commit 4fed5af

Browse files
committed
Set Lax for the SameSite attribute
Signed-off-by: Michal Kolodziejski <[email protected]>
1 parent e00eaa8 commit 4fed5af

File tree

5 files changed

+31
-16
lines changed

5 files changed

+31
-16
lines changed

app.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ app.use(morgan('combined', {
6969
}))
7070

7171
// socket io
72-
var io = require('socket.io')(server)
72+
var io = require('socket.io')(server, { cookie: false })
7373
io.engine.ws = new (require('ws').Server)({
7474
noServer: true,
7575
perMessageDeflate: false
@@ -148,7 +148,8 @@ app.use(session({
148148
saveUninitialized: true, // always create session to ensure the origin
149149
rolling: true, // reset maxAge on every response
150150
cookie: {
151-
maxAge: config.sessionLife
151+
maxAge: config.sessionLife,
152+
sameSite: 'lax'
152153
},
153154
store: sessionStore
154155
}))

public/js/index.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1632,7 +1632,8 @@ function toggleNightMode () {
16321632
store.set('nightMode', !isActive)
16331633
} else {
16341634
Cookies.set('nightMode', !isActive, {
1635-
expires: 365
1635+
expires: 365,
1636+
sameSite: 'Lax'
16361637
})
16371638
}
16381639
}

public/js/lib/common/login.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ export function resetCheckAuth () {
1919

2020
export function setLoginState (bool, id) {
2121
Cookies.set('loginstate', bool, {
22-
expires: 365
22+
expires: 365,
23+
sameSite: 'Lax'
2324
})
2425
if (id) {
2526
Cookies.set('userid', id, {
26-
expires: 365
27+
expires: 365,
28+
sameSite: 'Lax'
2729
})
2830
} else {
2931
Cookies.remove('userid')

public/js/lib/editor/index.js

+20-10
Original file line numberDiff line numberDiff line change
@@ -414,12 +414,14 @@ export default class Editor {
414414
const setType = () => {
415415
if (this.editor.getOption('indentWithTabs')) {
416416
Cookies.set('indent_type', 'tab', {
417-
expires: 365
417+
expires: 365,
418+
sameSite: 'Lax'
418419
})
419420
type.text('Tab Size:')
420421
} else {
421422
Cookies.set('indent_type', 'space', {
422-
expires: 365
423+
expires: 365,
424+
sameSite: 'Lax'
423425
})
424426
type.text('Spaces:')
425427
}
@@ -430,11 +432,13 @@ export default class Editor {
430432
var unit = this.editor.getOption('indentUnit')
431433
if (this.editor.getOption('indentWithTabs')) {
432434
Cookies.set('tab_size', unit, {
433-
expires: 365
435+
expires: 365,
436+
sameSite: 'Lax'
434437
})
435438
} else {
436439
Cookies.set('space_units', unit, {
437-
expires: 365
440+
expires: 365,
441+
sameSite: 'Lax'
438442
})
439443
}
440444
widthLabel.text(unit)
@@ -502,7 +506,8 @@ export default class Editor {
502506
const setKeymapLabel = () => {
503507
var keymap = this.editor.getOption('keyMap')
504508
Cookies.set('keymap', keymap, {
505-
expires: 365
509+
expires: 365,
510+
sameSite: 'Lax'
506511
})
507512
label.text(keymap)
508513
this.restoreOverrideEditorKeymap()
@@ -537,7 +542,8 @@ export default class Editor {
537542
const setTheme = theme => {
538543
this.editor.setOption('theme', theme)
539544
Cookies.set('theme', theme, {
540-
expires: 365
545+
expires: 365,
546+
sameSite: 'Lax'
541547
})
542548
this.statusIndicators.find('.status-theme li').removeClass('active')
543549
this.statusIndicators.find(`.status-theme li[value="${theme}"]`).addClass('active')
@@ -639,15 +645,17 @@ export default class Editor {
639645
spellcheckToggle.removeClass('active')
640646

641647
Cookies.set('spellcheck', false, {
642-
expires: 365
648+
expires: 365,
649+
sameSite: 'Lax'
643650
})
644651

645652
self.editor.setOption('mode', defaultEditorMode)
646653
} else {
647654
spellcheckToggle.addClass('active')
648655

649656
Cookies.set('spellcheck', lang, {
650-
expires: 365
657+
expires: 365,
658+
sameSite: 'Lax'
651659
})
652660

653661
self.editor.setOption('mode', 'spell-checker')
@@ -668,7 +676,8 @@ export default class Editor {
668676
this.editor.setOption('gutters', [lintGutter, ...gutters])
669677
}
670678
Cookies.set('linter', true, {
671-
expires: 365
679+
expires: 365,
680+
sameSite: 'Lax'
672681
})
673682
} else {
674683
this.editor.setOption('gutters', gutters.filter(g => g !== lintGutter))
@@ -717,7 +726,8 @@ export default class Editor {
717726
)
718727
if (overrideBrowserKeymap.is(':checked')) {
719728
Cookies.set('preferences-override-browser-keymap', true, {
720-
expires: 365
729+
expires: 365,
730+
sameSite: 'Lax'
721731
})
722732
this.restoreOverrideEditorKeymap()
723733
} else {

public/js/locale.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ $('select.ui-locale option[value="' + lang + '"]').attr('selected', 'selected')
2525

2626
locale.change(function () {
2727
Cookies.set('locale', $(this).val(), {
28-
expires: 365
28+
expires: 365,
29+
sameSite: 'Lax'
2930
})
3031
window.location.reload()
3132
})

0 commit comments

Comments
 (0)