From e0db1ac4988aa8eb69d775b973bd25cf7c628255 Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 2 Oct 2022 19:08:02 +0300 Subject: [PATCH] fix: styling --- .../generators/conf/security.conf.js | 50 +++------ .../templates/global_sections/security.vue | 105 ++++-------------- 2 files changed, 34 insertions(+), 121 deletions(-) diff --git a/src/nginxconfig/generators/conf/security.conf.js b/src/nginxconfig/generators/conf/security.conf.js index b87f223..524c70a 100644 --- a/src/nginxconfig/generators/conf/security.conf.js +++ b/src/nginxconfig/generators/conf/security.conf.js @@ -32,16 +32,10 @@ export default (domains, global) => { config.push(['# security headers', '']); config.push(['add_header X-XSS-Protection', '"1; mode=block" always']); config.push(['add_header X-Content-Type-Options', '"nosniff" always']); - config.push([ - 'add_header Referrer-Policy', - `"${global.security.referrerPolicy.computed}" always`, - ]); + config.push(['add_header Referrer-Policy', `"${global.security.referrerPolicy.computed}" always`]); if (global.security.contentSecurityPolicy.computed) - config.push([ - 'add_header Content-Security-Policy', - `"${global.security.contentSecurityPolicy.computed}" always`, - ]); + config.push(['add_header Content-Security-Policy', `"${global.security.contentSecurityPolicy.computed}" always`]); if (global.security.permissionsPolicy.computed) config.push([ @@ -51,43 +45,27 @@ export default (domains, global) => { // Every domain has HSTS enabled, and they all have same hstsSubdomains/hstsPreload settings if (commonHsts(domains)) { - const commonHSTSSubdomains = - domains.length && domains[0].https.hstsSubdomains.computed; - const commonHSTSPreload = - domains.length && domains[0].https.hstsPreload.computed; - config.push([ - 'add_header Strict-Transport-Security', - `"max-age=31536000${ - commonHSTSSubdomains ? '; includeSubDomains' : '' - }${commonHSTSPreload ? '; preload' : ''}" always`, - ]); + const commonHSTSSubdomains = domains.length && domains[0].https.hstsSubdomains.computed; + const commonHSTSPreload = domains.length && domains[0].https.hstsPreload.computed; + config.push(['add_header Strict-Transport-Security', `"max-age=31536000${commonHSTSSubdomains ? '; includeSubDomains' : ''}${commonHSTSPreload ? '; preload' : ''}" always`]); } config.push(['# . files', '']); - config.push([ - 'location ~ /\\.(?!well-known)', - { - deny: 'all', - }, - ]); + config.push(['location ~ /\\.(?!well-known)', { + deny: 'all', + }]); // Security.txt if (global.security.securityTxt.computed) { config.push(['# security.txt', '']); - config.push([ - 'location /security.txt', - { - return: '301 /.well-known/security.txt', - }, - ]); + config.push(['location /security.txt', { + return: '301 /.well-known/security.txt', + }]); // Custom security.txt path - config.push([ - 'location = /.well-known/security.txt', - { - alias: `${global.security.securityTxtPath.value}`, - }, - ]); + config.push(['location = /.well-known/security.txt', { + alias: `${global.security.securityTxtPath.value}`, + }]); } if (global.security.blockCommonExploits.computed) { diff --git a/src/nginxconfig/templates/global_sections/security.vue b/src/nginxconfig/templates/global_sections/security.vue index 6451b48..8215bf6 100644 --- a/src/nginxconfig/templates/global_sections/security.vue +++ b/src/nginxconfig/templates/global_sections/security.vue @@ -26,19 +26,13 @@ THE SOFTWARE.