mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-10-26 08:36:12 +01:00
fix: [breaking] send configured config URL as origin if not custom
This is a breaking change if your install uses multiple URLs to access. You will need to update the Access-Control-Allow-Origin header in ACP > Advanced > Headers to supply all URLs you use to access your site
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
const os = require('os');
|
||||
const winston = require('winston');
|
||||
const nconf = require('nconf');
|
||||
const _ = require('lodash');
|
||||
|
||||
const meta = require('../meta');
|
||||
@@ -34,6 +35,7 @@ module.exports = function (middleware) {
|
||||
|
||||
if (origins.includes(req.get('origin'))) {
|
||||
headers['Access-Control-Allow-Origin'] = encodeURI(req.get('origin'));
|
||||
headers.Vary = headers.Vary ? `${headers.Vary}, Origin` : 'Origin';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,10 +54,15 @@ module.exports = function (middleware) {
|
||||
originsRegex.forEach(function (regex) {
|
||||
if (regex && regex.test(req.get('origin'))) {
|
||||
headers['Access-Control-Allow-Origin'] = encodeURI(req.get('origin'));
|
||||
headers.Vary = headers.Vary ? `${headers.Vary}, Origin` : 'Origin';
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
if (!headers.hasOwnProperty('Access-Control-Allow-Origin')) {
|
||||
headers['Access-Control-Allow-Origin'] = nconf.get('url');
|
||||
}
|
||||
|
||||
if (meta.config['access-control-allow-credentials']) {
|
||||
headers['Access-Control-Allow-Credentials'] = meta.config['access-control-allow-credentials'];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user