Skip to content

Commit e608f57

Browse files
committed
Set Lax for the SameSite attribute
Signed-off-by: Michal Kolodziejski <michal.kolodziejski@cern.ch>
1 parent 3b1e270 commit e608f57

File tree

5 files changed

+31
-16
lines changed

5 files changed

+31
-16
lines changed

app.js

Lines changed: 3 additions & 2 deletions
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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1600,7 +1600,8 @@ function toggleNightMode () {
16001600
store.set('nightMode', !isActive)
16011601
} else {
16021602
Cookies.set('nightMode', !isActive, {
1603-
expires: 365
1603+
expires: 365,
1604+
sameSite: 'Lax'
16041605
})
16051606
}
16061607
}

public/js/lib/common/login.js

Lines changed: 4 additions & 2 deletions
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

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -450,12 +450,14 @@ export default class Editor {
450450
const setType = () => {
451451
if (this.editor.getOption('indentWithTabs')) {
452452
Cookies.set('indent_type', 'tab', {
453-
expires: 365
453+
expires: 365,
454+
sameSite: 'Lax'
454455
})
455456
type.text('Tab Size:')
456457
} else {
457458
Cookies.set('indent_type', 'space', {
458-
expires: 365
459+
expires: 365,
460+
sameSite: 'Lax'
459461
})
460462
type.text('Spaces:')
461463
}
@@ -466,11 +468,13 @@ export default class Editor {
466468
var unit = this.editor.getOption('indentUnit')
467469
if (this.editor.getOption('indentWithTabs')) {
468470
Cookies.set('tab_size', unit, {
469-
expires: 365
471+
expires: 365,
472+
sameSite: 'Lax'
470473
})
471474
} else {
472475
Cookies.set('space_units', unit, {
473-
expires: 365
476+
expires: 365,
477+
sameSite: 'Lax'
474478
})
475479
}
476480
widthLabel.text(unit)
@@ -538,7 +542,8 @@ export default class Editor {
538542
const setKeymapLabel = () => {
539543
var keymap = this.editor.getOption('keyMap')
540544
Cookies.set('keymap', keymap, {
541-
expires: 365
545+
expires: 365,
546+
sameSite: 'Lax'
542547
})
543548
label.text(keymap)
544549
this.restoreOverrideEditorKeymap()
@@ -573,7 +578,8 @@ export default class Editor {
573578
const setTheme = theme => {
574579
this.editor.setOption('theme', theme)
575580
Cookies.set('theme', theme, {
576-
expires: 365
581+
expires: 365,
582+
sameSite: 'Lax'
577583
})
578584
this.statusIndicators.find('.status-theme li').removeClass('active')
579585
this.statusIndicators.find(`.status-theme li[value="${theme}"]`).addClass('active')
@@ -675,15 +681,17 @@ export default class Editor {
675681
spellcheckToggle.removeClass('active')
676682

677683
Cookies.set('spellcheck', false, {
678-
expires: 365
684+
expires: 365,
685+
sameSite: 'Lax'
679686
})
680687

681688
self.editor.setOption('mode', defaultEditorMode)
682689
} else {
683690
spellcheckToggle.addClass('active')
684691

685692
Cookies.set('spellcheck', lang, {
686-
expires: 365
693+
expires: 365,
694+
sameSite: 'Lax'
687695
})
688696

689697
self.editor.setOption('mode', 'spell-checker')
@@ -704,7 +712,8 @@ export default class Editor {
704712
this.editor.setOption('gutters', [lintGutter, ...gutters])
705713
}
706714
Cookies.set('linter', true, {
707-
expires: 365
715+
expires: 365,
716+
sameSite: 'Lax'
708717
})
709718
} else {
710719
this.editor.setOption('gutters', gutters.filter(g => g !== lintGutter))
@@ -753,7 +762,8 @@ export default class Editor {
753762
)
754763
if (overrideBrowserKeymap.is(':checked')) {
755764
Cookies.set('preferences-override-browser-keymap', true, {
756-
expires: 365
765+
expires: 365,
766+
sameSite: 'Lax'
757767
})
758768
this.restoreOverrideEditorKeymap()
759769
} else {

public/js/locale.js

Lines changed: 2 additions & 1 deletion
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)