github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Disable rolling sessions in web-admin (#9307)

Browse source 
GitOrigin-RevId: 7f098d5222d21187f219c0906757b913890e85e7
This commit is contained in:
Miguel Serrano 2022-09-01 09:20:16 +02:00 committed by Copybot
parent c908c0c07d
commit e414c65028
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
services/web/app/src/infrastructure/Server.js
View file

@ -161,7 +161,7 @@ webRouter.use(
}, },
store: sessionStore, store: sessionStore,
key: Settings.cookieName, key: Settings.cookieName,
rolling: true, rolling: Settings.cookieRollingSession === true,
}) })
) )
if (Features.hasFeature('saas')) { if (Features.hasFeature('saas')) {
@ -203,23 +203,25 @@ webRouter.use(webRouter.csrf.middleware)
webRouter.use(translations.i18nMiddleware) webRouter.use(translations.i18nMiddleware)
webRouter.use(translations.setLangBasedOnDomainMiddleware) webRouter.use(translations.setLangBasedOnDomainMiddleware)
// Measure expiry from last request, not last login if (Settings.cookieRollingSession) {
webRouter.use(function (req, res, next) { // Measure expiry from last request, not last login
if (!req.session.noSessionCallback) { webRouter.use(function (req, res, next) {
req.session.touch() if (!req.session.noSessionCallback) {
if (SessionManager.isUserLoggedIn(req.session)) { req.session.touch()
UserSessionsManager.touch( if (SessionManager.isUserLoggedIn(req.session)) {
SessionManager.getSessionUser(req.session), UserSessionsManager.touch(
err => { SessionManager.getSessionUser(req.session),
if (err) { err => {
logger.err({ err }, 'error extending user session') if (err) {
logger.err({ err }, 'error extending user session')
}
} }
} )
) }
} }
} next()
next() })
}) }
webRouter.use(ReferalConnect.use) webRouter.use(ReferalConnect.use)
expressLocals(webRouter, privateApiRouter, publicApiRouter) expressLocals(webRouter, privateApiRouter, publicApiRouter)

1
services/web/config/settings.defaults.js
View file

@ -264,6 +264,7 @@ module.exports = {
// replace subdomain with dot to have them accessible on all subdomains // replace subdomain with dot to have them accessible on all subdomains
cookieDomain: process.env.COOKIE_DOMAIN, cookieDomain: process.env.COOKIE_DOMAIN,
cookieName: process.env.COOKIE_NAME || 'sharelatex.sid', cookieName: process.env.COOKIE_NAME || 'sharelatex.sid',
cookieRollingSession: true,
// this is only used if cookies are used for clsi backend // this is only used if cookies are used for clsi backend
// clsiCookieKey: "clsiserver" // clsiCookieKey: "clsiserver"