Proxy service work in progress, added more options

src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml

@@ -28,6 +28,19 @@
                 <default>0</default>
                 <Required>Y</Required>
             </dnsV4First>
+            <forwardedForHandling type="OptionsField">
+            </forwardedForHandling>
+            <uriWhitespaceHandling type="OptionsField">
+
+            </uriWhitespaceHandling>
+            <useViaHeader type="BooleanField">
+                <default>1</default>
+                <Required>N</Required>
+            </useViaHeader>
+            <suppressVersion type="BooleanField">
+                <default>0</default>
+                <Required>N</Required>
+            </suppressVersion>
         </general>
         <forward>
             <interfaces type="CSVListField">

src/opnsense/mvc/app/views/OPNsense/Proxy/index.volt

@@ -181,13 +181,13 @@ maxheight: define max height of select box, default=170px to hold 5 items
             ['id': 'proxy.general.logging.enable.accessLog',
             'label':'Enable access logging',
             'type':'checkbox',
-            'help':'Enable access logging for squid.',
+            'help':'Enable access logging.',
             'advanced':'true'
             ],
             ['id': 'proxy.general.logging.enable.storeLog',
             'label':'Enable store logging',
             'type':'checkbox',
-            'help':'Enable access logging for squid.',
+            'help':'Enable store logging.',
             'advanced':'true'
             ],
             ['id': 'proxy.general.alternateDNSservers',
@@ -208,6 +208,19 @@ maxheight: define max height of select box, default=170px to hold 5 items
                 connectivity is used (and tested). Hiding network problems
                 which would otherwise be detected and warned about.</div>',
             'advanced':'true'
+            ],
+            ['id': 'proxy.general.useViaHeader',
+            'label':'Use Via header',
+            'type':'checkbox',
+            'help':'If set (default), Squid will include a Via header in requests and
+                    replies as required by RFC2616.',
+            'advanced':'true'
+            ],
+            ['id': 'proxy.general.suppressVersion',
+            'label':'Suppress version string',
+            'type':'checkbox',
+            'help':'Suppress Squid version string info in HTTP headers and HTML error pages.',
+            'advanced':'true'
             ]}
         ],
         ['proxy-forward','Forward Proxy','subtabs': {

src/opnsense/service/templates/OPNsense/Proxy/squid.conf

@@ -127,4 +127,16 @@ cache_store_log none
 {%   for dns in OPNsense.proxy.general.alternateDNSservers.split(",") %}
 dns_nameservers {{dns}}
 {%   endfor %}
+{% endif %}
+{% if helpers.exists('OPNsense.proxy.general.useViaHeader') %}
+{%      if OPNsense.proxy.general.useViaHeader == '0' %}
+# Disable via Header
+via off
+{%      endif %}
+{% endif %}
+{% if helpers.exists('OPNsense.proxy.general.suppressVersion') %}
+{%      if OPNsense.proxy.general.suppressVersion == '1' %}
+# Suppres http version string (default=off)
+httpd_suppress_version_string on
+{%      endif %}
 {% endif %}
\ No newline at end of file