Skip to content
Merged
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
1 change: 1 addition & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
unreleased
==========

* Fix check for default `secure` option behavior
* deps: depd@~2.0.0
- Replace internal `eval` usage with `Function` constructor
- Use instance methods on `process` to check for listeners
Expand Down
5 changes: 3 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,9 @@ Cookies.prototype.set = function(name, value, opts) {
throw new Error('Cannot send secure cookie over unencrypted connection')
}

cookie.secure = secure
if (opts && "secure" in opts) cookie.secure = opts.secure
cookie.secure = opts && opts.secure !== undefined
? opts.secure
: secure

if (opts && "secureProxy" in opts) {
deprecate('"secureProxy" option; use "secure" option, provide "secure" to constructor if needed')
Expand Down
39 changes: 39 additions & 0 deletions test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,45 @@ describe('new Cookies(req, res, [options])', function () {
})
})
})

describe('when undefined', function () {
it('should set secure attribute on encrypted connection', function (done) {
var server = createSecureServer(setCookieHandler('foo', 'bar', { secure: undefined }))

request(server)
.get('/')
.ca(server.cert)
.expect(200)
.expect(shouldSetCookieWithAttribute('foo', 'Secure'))
.end(done)
})

describe('with "secure: undefined" constructor option', function () {
it('should not set secure attribute on unencrypted connection', function (done) {
var opts = { secure: undefined }

request(createServer(opts, setCookieHandler('foo', 'bar', { secure: undefined })))
.get('/')
.expect(200)
.expect(shouldSetCookieWithoutAttribute('foo', 'Secure'))
.end(done)
})
})

describe('with req.protocol === "https"', function () {
it('should set secure attribute on unencrypted connection', function (done) {
request(createServer(function (req, res, cookies) {
req.protocol = 'https'
cookies.set('foo', 'bar', { secure: undefined })
res.end()
}))
.get('/')
.expect(200)
.expect(shouldSetCookieWithAttribute('foo', 'Secure'))
.end(done)
})
})
})
})

describe('"secureProxy" option', function () {
Expand Down