ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-08-20 07:57:38 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fixed antipatter by using async main func

Browse Source
This commit is contained in:
Luca Wlcek
2023-11-17 18:15:19 +01:00
parent a697b43ac4
commit ac2b959ec6
1 changed files with 73 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
backend/internal/nginx.js
View File

@@ -230,7 +230,7 @@ const internalNginx = {
* @param {Object} host * @param {Object} host
* @returns {Promise} * @returns {Promise}
*/ */
generateConfig: (host_type, host) => { generateConfig: async (host_type, host) => {
const nice_host_type = internalNginx.getFileFriendlyHostType(host_type); const nice_host_type = internalNginx.getFileFriendlyHostType(host_type);
if (config.debug()) { if (config.debug()) {
@@ -239,89 +239,86 @@ const internalNginx = {
const renderEngine = utils.getRenderEngine(); const renderEngine = utils.getRenderEngine();
return new Promise(async (resolve, reject) => { let template = null;
let template = null; let filename = internalNginx.getConfigName(nice_host_type, host.id);
let filename = internalNginx.getConfigName(nice_host_type, host.id);
try { try {
template = fs.readFileSync(__dirname + '/../templates/' + nice_host_type + '.conf', {encoding: 'utf8'}); template = fs.readFileSync(__dirname + '/../templates/' + nice_host_type + '.conf', {encoding: 'utf8'});
} catch (err) { } catch (err) {
reject(new error.ConfigurationError(err.message)); throw new error.ConfigurationError(err.message);
return; }
}
let locationsPromise; let locationsPromise;
let origLocations; let origLocations;
// Manipulate the data a bit before sending it to the template // Manipulate the data a bit before sending it to the template
if (host_type === 'ssl_passthrough_host') { if (host_type === 'ssl_passthrough_host') {
if (internalNginx.sslPassthroughEnabled()){ if (internalNginx.sslPassthroughEnabled()){
const allHosts = await passthroughHostModel const allHosts = await passthroughHostModel
.query() .query()
.where('is_deleted', 0) .where('is_deleted', 0)
.groupBy('id'); .groupBy('id');
host = { host = {
all_passthrough_hosts: allHosts.map((host) => { all_passthrough_hosts: allHosts.map((host) => {
// Replace dots in domain // Replace dots in domain
host.forwarding_host = internalNginx.addIpv6Brackets(host.forwarding_host); host.forwarding_host = internalNginx.addIpv6Brackets(host.forwarding_host);
return host; return host;
}), }),
}; };
} else {
internalNginx.deleteConfig(host_type, host, false);
}
} else if (host_type !== 'default') {
host.use_default_location = true;
if (typeof host.advanced_config !== 'undefined' && host.advanced_config) {
host.use_default_location = !internalNginx.advancedConfigHasDefaultLocation(host.advanced_config);
}
}
if (host.locations) {
//logger.info ('host.locations = ' + JSON.stringify(host.locations, null, 2));
origLocations = [].concat(host.locations);
locationsPromise = internalNginx.renderLocations(host).then((renderedLocations) => {
host.locations = renderedLocations;
});
// Allow someone who is using / custom location path to use it, and skip the default / location
_.map(host.locations, (location) => {
if (location.path === '/') {
host.use_default_location = false;
}
});
} else { } else {
locationsPromise = Promise.resolve(); internalNginx.deleteConfig(host_type, host, false);
} }
// Set the IPv6 setting for the host } else if (host_type !== 'default') {
host.ipv6 = internalNginx.ipv6Enabled(); host.use_default_location = true;
if (typeof host.advanced_config !== 'undefined' && host.advanced_config) {
host.use_default_location = !internalNginx.advancedConfigHasDefaultLocation(host.advanced_config);
}
}
return locationsPromise.then(() => { if (host.locations) {
renderEngine //logger.info ('host.locations = ' + JSON.stringify(host.locations, null, 2));
.parseAndRender(template, host) origLocations = [].concat(host.locations);
.then((config_text) => { locationsPromise = internalNginx.renderLocations(host).then((renderedLocations) => {
fs.writeFileSync(filename, config_text, {encoding: 'utf8'}); host.locations = renderedLocations;
if (config.debug()) {
logger.success('Wrote config:', filename, config_text);
}
// Restore locations array
host.locations = origLocations;
resolve(true);
})
.catch((err) => {
if (config.debug()) {
logger.warn('Could not write ' + filename + ':', err.message);
}
throw new error.ConfigurationError(err.message);
});
}); });
// Allow someone who is using / custom location path to use it, and skip the default / location
_.map(host.locations, (location) => {
if (location.path === '/') {
host.use_default_location = false;
}
});
} else {
locationsPromise = Promise.resolve();
}
// Set the IPv6 setting for the host
host.ipv6 = internalNginx.ipv6Enabled();
return locationsPromise.then(() => {
renderEngine
.parseAndRender(template, host)
.then((config_text) => {
fs.writeFileSync(filename, config_text, {encoding: 'utf8'});
if (config.debug()) {
logger.success('Wrote config:', filename, config_text);
}
// Restore locations array
host.locations = origLocations;
return true;
})
.catch((err) => {
if (config.debug()) {
logger.warn('Could not write ' + filename + ':', err.message);
}
throw new error.ConfigurationError(err.message);
});
}); });
}, },