Skip to content

Proof of concept for #614 resolving #615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@

var Buffer = require('safe-buffer').Buffer
var cookie = require('cookie');
var crypto = require('crypto')
var omit = require('lodash.omit');
var hasher = require('object-hash');
var debug = require('debug')('express-session');
var deprecate = require('depd')('express-session');
var onHeaders = require('on-headers')
Expand Down Expand Up @@ -578,21 +579,8 @@ function getcookie(req, name, secrets) {
*/

function hash(sess) {
// serialize
var str = JSON.stringify(sess, function (key, val) {
// ignore sess.cookie property
if (this === sess && key === 'cookie') {
return
}

return val
})

// hash
return crypto
.createHash('sha1')
.update(str, 'utf8')
.digest('hex')
var hashObj = omit(sess, 'cookie');
return hasher(hashObj, {respectType: false});
}

/**
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
"cookie-signature": "1.0.6",
"debug": "2.6.9",
"depd": "~2.0.0",
"lodash.omit": "4.5.0",
"object-hash": "1.3.1",
"on-headers": "~1.0.1",
"parseurl": "~1.3.2",
"safe-buffer": "5.1.2",
Expand Down
25 changes: 25 additions & 0 deletions test/session.js
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,31 @@ describe('session()', function(){
});
});

it('should check session object modification correctly', function(done){
var callCount = 0;
var server = createServer(null, function (req, res) {
if (callCount % 2 === 0) {
req.session.user = { name: 'bob', id: 15 }
} else {
req.session.user = { id: 15, name: 'bob' }
}
callCount++;
res.end()
})

request(server)
.get('/')
.expect(shouldSetCookie('connect.sid'))
.expect(200, function(err, res){
if (err) return done(err);
request(server)
.get('/')
.set('Cookie', cookie(res))
.expect(shouldNotHaveHeader('Set-Cookie'))
.expect(200, done)
});
});

it('should force cookie on unmodified session', function(done){
var server = createServer({ rolling: true }, function (req, res) {
req.session.user = 'bob'
Expand Down