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
3 changes: 2 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,8 @@ function hash(sess) {

function issecure(req, trustProxy) {
// socket is https server
if (req.connection && req.connection.encrypted) {
var socket = req.socket || req.connection;
if (socket && socket.encrypted) {
return true;
}

Expand Down
27 changes: 27 additions & 0 deletions test/session.js
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,31 @@ describe('session()', function(){
.expect(200, 'false', done)
})
})

describe('when request socket is encrypted', function () {
it('should set secure over TLS', function (done) {
var cert = fs.readFileSync(__dirname + '/fixtures/server.crt', 'ascii')
var server = https.createServer({
key: fs.readFileSync(__dirname + '/fixtures/server.key', 'ascii'),
cert: cert
})

server.on('request', createRequestListener({ secret: 'keyboard cat', cookie: { secure: 'auto' } }))

var agent = new https.Agent({ ca: cert })
var createConnection = agent.createConnection

agent.createConnection = function (options) {
options.servername = 'express-session.local'
return createConnection.call(this, options)
}

var req = request(server).get('/')
req.agent(agent)
req.expect(shouldSetCookieWithAttribute('connect.sid', 'Secure'))
req.expect(200, done)
})
})
})

describe('when "cookie" is a function', function () {
Expand Down Expand Up @@ -888,6 +913,8 @@ describe('session()', function(){
.expect(200, 'true', done);
});
});


describe('when "sameSite" set to "auto"', function () {
describe('basic functionality', function () {
before(function () {
Expand Down