From fc4263021acb72d2d8afb165922d9cb7e11b2bf1 Mon Sep 17 00:00:00 2001
From: Christopher <root@teritum.dev>
Date: Mon, 10 Jun 2024 19:52:48 +0100
Subject: wireless: T6496: support for EAP-MSCHAPv2 client over wifi
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix: attempt to fix indentation on `wpa_supplicant.conf.j2`

fix: attempt to fix indentation on `wpa_supplicant.conf.j2`

fix: incorrect bssid mapping

fix: use the correct jinja templating (I think)

fix: “remote blank space

fix: attempt to fix the formatting in j2

fix: attempt to fix the formatting in j2

feat: rename enterprise username and password + add checks in conf mode.

fix: move around `bssid` config option on `wpa_supplicant.conf.j2` and fix the security config part

fix: fix indentation on `wpa_supplicant.conf.j2`
---
 interface-definitions/interfaces_wireless.xml.in | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/interfaces_wireless.xml.in b/interface-definitions/interfaces_wireless.xml.in
index 0a62b3255..dd2ae02bc 100644
--- a/interface-definitions/interfaces_wireless.xml.in
+++ b/interface-definitions/interfaces_wireless.xml.in
@@ -723,6 +723,15 @@
               <help>Wireless security settings</help>
             </properties>
             <children>
+              <leafNode name="bssid">
+                <properties>
+                  <help>Basic Service Set Identifier (BSSID)</help>
+                  <constraint>
+                    <regex>([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}</regex>
+                  </constraint>
+                  <constraintErrorMessage>Invalid BSSID</constraintErrorMessage>
+                </properties>
+              </leafNode>
               <node name="station-address">
                 <properties>
                   <help>Station MAC address based authentication</help>
@@ -899,15 +908,16 @@
                     </properties>
                     <defaultValue>wpa+wpa2</defaultValue>
                   </leafNode>
+                  #include <include/generic-username.xml.i>
                   <leafNode name="passphrase">
                     <properties>
-                      <help>WPA personal shared pass phrase. If you are using special characters in the WPA passphrase then single quotes are required.</help>
+                      <help>WPA passphrase. If you are using special characters in the WPA passphrase then single quotes are required.</help>
                       <valueHelp>
                         <format>txt</format>
-                        <description>Passphrase of at least 8 but not more than 63 printable characters</description>
+                        <description>Passphrase of at least 8 but not more than 63 printable characters for WPA-Personal and any passphrase for WPA-Enterprise</description>
                       </valueHelp>
                       <constraint>
-                        <regex>.{8,63}</regex>
+                        <regex>.*</regex>
                       </constraint>
                       <constraintErrorMessage>Invalid WPA pass phrase, must be 8 to 63 printable characters!</constraintErrorMessage>
                     </properties>
-- 
cgit v1.2.3


From 5a6ac65fe0684fc5298de3daa8582294ac387b46 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Fri, 5 Jul 2024 06:44:04 +0000
Subject: wireless: T6496: use ascii regex for WPA passphrase constraint

---
 interface-definitions/interfaces_wireless.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/interfaces_wireless.xml.in b/interface-definitions/interfaces_wireless.xml.in
index dd2ae02bc..0f52812db 100644
--- a/interface-definitions/interfaces_wireless.xml.in
+++ b/interface-definitions/interfaces_wireless.xml.in
@@ -917,7 +917,7 @@
                         <description>Passphrase of at least 8 but not more than 63 printable characters for WPA-Personal and any passphrase for WPA-Enterprise</description>
                       </valueHelp>
                       <constraint>
-                        <regex>.*</regex>
+                        <regex>[[:ascii:]]{1,256}</regex>
                       </constraint>
                       <constraintErrorMessage>Invalid WPA pass phrase, must be 8 to 63 printable characters!</constraintErrorMessage>
                     </properties>
-- 
cgit v1.2.3


From 0c9499c5b3f7cc053c1f29ecf28d679c1a3156e2 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Fri, 5 Jul 2024 08:47:54 +0200
Subject: wireless: T6496: use mac-address validator on BSSID and move it up
 one CLI level

---
 data/templates/wifi/wpa_supplicant.conf.j2       |  4 ++--
 interface-definitions/interfaces_wireless.xml.in | 22 +++++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'interface-definitions')

diff --git a/data/templates/wifi/wpa_supplicant.conf.j2 b/data/templates/wifi/wpa_supplicant.conf.j2
index 8839663e1..04088e1ad 100644
--- a/data/templates/wifi/wpa_supplicant.conf.j2
+++ b/data/templates/wifi/wpa_supplicant.conf.j2
@@ -89,7 +89,7 @@ network={
     key_mgmt=NONE
 {%     endif %}
 {% endif %}
-{% if security.bssid is vyos_defined %}
-    bssid={{ security.bssid }}
+{% if bssid is vyos_defined %}
+    bssid={{ bssid }}
 {% endif %}
 }
diff --git a/interface-definitions/interfaces_wireless.xml.in b/interface-definitions/interfaces_wireless.xml.in
index 0f52812db..fdcb79b19 100644
--- a/interface-definitions/interfaces_wireless.xml.in
+++ b/interface-definitions/interfaces_wireless.xml.in
@@ -723,15 +723,6 @@
               <help>Wireless security settings</help>
             </properties>
             <children>
-              <leafNode name="bssid">
-                <properties>
-                  <help>Basic Service Set Identifier (BSSID)</help>
-                  <constraint>
-                    <regex>([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}</regex>
-                  </constraint>
-                  <constraintErrorMessage>Invalid BSSID</constraintErrorMessage>
-                </properties>
-              </leafNode>
               <node name="station-address">
                 <properties>
                   <help>Station MAC address based authentication</help>
@@ -950,6 +941,19 @@
               <constraintErrorMessage>Invalid SSID</constraintErrorMessage>
             </properties>
           </leafNode>
+          <leafNode name="bssid">
+            <properties>
+              <help>Basic Service Set Identifier (BSSID) - currently station mode only</help>
+              <valueHelp>
+                <format>macaddr</format>
+                <description>BSSID (MAC) address</description>
+              </valueHelp>
+              <constraint>
+                <validator name="mac-address"/>
+              </constraint>
+              <constraintErrorMessage>Invalid BSSID</constraintErrorMessage>
+            </properties>
+          </leafNode>
           <leafNode name="type">
             <properties>
               <help>Wireless device type for this interface</help>
-- 
cgit v1.2.3