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 1 commit
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
22 changes: 19 additions & 3 deletions app/api/server/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,15 @@ export class APIClass extends Restivus {
apiVersion: version,
});
}

const CORSEnabled = settings.get('API_Enable_CORS');

const origin = settings.get('API_CORS_Origin').split(',');
const multiOrigin = CORSEnabled && !origin.includes('*') && origin.length > 1;

routes.forEach((route) => {
// Note: This is required due to Restivus calling `addRoute` in the constructor of itself

Object.keys(endpoints).forEach((method) => {
const _options = { ...options };

Expand Down Expand Up @@ -392,6 +399,18 @@ export class APIClass extends Restivus {
}

result = DDP._CurrentInvocation.withValue(invocation, () => originalAction.apply(this));

if (multiOrigin) {
console.log('should support multi origin');

if (origin.includes(this.request.headers.origin)) {
console.log('allowed header');
this.response.setHeader('Access-Control-Allow-Origin', this.request.headers.origin);
this.response.setHeader('x-oloco-bixo', 'essa fera ai meu');
Comment thread
gabrieleiro marked this conversation as resolved.
Outdated
} else {
result = API.v1.failure();
}
}
} catch (e) {
logger.debug(`${ method } ${ route } threw an error:`, e.stack);

Expand Down Expand Up @@ -656,7 +675,6 @@ 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',
});
Expand Down Expand Up @@ -687,8 +705,6 @@ const createApi = function _createApi(_api, options = {}) {
const origin = settings.get('API_CORS_Origin');

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

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