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

Set CORS origin header to incoming request origin if allowed #523

Merged
merged 1 commit into from
Feb 11, 2013
Merged

Set CORS origin header to incoming request origin if allowed #523

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
34 changes: 26 additions & 8 deletions lib/response/headers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,33 @@ exports.cache = function (response, request) {

exports.cors = function (response, request) {

if (request.server.settings.cors) {
response.header('Access-Control-Allow-Origin', request.server.settings.cors._origin);
response.header('Access-Control-Max-Age', request.server.settings.cors.maxAge);
response.header('Access-Control-Allow-Methods', request.server.settings.cors._methods);
response.header('Access-Control-Allow-Headers', request.server.settings.cors._headers);

if (request.server.settings.cors.credentials) {
response.header('Access-Control-Allow-Credentials', 'true');
if (!request.server.settings.cors) {
return;
}

if (request.server.settings.cors.origin &&
request.server.settings.cors.origin.length) {

var allowOrigin = request.server.settings.cors.origin;
var origin = request.raw.req.headers.origin;
if (origin &&
(allowOrigin.indexOf(origin) !== -1 || allowOrigin.indexOf('*') !== -1)) {

allowOrigin = origin;
}
else {
allowOrigin = allowOrigin.join(' ');
}

response.header('Access-Control-Allow-Origin', allowOrigin);
}

response.header('Access-Control-Max-Age', request.server.settings.cors.maxAge);
response.header('Access-Control-Allow-Methods', request.server.settings.cors._methods);
response.header('Access-Control-Allow-Headers', request.server.settings.cors._headers);

if (request.server.settings.cors.credentials) {
response.header('Access-Control-Allow-Credentials', 'true');
}
};

Expand Down
1 change: 0 additions & 1 deletion lib/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ module.exports = internals.Server = function (/* host, port, options */) {
// Generate CORS headers

if (this.settings.cors) {
this.settings.cors._origin = (this.settings.cors.origin || []).join(' ');
this.settings.cors._headers = (this.settings.cors.headers || []).concat(this.settings.cors.additionalHeaders || []).join(', ');
this.settings.cors._methods = (this.settings.cors.methods || []).concat(this.settings.cors.additionalMethods || []).join(', ');

Expand Down
7 changes: 4 additions & 3 deletions test/integration/response.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ describe('Response', function () {
this.reply('Tada');
};

var server = new Hapi.Server({ cache: { engine: 'memory' }, cors: { origin: ['test.example.com'] } });
var server = new Hapi.Server({ cache: { engine: 'memory' }, cors: { origin: ['test.example.com', 'www.example.com'] } });
server.route({ method: 'GET', path: '/', config: { handler: handler, cache: { mode: 'client', expiresIn: 9999 } } });
server.route({ method: 'GET', path: '/bound', config: { handler: handlerBound } });
server.state('sid', { encoding: 'base64' });
Expand All @@ -57,14 +57,15 @@ describe('Response', function () {
expect(res.result).to.exist;
expect(res.result).to.equal('text');
expect(res.headers['Cache-Control']).to.equal('max-age=1, must-revalidate');
expect(res.headers['Access-Control-Allow-Origin']).to.equal('test.example.com');
expect(res.headers['Access-Control-Allow-Origin']).to.equal('test.example.com www.example.com');
expect(res.headers['Access-Control-Allow-Credentials']).to.not.exist;
expect(res.headers['Set-Cookie']).to.deep.equal(['sid=YWJjZGVmZzEyMzQ1Ng==', 'other=something; Secure', 'x=; Max-Age=0; Expires=Thu, 01 Jan 1970 00:00:00 GMT', "test=123", "empty=; Max-Age=0; Expires=Thu, 01 Jan 1970 00:00:00 GMT"]);

server.inject({ method: 'GET', url: '/bound' }, function (res) {
server.inject({ method: 'GET', url: '/bound', headers: { origin: 'www.example.com' } }, function (res) {

expect(res.result).to.exist;
expect(res.result).to.equal('Tada');
expect(res.headers['Access-Control-Allow-Origin']).to.equal('www.example.com');
done();
});
});
Expand Down