From 3bcaaa9b131ff3007537781651bb750b9c2c91cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20LIETART=20=28TheLinuxFr=29?=
 <stuff@thelinuxfr.org>
Date: Mon, 21 Mar 2016 11:36:04 +0100
Subject: [PATCH 1/5] Added ability to change the hostname and admin email in
 Proxy

---
 .../app/controllers/OPNsense/Proxy/forms/main.xml  | 14 ++++++++++++++
 .../mvc/app/models/OPNsense/Proxy/Proxy.xml        |  8 ++++++++
 .../service/templates/OPNsense/Proxy/squid.conf    |  4 ++++
 3 files changed, 26 insertions(+)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml b/src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml
index b03834477..4ee48e21f 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml
@@ -74,6 +74,20 @@
                 <help><![CDATA[Select what to do with X-Forwarded for header.]]></help>
                 <advanced>true</advanced>
             </field>
+            <field>
+                <id>proxy.general.VisibleHostname</id>
+                <label>Visible Hostname</label>
+                <type>text</type>
+                <help><![CDATA[This is the hostname to be displayed in proxy server error messages.]]></help>
+                <advanced>true</advanced>
+            </field>
+            <field>
+                <id>proxy.general.VisibleEmail</id>
+                <label>Administrator's Email</label>
+                <type>text</type>
+                <help><![CDATA[This is the email address displayed in error messages to the users.]]></help>
+                <advanced>true</advanced>
+            </field>
             <field>
                 <id>proxy.general.suppressVersion</id>
                 <label>Suppress version string</label>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
index e8768df39..78c23b2ae 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
@@ -69,6 +69,14 @@
                 <default>0</default>
                 <Required>N</Required>
             </suppressVersion>
+            <VisibleEmail type="TextField">
+                <default>localhost</default>
+                <Required>N</Required>
+            </VisibleEmail>
+            <VisibleHostname type="TextField">
+                <default>admin@localhost</default>
+                <Required>N</Required>
+            </VisibleHostname>
             <cache>
                 <local>
                     <enabled type="BooleanField">
diff --git a/src/opnsense/service/templates/OPNsense/Proxy/squid.conf b/src/opnsense/service/templates/OPNsense/Proxy/squid.conf
index dc7319519..66ebbc23c 100644
--- a/src/opnsense/service/templates/OPNsense/Proxy/squid.conf
+++ b/src/opnsense/service/templates/OPNsense/Proxy/squid.conf
@@ -523,3 +523,7 @@ delay_parameters 1 {{OPNsense.proxy.general.traffic.OverallBandwidthTrotteling|i
 {% endif %}
 # Disable squid logfile rotate to use system defaults
 logfile_rotate 0
+# Define visible hostname
+visible_hostname {{OPNsense.proxy.general.VisibleHostname}}
+# Define visible email
+cache_mgr {{OPNsense.proxy.general.VisibleEmail}}

From 98b3b2b2f66abc514dcad867bfc757cb060be5f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20LIETART=20=28TheLinuxFr=29?=
 <stuff@thelinuxfr.org>
Date: Mon, 21 Mar 2016 11:57:03 +0100
Subject: [PATCH 2/5] Fix EmailField type and add "if helpers.exists ..." to
 squid.conf

---
 src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml     | 6 +++---
 src/opnsense/service/templates/OPNsense/Proxy/squid.conf | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
index 78c23b2ae..d7a6c735b 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
@@ -69,12 +69,12 @@
                 <default>0</default>
                 <Required>N</Required>
             </suppressVersion>
-            <VisibleEmail type="TextField">
-                <default>localhost</default>
+            <VisibleEmail type="EmailField">
+                <default>admin@localhost</default>
                 <Required>N</Required>
             </VisibleEmail>
             <VisibleHostname type="TextField">
-                <default>admin@localhost</default>
+                <default>localhost</default>
                 <Required>N</Required>
             </VisibleHostname>
             <cache>
diff --git a/src/opnsense/service/templates/OPNsense/Proxy/squid.conf b/src/opnsense/service/templates/OPNsense/Proxy/squid.conf
index 66ebbc23c..43d752b50 100644
--- a/src/opnsense/service/templates/OPNsense/Proxy/squid.conf
+++ b/src/opnsense/service/templates/OPNsense/Proxy/squid.conf
@@ -523,7 +523,11 @@ delay_parameters 1 {{OPNsense.proxy.general.traffic.OverallBandwidthTrotteling|i
 {% endif %}
 # Disable squid logfile rotate to use system defaults
 logfile_rotate 0
+{% if helpers.exists('OPNsense.proxy.general.VisibleHostname') %}
 # Define visible hostname
 visible_hostname {{OPNsense.proxy.general.VisibleHostname}}
+{% endif %}
+{% if helpers.exists('OPNsense.proxy.general.VisibleEmail') %}
 # Define visible email
 cache_mgr {{OPNsense.proxy.general.VisibleEmail}}
+{% endif %}

From fe8706b6e0ce5e461a5f8222d46ec050d108994a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20LIETART=20=28TheLinuxFr=29?=
 <stuff@thelinuxfr.org>
Date: Mon, 21 Mar 2016 12:25:31 +0100
Subject: [PATCH 3/5] Adding Validation Controls for hostname and validation
 message for email

---
 src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
index d7a6c735b..1808bdfcc 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
@@ -71,11 +71,14 @@
             </suppressVersion>
             <VisibleEmail type="EmailField">
                 <default>admin@localhost</default>
+                <ValidationMessage>Please enter a valid email address</ValidationMessage>
                 <Required>N</Required>
             </VisibleEmail>
             <VisibleHostname type="TextField">
                 <default>localhost</default>
                 <Required>N</Required>
+                <mask>/^([0-9a-zA-Z.,_\-]){0,1024}$/u</mask>
+                <ValidationMessage>Please enter a valid servername, ip address or leave this option blank</ValidationMessage>
             </VisibleHostname>
             <cache>
                 <local>

From c013ef01cae23d0e949dd5cdcc6b4415b9614659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20LIETART=20=28TheLinuxFr=29?=
 <stuff@thelinuxfr.org>
Date: Mon, 21 Mar 2016 12:27:38 +0100
Subject: [PATCH 4/5] Minor typo fix

---
 src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
index 1808bdfcc..5e6ce6be2 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
@@ -71,14 +71,14 @@
             </suppressVersion>
             <VisibleEmail type="EmailField">
                 <default>admin@localhost</default>
-                <ValidationMessage>Please enter a valid email address</ValidationMessage>
                 <Required>N</Required>
+                <ValidationMessage>Please enter a valid email address.</ValidationMessage>
             </VisibleEmail>
             <VisibleHostname type="TextField">
                 <default>localhost</default>
                 <Required>N</Required>
                 <mask>/^([0-9a-zA-Z.,_\-]){0,1024}$/u</mask>
-                <ValidationMessage>Please enter a valid servername, ip address or leave this option blank</ValidationMessage>
+                <ValidationMessage>Please enter a valid servername, ip address or leave this option blank.</ValidationMessage>
             </VisibleHostname>
             <cache>
                 <local>

From a6dcd9762a829d84339fb2afe6f2c9b45b58c705 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20LIETART=20=28TheLinuxFr=29?=
 <stuff@thelinuxfr.org>
Date: Mon, 21 Mar 2016 16:44:53 +0100
Subject: [PATCH 5/5] Minor fix

---
 src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
index 5e6ce6be2..613d5c31e 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
@@ -77,7 +77,7 @@
             <VisibleHostname type="TextField">
                 <default>localhost</default>
                 <Required>N</Required>
-                <mask>/^([0-9a-zA-Z.,_\-]){0,1024}$/u</mask>
+                <mask>/^([0-9a-zA-Z\.,_\-:]){0,1024}$/u</mask>
                 <ValidationMessage>Please enter a valid servername, ip address or leave this option blank.</ValidationMessage>
             </VisibleHostname>
             <cache>