diff options
author | Christopher <root@teritum.dev> | 2024-06-10 19:52:48 +0100 |
---|---|---|
committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-09-19 07:00:30 +0000 |
commit | d50526477ed510a011935747f18bd6b4ec3ec2f1 (patch) | |
tree | 29b2eabebd912ec2499ab8f84cf055c88381f5e5 /interface-definitions | |
parent | 0444795e3798f2ec51e40bef67a0920f892769b8 (diff) | |
download | vyos-1x-d50526477ed510a011935747f18bd6b4ec3ec2f1.tar.gz vyos-1x-d50526477ed510a011935747f18bd6b4ec3ec2f1.zip |
wireless: T6496: support for EAP-MSCHAPv2 client over wifi
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`
(cherry picked from commit fc4263021acb72d2d8afb165922d9cb7e11b2bf1)
Diffstat (limited to 'interface-definitions')
-rw-r--r-- | interface-definitions/interfaces_wireless.xml.in | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/interface-definitions/interfaces_wireless.xml.in b/interface-definitions/interfaces_wireless.xml.in index 4de90591b..c1a101ee8 100644 --- a/interface-definitions/interfaces_wireless.xml.in +++ b/interface-definitions/interfaces_wireless.xml.in @@ -759,6 +759,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> @@ -935,15 +944,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> |