From e6da85918d2a63e35b4e76d6ef0166f7bf3ba872 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 6 Sep 2023 21:00:54 +0200
Subject: [PATCH] VPN: IPsec: Connections [new] - Allow the use of eap_id =
 %any . closes https://github.com/opnsense/core/issues/6824

---
 .../mvc/app/controllers/OPNsense/IPsec/forms/dialogLocal.xml    | 2 +-
 .../mvc/app/controllers/OPNsense/IPsec/forms/dialogRemote.xml   | 2 +-
 src/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.xml          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/IPsec/forms/dialogLocal.xml b/src/opnsense/mvc/app/controllers/OPNsense/IPsec/forms/dialogLocal.xml
index 1ccab008c..cfb7d04c9 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/IPsec/forms/dialogLocal.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/IPsec/forms/dialogLocal.xml
@@ -38,7 +38,7 @@
         <id>local.eap_id</id>
         <label>EAP Id</label>
         <type>text</type>
-        <help>Client EAP-Identity to use in EAP-Identity exchange and the EAP method</help>
+        <help>Client EAP-Identity to use in EAP-Identity exchange and the EAP method. If set to %any the EAP-Identity method will be used to ask the client for an EAP identity </help>
         <style>local_auth local_auth_eap-mschapv2 local_auth_eap-tls local_auth_eap-radius</style>
     </field>
     <field>
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/IPsec/forms/dialogRemote.xml b/src/opnsense/mvc/app/controllers/OPNsense/IPsec/forms/dialogRemote.xml
index ff8d08e36..6439f37b6 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/IPsec/forms/dialogRemote.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/IPsec/forms/dialogRemote.xml
@@ -38,7 +38,7 @@
         <id>remote.eap_id</id>
         <label>EAP Id</label>
         <type>text</type>
-        <help>Client EAP-Identity to use in EAP-Identity exchange and the EAP method</help>
+        <help>Client EAP-Identity to use in EAP-Identity exchange and the EAP method. If set to %any the EAP-Identity method will be used to ask the client for an EAP identity </help>        
         <style>remote_auth remote_auth_eap-mschapv2 remote_auth_eap-tls remote_auth_eap-radius</style>
     </field>
     <field>
diff --git a/src/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.xml b/src/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.xml
index 8a2314de8..ce3fdb977 100644
--- a/src/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.xml
@@ -143,7 +143,7 @@
                 </id>
                 <eap_id type="TextField">
                     <Required>N</Required>
-                    <mask>/^([0-9a-zA-Z\.\-,_\:\@]){0,1024}$/u</mask>
+                    <mask>/^([0-9a-zA-Z\.\-,_\:\@\%]){0,1024}$/u</mask>
                 </eap_id>
                 <certs type="CertificateField">
                     <Required>N</Required>