Skip to content

User can configure 'Access-Control-Allow-Origin' value with cors enabled #616

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

Closed
wants to merge 1 commit into from
Closed

User can configure 'Access-Control-Allow-Origin' value with cors enabled #616

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 bin/http-server
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ function listen(port) {
if (typeof argv.cors === 'string') {
options.corsHeaders = argv.cors;
}

if (typeof argv.corsOrigin === 'string') {
options.corsOrigin = argv.corsOrigin;
}
}

if (ssl) {
Expand Down
18 changes: 14 additions & 4 deletions lib/http-server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,25 @@ function HttpServer(options) {
}

if (options.cors) {
this.headers['Access-Control-Allow-Origin'] = '*';
this.headers['Access-Control-Allow-Origin'] = options.corsOrigin ? options.corsOrigin : '*';
this.headers['Access-Control-Allow-Headers'] = 'Origin, X-Requested-With, Content-Type, Accept, Range';
if (options.corsHeaders) {
options.corsHeaders.split(/\s*,\s*/)
.forEach(function (h) { this.headers['Access-Control-Allow-Headers'] += ', ' + h; }, this);
}
before.push(corser.create(options.corsHeaders ? {
requestHeaders: this.headers['Access-Control-Allow-Headers'].split(/\s*,\s*/)
} : null));

var corserOptions = {};

if (options.corsOrigin) {
corserOptions.origins = [options.corsOrigin];
corserOptions.supportsCredentials = true;
}

if (options.corsHeaders) {
corserOptions.requestHeaders = this.headers['Access-Control-Allow-Headers'].split(/\s*,\s*/);
}

before.push(corser.create(corserOptions));
}

if (options.robots) {
Expand Down
6 changes: 5 additions & 1 deletion test/http-server-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ vows.describe('http-server').addBatch({
var server = httpServer.createServer({
root: root,
cors: true,
corsHeaders: 'X-Test'
corsHeaders: 'X-Test',
corsOrigin: 'http://example.com'
});
server.listen(8082);
this.callback(null, server);
Expand All @@ -161,6 +162,9 @@ vows.describe('http-server').addBatch({
},
'response Access-Control-Allow-Headers should contain X-Test': function (err, res) {
assert.ok(res.headers['access-control-allow-headers'].split(/\s*,\s*/g).indexOf('X-Test') >= 0, 204);
},
'response Access-Control-Allow-Origin should equal http://example.com': function (err, res) {
assert.equal(res.headers['access-control-allow-origin'], 'http://example.com');
}
},
teardown: function (server) {
Expand Down