Skip to content

fix: set Vary: Origin on all responses, even when Origin header is missing (#330) #428

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

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

fix: set Vary: Origin on all responses, even when Origin header is missing (#330) #428

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
4 changes: 4 additions & 0 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@
}

function cors(options, req, res, next) {
// Set Vary: Origin on all responses to prevent cache confusion
// when a subsequent CORS request arrives at the same URL.
vary(res, 'Origin');

var headers = [],
method = req.method && req.method.toUpperCase && req.method.toUpperCase();

Expand Down
26 changes: 22 additions & 4 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,24 @@ var util = require('util')
cors(options)(req, res, next);
});

it('sets Vary Origin even when Origin request header is missing', function (done) {
// arrange
var req, res, next, options;
options = {
origin: 'http://example.com'
};
req = fakeRequest('GET', {}); // no Origin header
res = fakeResponse();
next = function () {
// assert
assert.equal(res.getHeader('Vary'), 'Origin')
done();
};

// act
cors(options)(req, res, next);
});

it('origin defaults to *', function (done) {
// arrange
var req, res, next;
Expand Down Expand Up @@ -442,7 +460,7 @@ var util = require('util')

res.on('finish', function () {
assert.strictEqual(res.getHeader('Access-Control-Allow-Headers'), 'header1,header2')
assert.equal(res.getHeader('Vary'), undefined)
assert.equal(res.getHeader('Vary'), 'Origin')
cb()
})

Expand All @@ -458,7 +476,7 @@ var util = require('util')

res.on('finish', function () {
assert.equal(res.getHeader('Access-Control-Allow-Headers'), 'header1,header2')
assert.equal(res.getHeader('Vary'), undefined)
assert.equal(res.getHeader('Vary'), 'Origin')
cb()
})

Expand All @@ -478,7 +496,7 @@ var util = require('util')
next = function () {
// assert
assert.equal(res.getHeader('Access-Control-Allow-Headers'), undefined)
assert.equal(res.getHeader('Vary'), undefined)
assert.equal(res.getHeader('Vary'), 'Origin')
done();
};

Expand All @@ -493,7 +511,7 @@ var util = require('util')

res.on('finish', function () {
assert.equal(res.getHeader('Access-Control-Allow-Headers'), 'x-header-1, x-header-2')
assert.equal(res.getHeader('Vary'), 'Access-Control-Request-Headers')
assert.equal(res.getHeader('Vary'), 'Origin, Access-Control-Request-Headers')
cb()
})

Expand Down