From 86135ce2820387898e6c582b45eb75b5cb1a36a6 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Mon, 29 Aug 2022 08:29:55 +0200
Subject: [PATCH] net/wireguard: adjust naming validation (#3102)

---
 net/wireguard/Makefile                                      | 2 +-
 net/wireguard/pkg-descr                                     | 4 ++++
 .../opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml   | 6 ++++--
 .../opnsense/mvc/app/models/OPNsense/Wireguard/Server.xml   | 6 +++---
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/net/wireguard/Makefile b/net/wireguard/Makefile
index 3e37bd759..6aa903531 100644
--- a/net/wireguard/Makefile
+++ b/net/wireguard/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		wireguard
-PLUGIN_VERSION=		1.11
+PLUGIN_VERSION=		1.12
 PLUGIN_COMMENT=		WireGuard VPN service
 PLUGIN_DEPENDS=		wireguard-go wireguard-tools
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net/wireguard/pkg-descr b/net/wireguard/pkg-descr
index d5787c5ff..058ea7ede 100644
--- a/net/wireguard/pkg-descr
+++ b/net/wireguard/pkg-descr
@@ -16,6 +16,10 @@ WWW: https://www.wireguard.com/
 Changelog
 ---------
 
+1.12
+
+* Adjust validation for naming local instance and endpoints
+
 1.11
 
 * Add script for renewal of Wireguard DNS-based entries for stale connections (#2956)
diff --git a/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml b/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml
index e547d80bd..69527a433 100644
--- a/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml
+++ b/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/wireguard/client</mount>
     <description>Wireguard Client configuration</description>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
     <items>
         <clients>
             <client type="ArrayField">
@@ -9,9 +9,11 @@
                     <default>1</default>
                     <Required>Y</Required>
                 </enabled>
-                <name type="HostnameField">
+                <name type="TextField">
                     <default></default>
                     <Required>Y</Required>
+                    <mask>/^([0-9a-zA-Z._\-]){1,64}$/u</mask>
+                    <ValidationMessage>Should be a string between 1 and 64 characters. Allowed characters are alphanumeric characters, dash and underscores.</ValidationMessage>
                 </name>
                 <pubkey type="Base64Field">
                     <Required>Y</Required>
diff --git a/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Server.xml b/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Server.xml
index 64d4deb9d..476091d23 100644
--- a/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Server.xml
+++ b/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Server.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/wireguard/server</mount>
     <description>Wireguard Server configuration</description>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
     <items>
         <servers>
             <server type="ArrayField">
@@ -12,8 +12,8 @@
                 <name type="TextField">
                     <default></default>
                     <Required>Y</Required>
-                    <mask>/^([0-9a-zA-Z]){1,32}$/u</mask>
-                    <ValidationMessage>Should be a string between 1 and 32 characters. Allowed characters are 0-9, a-z, and A-Z</ValidationMessage>
+                    <mask>/^([0-9a-zA-Z._\-]){1,64}$/u</mask>
+                    <ValidationMessage>Should be a string between 1 and 64 characters. Allowed characters are alphanumeric characters, dash and underscores.</ValidationMessage>
                 </name>
                 <instance type="AutoNumberField">
                     <Required>Y</Required>