dhcp: T3237: add constraint to static-mapping mac-address node

The format of the CLI specified MAC address was not validated as only addresses
with a colon as seperator are supported. Constraint has been added.

(cherry picked from commit 79af3560e7b2f88b6850739b0e30ee372c51f63b)

2 files changed, 32 insertions, 0 deletions

diff --git a/interface-definitions/dhcp-server.xml b/interface-definitions/dhcp-server.xml
index c05cb4e1d..d95784f4e 100644
--- a/interface-definitions/dhcp-server.xml
+++ b/interface-definitions/dhcp-server.xml
@@ -354,6 +354,9 @@
                             <format>h:h:h:h:h:h</format>
                             <description>MAC address used in static mapping [REQUIRED]</description>
                           </valueHelp>
+                          <constraint>
+                            <validator name="mac-address"/>
+                          </constraint>
                         </properties>
                       </leafNode>
                       <leafNode name="static-mapping-parameters">
diff --git a/src/validators/mac-address b/src/validators/mac-address
new file mode 100755
index 000000000..b2d3496f4
--- /dev/null
+++ b/src/validators/mac-address
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2018-2020 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 re
+import sys
+
+
+pattern = "^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$"
+
+
+if __name__ == '__main__':
+    if len(sys.argv) != 2:
+        sys.exit(1)
+    if not re.match(pattern, sys.argv[1]):
+        sys.exit(1)
+    sys.exit(0)