From 1bfe506d93d5b960be58a22ef5d0ff5e92cf26db Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sat, 21 Jan 2023 20:07:58 +0100
Subject: validators: T4875: use file-path to replace validator
 'interface-name'

(cherry picked from commit f0bc6c62016d285f0645c4b3ba8b1451c40c637f)
---
 interface-definitions/dns-domain-name.xml.in       |  2 +-
 .../include/constraint/interface-name.xml.in       |  4 +++
 .../include/generic-interface-broadcast.xml.i      |  2 +-
 .../include/generic-interface-multi.xml.i          |  2 +-
 .../include/source-interface.xml.i                 |  2 +-
 interface-definitions/interfaces-bonding.xml.in    |  4 +--
 interface-definitions/vrrp.xml.in                  |  2 +-
 src/validators/interface-name                      | 34 ----------------------
 8 files changed, 11 insertions(+), 41 deletions(-)
 create mode 100644 interface-definitions/include/constraint/interface-name.xml.in
 delete mode 100755 src/validators/interface-name

diff --git a/interface-definitions/dns-domain-name.xml.in b/interface-definitions/dns-domain-name.xml.in
index 005a55ab3..a599a75cc 100644
--- a/interface-definitions/dns-domain-name.xml.in
+++ b/interface-definitions/dns-domain-name.xml.in
@@ -25,7 +25,7 @@
           <constraint>
             <validator name="ipv4-address"/>
             <validator name="ipv6-address"/>
-            <validator name="interface-name"/>
+            #include <include/constraint/interface-name.xml.in>
           </constraint>
         </properties>
       </leafNode>
diff --git a/interface-definitions/include/constraint/interface-name.xml.in b/interface-definitions/include/constraint/interface-name.xml.in
new file mode 100644
index 000000000..2d1f7b757
--- /dev/null
+++ b/interface-definitions/include/constraint/interface-name.xml.in
@@ -0,0 +1,4 @@
+<!-- include start from constraint/interface-name.xml.in -->
+<regex>(bond|br|dum|en|ersp|eth|gnv|lan|l2tp|l2tpeth|macsec|peth|ppp|pppoe|pptp|sstp|tun|veth|vti|vtun|vxlan|wg|wlan|wwan)[0-9]+(.\d+)?|lo</regex>
+<validator name="file-path --lookup-path /sys/class/net --directory"/>
+<!-- include end -->
diff --git a/interface-definitions/include/generic-interface-broadcast.xml.i b/interface-definitions/include/generic-interface-broadcast.xml.i
index 6f76dde1a..af35a888b 100644
--- a/interface-definitions/include/generic-interface-broadcast.xml.i
+++ b/interface-definitions/include/generic-interface-broadcast.xml.i
@@ -10,7 +10,7 @@
       <description>Interface name</description>
     </valueHelp>
     <constraint>
-      <validator name="interface-name"/>
+      #include <include/constraint/interface-name.xml.in>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/generic-interface-multi.xml.i b/interface-definitions/include/generic-interface-multi.xml.i
index 65aae28ae..16916ff54 100644
--- a/interface-definitions/include/generic-interface-multi.xml.i
+++ b/interface-definitions/include/generic-interface-multi.xml.i
@@ -10,7 +10,7 @@
       <description>Interface name</description>
     </valueHelp>
     <constraint>
-      <validator name="interface-name"/>
+      #include <include/constraint/interface-name.xml.in>
     </constraint>
     <multi/>
   </properties>
diff --git a/interface-definitions/include/source-interface.xml.i b/interface-definitions/include/source-interface.xml.i
index a9c2a0f9d..4c1fddb57 100644
--- a/interface-definitions/include/source-interface.xml.i
+++ b/interface-definitions/include/source-interface.xml.i
@@ -10,7 +10,7 @@
       <script>${vyos_completion_dir}/list_interfaces.py</script>
     </completionHelp>
     <constraint>
-      <validator name="interface-name"/>
+      #include <include/constraint/interface-name.xml.in>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index 307dd7558..6b5335d2a 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -199,7 +199,7 @@
                     <description>Interface name</description>
                   </valueHelp>
                   <constraint>
-                    <validator name="interface-name"/>
+                    #include <include/constraint/interface-name.xml.in>
                   </constraint>
                   <multi/>
                 </properties>
@@ -218,7 +218,7 @@
                 <description>Interface name</description>
               </valueHelp>
               <constraint>
-                <validator name="interface-name"/>
+                #include <include/constraint/interface-name.xml.in>
               </constraint>
             </properties>
           </leafNode>
diff --git a/interface-definitions/vrrp.xml.in b/interface-definitions/vrrp.xml.in
index 337a0bbc9..fed1486f9 100644
--- a/interface-definitions/vrrp.xml.in
+++ b/interface-definitions/vrrp.xml.in
@@ -210,7 +210,7 @@
                         <description>Interface name</description>
                       </valueHelp>
                       <constraint>
-                        <validator name="interface-name"/>
+                        #include <include/constraint/interface-name.xml.in>
                       </constraint>
                       <multi/>
                     </properties>
diff --git a/src/validators/interface-name b/src/validators/interface-name
deleted file mode 100755
index 105815eee..000000000
--- a/src/validators/interface-name
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2021 VyOS maintainers and contributors
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 or later as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import re
-
-from sys import argv
-from sys import exit
-
-pattern = '^(bond|br|dum|en|ersp|eth|gnv|lan|l2tp|l2tpeth|macsec|peth|ppp|pppoe|pptp|sstp|tun|vti|vtun|vxlan|wg|wlan|wwan)[0-9]+(.\d+)?|lo$'
-
-if __name__ == '__main__':
-    if len(argv) != 2:
-        exit(1)
-    interface = argv[1]
-
-    if re.match(pattern, interface):
-        exit(0)
-    if os.path.exists(f'/sys/class/net/{interface}'):
-        exit(0)
-    exit(1)
-- 
cgit v1.2.3


From ddd2a3e01b2f92952d035a5a5454c233be92ef3f Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sun, 22 Jan 2023 08:37:51 +0100
Subject: validators: T4798: replace python file-exists validator with
 file-path

(cherry-picked from commit 046bb9ccd56ac5e97c638bb4a9ca856d3d36026a)
---
 interface-definitions/interfaces-openvpn.xml.in | 10 +++++-----
 interface-definitions/protocols-rpki.xml.in     |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in
index 51e81390c..20a37ac48 100644
--- a/interface-definitions/interfaces-openvpn.xml.in
+++ b/interface-definitions/interfaces-openvpn.xml.in
@@ -643,7 +643,7 @@
                 <description>File in /config/auth directory</description>
               </valueHelp>
               <constraint>
-                <validator name="file-exists" argument="--directory /config/auth"/>
+                <validator name="file-path" argument="--strict --parent-dir /config/auth"/>
               </constraint>
             </properties>
           </leafNode>
@@ -660,7 +660,7 @@
                     <description>File in /config/auth directory</description>
                   </valueHelp>
                   <constraint>
-                    <validator name="file-exists" argument="--directory /config/auth"/>
+                    <validator name="file-path" argument="--strict --parent-dir /config/auth"/>
                   </constraint>
                 </properties>
               </leafNode>
@@ -674,7 +674,7 @@
                     <description>File in /config/auth directory</description>
                   </valueHelp>
                   <constraint>
-                    <validator name="file-exists" argument="--directory /config/auth"/>
+                    <validator name="file-path" argument="--strict --parent-dir /config/auth"/>
                   </constraint>
                 </properties>
               </leafNode>
@@ -686,7 +686,7 @@
                     <description>File in /config/auth directory</description>
                   </valueHelp>
                   <constraint>
-                    <validator name="file-exists" argument="--directory /config/auth"/>
+                    <validator name="file-path" argument="--strict --parent-dir /config/auth"/>
                   </constraint>
                 </properties>
               </leafNode>
@@ -699,7 +699,7 @@
                     <description>File in /config/auth directory</description>
                   </valueHelp>
                   <constraint>
-                    <validator name="file-exists" argument="--directory /config/auth"/>
+                    <validator name="file-path" argument="--strict --parent-dir /config/auth"/>
                   </constraint>
                 </properties>
               </leafNode>
diff --git a/interface-definitions/protocols-rpki.xml.in b/interface-definitions/protocols-rpki.xml.in
index 707eb4bf1..4714355bb 100644
--- a/interface-definitions/protocols-rpki.xml.in
+++ b/interface-definitions/protocols-rpki.xml.in
@@ -51,7 +51,7 @@
                     <properties>
                       <help>RPKI SSH known hosts file</help>
                       <constraint>
-                        <validator name="file-exists"/>
+                        <validator name="file-path"/>
                       </constraint>
                     </properties>
                   </leafNode>
@@ -59,7 +59,7 @@
                     <properties>
                       <help>RPKI SSH private key file</help>
                       <constraint>
-                        <validator name="file-exists"/>
+                        <validator name="file-path"/>
                       </constraint>
                     </properties>
                   </leafNode>
@@ -67,7 +67,7 @@
                     <properties>
                       <help>RPKI SSH public key file path</help>
                       <constraint>
-                        <validator name="file-exists"/>
+                        <validator name="file-path"/>
                       </constraint>
                     </properties>
                   </leafNode>
-- 
cgit v1.2.3