Skip to content

Defining built-in properties as non-enumerable. #282

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.

Sign up for GitHub

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

Closed
gfoust wants to merge 3 commits into from
Closed

Defining built-in properties as non-enumerable. #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49ebffd
Defining built-in properties as non-enumerable.
Mar 2, 2016
4da5a1e
Test case for non-enumerable properties
Mar 2, 2016
918221f
Making session methods configurable/writable
Mar 4, 2016
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
42 changes: 30 additions & 12 deletions session/session.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,12 @@ function Session(req, data) {
* @api public
*/

Session.prototype.touch = function(){
Object.defineProperty(Session.prototype, 'touch', { configurable: true,
writable: true,
enumerable: false,
value: function(){
return this.resetMaxAge();
};
} });

/**
* Reset `.maxAge` to `.originalMaxAge`.
Expand All @@ -55,10 +58,13 @@ Session.prototype.touch = function(){
* @api public
*/

Session.prototype.resetMaxAge = function(){
Object.defineProperty(Session.prototype, 'resetMaxAge', { configurable: true,
writable: true,
enumerable: false,
value: function(){
this.cookie.maxAge = this.cookie.originalMaxAge;
return this;
};
} });

/**
* Save the session data with optional callback `fn(err)`.
Expand All @@ -68,10 +74,13 @@ Session.prototype.resetMaxAge = function(){
* @api public
*/

Session.prototype.save = function(fn){
Object.defineProperty(Session.prototype, 'save', { configurable: true,
writable: true,
enumerable: false,
value: function(fn){
this.req.sessionStore.set(this.id, this, fn || function(){});
return this;
};
} });

/**
* Re-loads the session data _without_ altering
Expand All @@ -85,7 +94,10 @@ Session.prototype.save = function(fn){
* @api public
*/

Session.prototype.reload = function(fn){
Object.defineProperty(Session.prototype, 'reload', { configurable: true,
writable: true,
enumerable: false,
value: function(fn){
var req = this.req
, store = this.req.sessionStore;
store.get(this.id, function(err, sess){
Expand All @@ -95,7 +107,7 @@ Session.prototype.reload = function(fn){
fn();
});
return this;
};
} });

/**
* Destroy `this` session.
Expand All @@ -105,11 +117,14 @@ Session.prototype.reload = function(fn){
* @api public
*/

Session.prototype.destroy = function(fn){
Object.defineProperty(Session.prototype, 'destroy', { configurable: true,
writable: true,
enumerable: false,
value: function(fn){
delete this.req.session;
this.req.sessionStore.destroy(this.id, fn);
return this;
};
} });

/**
* Regenerate this request's session.
Expand All @@ -119,7 +134,10 @@ Session.prototype.destroy = function(fn){
* @api public
*/

Session.prototype.regenerate = function(fn){
Object.defineProperty(Session.prototype, 'regenerate', { configurable: true,
writable: true,
enumerable: false,
value: function(fn){
this.req.sessionStore.regenerate(this.req, fn);
return this;
};
} });
18 changes: 18 additions & 0 deletions test/session.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1420,6 +1420,24 @@ describe('session()', function(){
});
})

it('should have only non-enumeable properties, excepting "cookie"', function(done) {
var app = express()
.use(session({ secret: 'keyboard cat', cookie: { maxAge: min }}))
.use(function(req, res, next) {
req.session.foo = 'foo';
req.session.bar = 'bar';
var keys = [];
for (var key in req.session) {
keys.push(key);
}
res.end(keys.sort().join(','));
});

request(app)
.get('/')
.expect(200, 'bar,cookie,foo', done);
});

describe('.destroy()', function(){
it('should destroy the previous session', function(done){
var app = express()
Expand Down