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

Merge pull request #2146 from overleaf/bg-fix-redis-user-session-expiry

Browse source 
fix expiry of user sessions in redis

GitOrigin-RevId: e53aa93bba99fe0cd632ac8bce36c0228e20d04a
This commit is contained in:
Brian Gough 2019-09-12 09:04:06 +01:00 committed by sharelatex
parent adbe19fa12
commit 837599d89c
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/web/app/src/Features/User/UserSessionsManager.js
View file

@ -45,7 +45,7 @@ module.exports = UserSessionsManager = {
return rclient return rclient
.multi() .multi()
.sadd(sessionSetKey, value) .sadd(sessionSetKey, value)
.expire(sessionSetKey, `${Settings.cookieSessionLength}`) .pexpire(sessionSetKey, `${Settings.cookieSessionLength}`) // in milliseconds
.exec(function(err, response) { .exec(function(err, response) {
if (err != null) { if (err != null) {
logger.warn( logger.warn(
@ -77,7 +77,7 @@ module.exports = UserSessionsManager = {
return rclient return rclient
.multi() .multi()
.srem(sessionSetKey, value) .srem(sessionSetKey, value)
.expire(sessionSetKey, `${Settings.cookieSessionLength}`) .pexpire(sessionSetKey, `${Settings.cookieSessionLength}`) // in milliseconds
.exec(function(err, response) { .exec(function(err, response) {
if (err != null) { if (err != null) {
logger.warn( logger.warn(
@ -218,9 +218,9 @@ module.exports = UserSessionsManager = {
return callback(null) return callback(null)
} }
const sessionSetKey = UserSessionsRedis.sessionSetKey(user) const sessionSetKey = UserSessionsRedis.sessionSetKey(user)
return rclient.expire( return rclient.pexpire(
sessionSetKey, sessionSetKey,
`${Settings.cookieSessionLength}`, `${Settings.cookieSessionLength}`, // in milliseconds
function(err, response) { function(err, response) {
if (err != null) { if (err != null) {
logger.warn( logger.warn(

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

@ -105,7 +105,7 @@ webRouter.use(
proxy: Settings.behindProxy, proxy: Settings.behindProxy,
cookie: { cookie: {
domain: Settings.cookieDomain, domain: Settings.cookieDomain,
maxAge: Settings.cookieSessionLength, maxAge: Settings.cookieSessionLength, // in milliseconds, see https://github.com/expressjs/session#cookiemaxage
secure: Settings.secureCookie secure: Settings.secureCookie
}, },
store: sessionStore, store: sessionStore,

28
services/web/test/unit/src/User/UserSessionsManagerTests.js
View file

@ -36,7 +36,7 @@ describe('UserSessionsManager', function() {
srem: sinon.stub(), srem: sinon.stub(),
smembers: sinon.stub(), smembers: sinon.stub(),
mget: sinon.stub(), mget: sinon.stub(),
expire: sinon.stub() pexpire: sinon.stub()
} }
this.rclient.multi.returns(this.rclient) this.rclient.multi.returns(this.rclient)
this.rclient.get.returns(this.rclient) this.rclient.get.returns(this.rclient)
@ -44,7 +44,7 @@ describe('UserSessionsManager', function() {
this.rclient.sadd.returns(this.rclient) this.rclient.sadd.returns(this.rclient)
this.rclient.srem.returns(this.rclient) this.rclient.srem.returns(this.rclient)
this.rclient.smembers.returns(this.rclient) this.rclient.smembers.returns(this.rclient)
this.rclient.expire.returns(this.rclient) this.rclient.pexpire.returns(this.rclient)
this.rclient.exec.callsArgWith(0, null) this.rclient.exec.callsArgWith(0, null)
this.UserSessionsRedis = { this.UserSessionsRedis = {
@ -112,7 +112,7 @@ describe('UserSessionsManager', function() {
return this.call(err => { return this.call(err => {
this.rclient.multi.callCount.should.equal(1) this.rclient.multi.callCount.should.equal(1)
this.rclient.sadd.callCount.should.equal(1) this.rclient.sadd.callCount.should.equal(1)
this.rclient.expire.callCount.should.equal(1) this.rclient.pexpire.callCount.should.equal(1)
this.rclient.exec.callCount.should.equal(1) this.rclient.exec.callCount.should.equal(1)
return done() return done()
}) })
@ -168,7 +168,7 @@ describe('UserSessionsManager', function() {
return this.call(err => { return this.call(err => {
this.rclient.multi.callCount.should.equal(0) this.rclient.multi.callCount.should.equal(0)
this.rclient.sadd.callCount.should.equal(0) this.rclient.sadd.callCount.should.equal(0)
this.rclient.expire.callCount.should.equal(0) this.rclient.pexpire.callCount.should.equal(0)
this.rclient.exec.callCount.should.equal(0) this.rclient.exec.callCount.should.equal(0)
return done() return done()
}) })
@ -205,7 +205,7 @@ describe('UserSessionsManager', function() {
return this.call(err => { return this.call(err => {
this.rclient.multi.callCount.should.equal(0) this.rclient.multi.callCount.should.equal(0)
this.rclient.sadd.callCount.should.equal(0) this.rclient.sadd.callCount.should.equal(0)
this.rclient.expire.callCount.should.equal(0) this.rclient.pexpire.callCount.should.equal(0)
this.rclient.exec.callCount.should.equal(0) this.rclient.exec.callCount.should.equal(0)
return done() return done()
}) })
@ -251,7 +251,7 @@ describe('UserSessionsManager', function() {
return this.call(err => { return this.call(err => {
this.rclient.multi.callCount.should.equal(1) this.rclient.multi.callCount.should.equal(1)
this.rclient.srem.callCount.should.equal(1) this.rclient.srem.callCount.should.equal(1)
this.rclient.expire.callCount.should.equal(1) this.rclient.pexpire.callCount.should.equal(1)
this.rclient.exec.callCount.should.equal(1) this.rclient.exec.callCount.should.equal(1)
return done() return done()
}) })
@ -307,7 +307,7 @@ describe('UserSessionsManager', function() {
return this.call(err => { return this.call(err => {
this.rclient.multi.callCount.should.equal(0) this.rclient.multi.callCount.should.equal(0)
this.rclient.srem.callCount.should.equal(0) this.rclient.srem.callCount.should.equal(0)
this.rclient.expire.callCount.should.equal(0) this.rclient.pexpire.callCount.should.equal(0)
this.rclient.exec.callCount.should.equal(0) this.rclient.exec.callCount.should.equal(0)
return done() return done()
}) })
@ -344,7 +344,7 @@ describe('UserSessionsManager', function() {
return this.call(err => { return this.call(err => {
this.rclient.multi.callCount.should.equal(0) this.rclient.multi.callCount.should.equal(0)
this.rclient.srem.callCount.should.equal(0) this.rclient.srem.callCount.should.equal(0)
this.rclient.expire.callCount.should.equal(0) this.rclient.pexpire.callCount.should.equal(0)
this.rclient.exec.callCount.should.equal(0) this.rclient.exec.callCount.should.equal(0)
return done() return done()
}) })
@ -530,7 +530,7 @@ describe('UserSessionsManager', function() {
describe('touch', function() { describe('touch', function() {
beforeEach(function() { beforeEach(function() {
this.rclient.expire.callsArgWith(2, null) this.rclient.pexpire.callsArgWith(2, null)
return (this.call = callback => { return (this.call = callback => {
return this.UserSessionsManager.touch(this.user, callback) return this.UserSessionsManager.touch(this.user, callback)
}) })
@ -544,16 +544,16 @@ describe('UserSessionsManager', function() {
}) })
}) })
it('should call rclient.expire', function(done) { it('should call rclient.pexpire', function(done) {
return this.call(err => { return this.call(err => {
this.rclient.expire.callCount.should.equal(1) this.rclient.pexpire.callCount.should.equal(1)
return done() return done()
}) })
}) })
describe('when rclient produces an error', function() { describe('when rclient produces an error', function() {
beforeEach(function() { beforeEach(function() {
return this.rclient.expire.callsArgWith(2, new Error('woops')) return this.rclient.pexpire.callsArgWith(2, new Error('woops'))
}) })
it('should produce an error', function(done) { it('should produce an error', function(done) {
@ -579,9 +579,9 @@ describe('UserSessionsManager', function() {
}) })
}) })
it('should not call expire', function(done) { it('should not call pexpire', function(done) {
return this.call(err => { return this.call(err => {
this.rclient.expire.callCount.should.equal(0) this.rclient.pexpire.callCount.should.equal(0)
return done() return done()
}) })
}) })