From eeb78e842423319169b036d16601e73227dbffdd Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 27 Dec 2020 11:43:27 +0100
Subject: webproxy: T563: squidguard: support default ruleset

---
 .../include/webproxy-squidguard.xml.i              | 122 ---------------------
 .../include/webproxy-url-filtering.xml.i           | 119 ++++++++++++++++++++
 interface-definitions/service_webproxy.xml.in      |  13 ++-
 3 files changed, 127 insertions(+), 127 deletions(-)
 delete mode 100644 interface-definitions/include/webproxy-squidguard.xml.i
 create mode 100644 interface-definitions/include/webproxy-url-filtering.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/webproxy-squidguard.xml.i b/interface-definitions/include/webproxy-squidguard.xml.i
deleted file mode 100644
index 6958056d4..000000000
--- a/interface-definitions/include/webproxy-squidguard.xml.i
+++ /dev/null
@@ -1,122 +0,0 @@
-<!-- included start from webproxy-squidguard.xml.i -->
-<leafNode name="allow-category">
-  <properties>
-    <help>Category to allow</help>
-    <completionHelp>
-      <script>${vyos_completion_dir}/list_webproxy_category.sh</script>
-    </completionHelp>
-    <multi/>
-  </properties>
-</leafNode>
-<leafNode name="allow-ipaddr-url">
-  <properties>
-    <help>Allow IP address URLs</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<leafNode name="block-category">
-  <properties>
-    <help>Category to block</help>
-    <completionHelp>
-      <script>${vyos_completion_dir}/list_webproxy_category.sh</script>
-    </completionHelp>
-    <multi/>
-  </properties>
-</leafNode>
-<leafNode name="default-action">
-  <properties>
-    <help>Default action</help>
-    <completionHelp>
-      <list>allow block</list>
-    </completionHelp>
-    <valueHelp>
-      <format>allow</format>
-      <description>Default filter action to allow (default)</description>
-    </valueHelp>
-    <valueHelp>
-      <format>block</format>
-      <description>Default filter action to allow (default)</description>
-    </valueHelp>
-    <constraint>
-      <regex>^(allow|block)$</regex>
-    </constraint>
-  </properties>
-</leafNode>
-<leafNode name="enable-safe-search">
-  <properties>
-    <help>Enable safe-mode search on popular search engines</help>
-  </properties>
-</leafNode>
-<leafNode name="local-block-keyword">
-  <properties>
-    <help>Local keyword to block</help>
-    <valueHelp>
-      <format>keyword</format>
-      <description>Keyword (or regex) to block</description>
-    </valueHelp>
-    <multi/>
-  </properties>
-</leafNode>
-<leafNode name="local-block-url">
-  <properties>
-    <help>Local URL to block</help>
-    <valueHelp>
-      <format>url</format>
-      <description>Local URL to block (without http:\/\/</description>
-    </valueHelp>
-    <constraint>
-      <regex>^(https?:\/\/)$</regex>
-    </constraint>
-    <multi/>
-  </properties>
-</leafNode>
-<leafNode name="local-block">
-  <properties>
-    <help>Local site to block</help>
-    <valueHelp>
-      <format>ipv4</format>
-      <description>IP address of site to block</description>
-    </valueHelp>
-    <constraint>
-      <validator name="ipv4-prefix"/>
-    </constraint>
-    <multi/>
-  </properties>
-</leafNode>
-<leafNode name="local-ok-url">
-  <properties>
-    <help>Local URL to allow</help>
-    <valueHelp>
-      <format>url</format>
-      <description>Local URL to allow (without http:\/\/</description>
-    </valueHelp>
-    <constraint>
-      <regex>^(https?:\/\/)$</regex>
-    </constraint>
-    <multi/>
-  </properties>
-</leafNode>
-<leafNode name="local-ok">
-  <properties>
-    <help>Local site to allow</help>
-    <valueHelp>
-      <format>ipv4</format>
-      <description>IP address of site to allow</description>
-    </valueHelp>
-    <constraint>
-      <validator name="ipv4-prefix"/>
-    </constraint>
-    <multi/>
-  </properties>
-</leafNode>
-<leafNode name="log">
-  <properties>
-    <help>Log block category</help>
-    <completionHelp>
-      <script>${vyos_completion_dir}/list_webproxy_category.sh</script>
-      <list>all</list>
-    </completionHelp>
-    <multi/>
-  </properties>
-</leafNode>
-<!-- included end -->
diff --git a/interface-definitions/include/webproxy-url-filtering.xml.i b/interface-definitions/include/webproxy-url-filtering.xml.i
new file mode 100644
index 000000000..de6ebffde
--- /dev/null
+++ b/interface-definitions/include/webproxy-url-filtering.xml.i
@@ -0,0 +1,119 @@
+<!-- included start from webproxy-url-filtering.xml.i -->
+<leafNode name="allow-category">
+  <properties>
+    <help>Category to allow</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_webproxy_category.sh</script>
+    </completionHelp>
+    <multi/>
+  </properties>
+</leafNode>
+<leafNode name="allow-ipaddr-url">
+  <properties>
+    <help>Allow IP address URLs</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="block-category">
+  <properties>
+    <help>Category to block</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_webproxy_category.sh</script>
+    </completionHelp>
+    <multi/>
+  </properties>
+</leafNode>
+<leafNode name="default-action">
+  <properties>
+    <help>Default action (default: allow)</help>
+    <completionHelp>
+      <list>allow block</list>
+    </completionHelp>
+    <valueHelp>
+      <format>allow</format>
+      <description>Default filter action is allow)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>block</format>
+      <description>Default filter action is block</description>
+    </valueHelp>
+    <constraint>
+      <regex>^(allow|block)$</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="enable-safe-search">
+  <properties>
+    <help>Enable safe-mode search on popular search engines</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="local-block-keyword">
+  <properties>
+    <help>Local keyword to block</help>
+    <valueHelp>
+      <format>keyword</format>
+      <description>Keyword (or regex) to block</description>
+    </valueHelp>
+    <multi/>
+  </properties>
+</leafNode>
+<leafNode name="local-block-url">
+  <properties>
+    <help>Local URL to block</help>
+    <valueHelp>
+      <format>url</format>
+      <description>Local URL to block (without "http://")</description>
+    </valueHelp>
+    <multi/>
+  </properties>
+</leafNode>
+<leafNode name="local-block">
+  <properties>
+    <help>Local site to block</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>IP address of site to block</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-address"/>
+      <validator name="fqdn"/>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
+<leafNode name="local-ok-url">
+  <properties>
+    <help>Local URL to allow</help>
+    <valueHelp>
+      <format>url</format>
+      <description>Local URL to allow (without "http://")</description>
+    </valueHelp>
+    <multi/>
+  </properties>
+</leafNode>
+<leafNode name="local-ok">
+  <properties>
+    <help>Local site to allow</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>IP address of site to allow</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-address"/>
+      <validator name="fqdn"/>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
+<leafNode name="log">
+  <properties>
+    <help>Log block category</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_webproxy_category.sh</script>
+      <list>all</list>
+    </completionHelp>
+    <multi/>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/service_webproxy.xml.in b/interface-definitions/service_webproxy.xml.in
index ba33a30f4..4cd8138ec 100644
--- a/interface-definitions/service_webproxy.xml.in
+++ b/interface-definitions/service_webproxy.xml.in
@@ -171,11 +171,11 @@
                   <help>Hostname or IP address of peer</help>
                   <valueHelp>
                     <format>ipv4</format>
-                    <description>Remote syslog server IPv4 address</description>
+                    <description>Squid cache-peer IPv4 address</description>
                   </valueHelp>
                   <valueHelp>
                     <format>hostname</format>
-                    <description>Remote syslog server FQDN</description>
+                    <description>Squid cache-peer hostname</description>
                   </valueHelp>
                   <constraint>
                     <validator name="ip-address"/>
@@ -293,7 +293,10 @@
           </leafNode>
           <tagNode name="listen-address">
             <properties>
-              <help>IPv4 address for webproxy to listen on [REQUIRED]</help>
+              <help>IPv4 listen-address for WebProxy [REQUIRED]</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_local_ips.sh --ipv4</script>
+              </completionHelp>
               <valueHelp>
                 <format>ipv4</format>
                 <description>IPv4 address listen on</description>
@@ -402,7 +405,7 @@
                   <help>URL filtering via squidGuard redirector</help>
                 </properties>
                 <children>
-                  #include <include/webproxy-squidguard.xml.i>
+                  #include <include/webproxy-url-filtering.xml.i>
                   <node name="auto-update">
                     <properties>
                       <help>Auto update settings</help>
@@ -446,7 +449,7 @@
                       <constraintErrorMessage>SquidGuard rule must between 1-1024</constraintErrorMessage>
                     </properties>
                     <children>
-                      #include <include/webproxy-squidguard.xml.i>
+                      #include <include/webproxy-url-filtering.xml.i>
                       <leafNode name="redirect-url">
                         <properties>
                           <help>Redirect URL for filtered websites</help>
-- 
cgit v1.2.3