Skip to content

[FIX] CORS config not accepting multiple origins #20696

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

Merged
sampaiodiego merged 4 commits into from
Feb 20, 2021
Merged

[FIX] CORS config not accepting multiple origins #20696

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cc0061
insert only one origin in access-control-allow-origin header
gabrieleiro Feb 11, 2021
4647863
Merge branch 'develop' into cors
sampaiodiego Feb 19, 2021
4edf834
Merge branch 'develop' into cors
sampaiodiego Feb 20, 2021
07838d8
Accept multiple origins in pre-flight
sampaiodiego Feb 20, 2021
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
75 changes: 44 additions & 31 deletions app/api/server/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,20 +653,51 @@ API = {
};

const defaultOptionsEndpoint = function _defaultOptionsEndpoint() {
if (this.request.method === 'OPTIONS' && this.request.headers['access-control-request-method']) {
if (settings.get('API_Enable_CORS') === true) {
this.response.writeHead(200, {
'Access-Control-Allow-Origin': settings.get('API_CORS_Origin'),
'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, HEAD, PATCH',
'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Type, Accept, X-User-Id, X-Auth-Token, x-visitor-token, Authorization',
});
} else {
this.response.writeHead(405);
this.response.write('CORS not enabled. Go to "Admin > General > REST Api" to enable it.');
}
} else {
this.response.writeHead(404);
// check if a pre-flight request
if (!this.request.headers['access-control-request-method'] && !this.request.headers.origin) {
this.done();
return;
}

if (!settings.get('API_Enable_CORS')) {
this.response.writeHead(405);
this.response.write('CORS not enabled. Go to "Admin > General > REST Api" to enable it.');
this.done();
return;
}

const CORSOriginSetting = String(settings.get('API_CORS_Origin'));

const defaultHeaders = {
'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, HEAD, PATCH',
'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Type, Accept, X-User-Id, X-Auth-Token, x-visitor-token, Authorization',
};

if (CORSOriginSetting === '*') {
this.response.writeHead(200, {
'Access-Control-Allow-Origin': '*',
...defaultHeaders,
});
this.done();
return;
}

const origins = CORSOriginSetting
.trim()
.split(',')
.map((origin) => String(origin).trim().toLocaleLowerCase());

// if invalid origin reply without required CORS headers
if (!origins.includes(this.request.headers.origin)) {
this.done();
return;
}

this.response.writeHead(200, {
'Access-Control-Allow-Origin': this.request.headers.origin,
Vary: 'Origin',
...defaultHeaders,
});
this.done();
};

Expand All @@ -679,24 +710,6 @@ const createApi = function _createApi(_api, options = {}) {
auth: getUserAuth(),
}, options));

delete _api._config.defaultHeaders['Access-Control-Allow-Origin'];
delete _api._config.defaultHeaders['Access-Control-Allow-Headers'];
delete _api._config.defaultHeaders.Vary;

if (settings.get('API_Enable_CORS')) {
const origin = settings.get('API_CORS_Origin');

if (origin) {
_api._config.defaultHeaders['Access-Control-Allow-Origin'] = origin;

if (origin !== '*') {
_api._config.defaultHeaders.Vary = 'Origin';
}
}

_api._config.defaultHeaders['Access-Control-Allow-Headers'] = 'Origin, X-Requested-With, Content-Type, Accept, X-User-Id, X-Auth-Token';
}

return _api;
};

Expand Down