Skip to content
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

feat: remove read signedCookies and cookies #1026

Open
wants to merge 1 commit into
base: v2
Choose a base branch
from
Open

feat: remove read signedCookies and cookies #1026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 0 additions & 31 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,37 +559,6 @@ function getcookie(req, name, secrets) {
}
}

// back-compat read from cookieParser() signedCookies data
if (!val && req.signedCookies) {
val = req.signedCookies[name];

if (val) {
deprecate('cookie should be available in req.headers.cookie');
}
}

// back-compat read from cookieParser() cookies data
if (!val && req.cookies) {
raw = req.cookies[name];

if (raw) {
if (raw.substr(0, 2) === 's:') {
val = unsigncookie(raw.slice(2), secrets);

if (val) {
deprecate('cookie should be available in req.headers.cookie');
}

if (val === false) {
debug('cookie signature invalid');
val = undefined;
}
} else {
debug('cookie unsigned')
}
}
}

return val;
}

Expand Down
53 changes: 4 additions & 49 deletions test/session.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2310,10 +2310,10 @@ describe('session()', function(){
})

describe('cookieParser()', function () {
it('should read from req.cookies', function(done){
it('shouldn\'t read from req.cookies', function(done){
var app = express()
.use(cookieParser())
.use(function(req, res, next){ req.headers.cookie = 'foo=bar'; next() })
.use(function(req, res, next){ delete req.headers.cookie; next() })
.use(createSession())
.use(function(req, res, next){
req.session.count = req.session.count || 0
Expand All @@ -2328,56 +2328,11 @@ describe('session()', function(){
request(app)
.get('/')
.set('Cookie', cookie(res))
.expect(200, '2', done)
})
})

it('should reject unsigned from req.cookies', function(done){
var app = express()
.use(cookieParser())
.use(function(req, res, next){ req.headers.cookie = 'foo=bar'; next() })
.use(createSession({ key: 'sessid' }))
.use(function(req, res, next){
req.session.count = req.session.count || 0
req.session.count++
res.end(req.session.count.toString())
})

request(app)
.get('/')
.expect(200, '1', function (err, res) {
if (err) return done(err)
request(app)
.get('/')
.set('Cookie', 'sessid=' + sid(res))
.expect(200, '1', done)
})
})

it('should reject invalid signature from req.cookies', function(done){
var app = express()
.use(cookieParser())
.use(function(req, res, next){ req.headers.cookie = 'foo=bar'; next() })
.use(createSession({ key: 'sessid' }))
.use(function(req, res, next){
req.session.count = req.session.count || 0
req.session.count++
res.end(req.session.count.toString())
})

request(app)
.get('/')
.expect(200, '1', function (err, res) {
if (err) return done(err)
var val = cookie(res).replace(/...\./, '.')
request(app)
.get('/')
.set('Cookie', val)
.expect(200, '1', done)
})
})

it('should read from req.signedCookies', function(done){
it('shouldn\'t read from req.signedCookies', function(done){
var app = express()
.use(cookieParser('keyboard cat'))
.use(function(req, res, next){ delete req.headers.cookie; next() })
Expand All @@ -2395,7 +2350,7 @@ describe('session()', function(){
request(app)
.get('/')
.set('Cookie', cookie(res))
.expect(200, '2', done)
.expect(200, '1', done)
})
})
})
Expand Down