From 8a4cd2b7c374d10ad9e46f6d2f1ac27c1f415ba4 Mon Sep 17 00:00:00 2001
From: kulikov-a <36099472+kulikov-a@users.noreply.github.com>
Date: Thu, 12 May 2022 17:02:16 +0300
Subject: [PATCH] nginx: add headers_more support (#2845)

---
 .../mvc/app/controllers/OPNsense/Nginx/forms/settings.xml   | 6 ++++++
 .../src/opnsense/mvc/app/models/OPNsense/Nginx/Nginx.xml    | 3 +++
 .../opnsense/service/templates/OPNsense/Nginx/nginx.conf    | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/forms/settings.xml b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/forms/settings.xml
index 98cbd71d6..08a0a8716 100644
--- a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/forms/settings.xml
+++ b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/forms/settings.xml
@@ -53,6 +53,12 @@
                 <type>text</type>
                 <advanced>true</advanced>
             </field>
+            <field>
+                <id>nginx.http.headers_more_enable</id>
+                <label>Enable Headers More module</label>
+                <type>checkbox</type>
+                <help>Enhanced version of the standard headers module. Allows to add, set, or clear any output or input header.</help>
+            </field>
         </subtab>
         <subtab id="nginx-general-webgui" description="GUI Settings">
             <field>
diff --git a/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Nginx.xml b/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Nginx.xml
index c6d69989b..03852a9da 100644
--- a/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Nginx.xml
+++ b/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Nginx.xml
@@ -47,6 +47,9 @@
         <Required>N</Required>
         <MinimumValue>1</MinimumValue>
       </server_names_hash_max_size>
+      <headers_more_enable type="BooleanField">
+        <Required>N</Required>
+      </headers_more_enable>
     </http>
 
     <userlist type="ArrayField">
diff --git a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/nginx.conf b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/nginx.conf
index 0be1a6a94..a140d361d 100644
--- a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/nginx.conf
+++ b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/nginx.conf
@@ -5,6 +5,9 @@ load_module /usr/local/libexec/nginx/ngx_mail_module.so;
 load_module /usr/local/libexec/nginx/ngx_http_brotli_filter_module.so;
 load_module /usr/local/libexec/nginx/ngx_http_brotli_static_module.so;
 load_module /usr/local/libexec/nginx/ngx_http_js_module.so;
+{% if OPNsense.Nginx.http.headers_more_enable is defined and OPNsense.Nginx.http.headers_more_enable == '1' %}
+load_module /usr/local/libexec/nginx/ngx_http_headers_more_filter_module.so;
+{% endif %}
 
 user www staff;
 worker_processes {{ OPNsense.Nginx.http.workerprocesses }};