From 996c01166d3ae26a25d3a2abf6fa812792908248 Mon Sep 17 00:00:00 2001
From: Jan Winkler <jan.winkler@markt.de>
Date: Tue, 9 Aug 2022 11:34:22 +0200
Subject: [PATCH] net/haproxy: add 2 new cache parameters, closes #2908

---
 .../OPNsense/HAProxy/forms/generalCache.xml          | 12 ++++++++++++
 .../mvc/app/models/OPNsense/HAProxy/HAProxy.xml      | 10 ++++++++++
 .../service/templates/OPNsense/HAProxy/haproxy.conf  |  8 ++++++++
 3 files changed, 30 insertions(+)

diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/generalCache.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/generalCache.xml
index d9fd948b3..b38486734 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/generalCache.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/generalCache.xml
@@ -27,4 +27,16 @@
         <type>text</type>
         <help><![CDATA[Define the maximum size of the objects to be cached. Must not be greater than an half of the maximum size of the cache. If not set, it equals to a 256th of the cache size. All objects with sizes larger than this value will not be cached.]]></help>
     </field>
+    <field>
+        <id>haproxy.general.cache.processVary</id>
+        <label>Process vary enabled</label>
+        <type>checkbox</type>
+        <help><![CDATA[Enable or disable the processing of the Vary header. When disabled, a response containing such a header will never be cached.]]></help>
+    </field>
+    <field>
+        <id>haproxy.general.cache.maxSecondaryEntries</id>
+        <label>Maximum Number of secondary entries</label>
+        <type>text</type>
+        <help><![CDATA[To add this cache parameter Vary support needs to be enabled. Define the maximum number of simultaneous secondary entries with the same primary key in the cache. Its default value is 10 and should be passed a strictly positive integer.]]></help>
+    </field>
 </form>
diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
index e24826e1e..cb3865247 100644
--- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
+++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
@@ -402,6 +402,16 @@
                     <Required>N</Required>
                     <ValidationMessage>Please specify a value between 1 and 2146435072.</ValidationMessage>
                 </maxObjectSize>
+                <processVary type="BooleanField">
+                    <default>0</default>
+                    <Required>N</Required>
+                </processVary>
+                <maxSecondaryEntries type="IntegerField">
+                    <default>10</default>
+                    <MinimumValue>1</MinimumValue>
+                    <Required>N</Required>
+                    <ValidationMessage>Please specify a positive integer value.</ValidationMessage>
+                </maxSecondaryEntries>
             </cache>
         </general>
         <frontends>
diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
index 34862fb13..be90eff14 100644
--- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
@@ -1062,6 +1062,14 @@ cache opnsense-haproxy-cache
 {%   if OPNsense.HAProxy.general.cache.maxObjectSize|default("") != "" %}
     max-object-size {{OPNsense.HAProxy.general.cache.maxObjectSize}}
 {%   endif %}
+{%   if OPNsense.HAProxy.general.cache.processVary|default("") == "1" %}
+    process-vary on
+  {%   if OPNsense.HAProxy.general.cache.maxSecondaryEntries|default("") != "" %}
+    max-secondary-entries {{OPNsense.HAProxy.general.cache.maxSecondaryEntries}}
+  {%   endif %}
+{%   else %}
+    process-vary off
+{%   endif %}
 {%- endif -%}
 
 {# ############################### #}