scottk/ols-ucentral-schema
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/ols-ucentral-schema.git synced 2025-11-01 18:47:51 +00:00
Code Issues Packages Projects Releases 3 Wiki Activity

schema: add support for eap-192 mode

Browse Source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2021-10-07 11:26:26 +02:00
parent cf3d64f430
commit 8f0922b418
4 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
renderer/templates/interface/ssid.uc
View File

@@ -63,7 +63,7 @@
} }
function validate_encryption_ap() { function validate_encryption_ap() {
if (ssid.encryption.proto in [ "wpa", "wpa2", "wpa-mixed", "wpa3", "wpa3-mixed" ] && if (ssid.encryption.proto in [ "wpa", "wpa2", "wpa-mixed", "wpa3", "wpa3-mixed", "wpa3-192" ] &&
ssid.radius && ssid.radius.local && ssid.radius && ssid.radius.local &&
length(certificates)) length(certificates))
return { return {
@@ -73,7 +73,7 @@
}; };
if (ssid.encryption.proto in [ "wpa", "wpa2", "wpa-mixed", "wpa3", "wpa3-mixed" ] && if (ssid.encryption.proto in [ "wpa", "wpa2", "wpa-mixed", "wpa3", "wpa3-mixed", "wpa3-192" ] &&
ssid.radius && ssid.radius.authentication && ssid.radius && ssid.radius.authentication &&
ssid.radius.authentication.host && ssid.radius.authentication.host &&
ssid.radius.authentication.port && ssid.radius.authentication.port &&
@@ -89,7 +89,7 @@
} }
function validate_encryption_sta() { function validate_encryption_sta() {
if (ssid.encryption.proto in [ "wpa", "wpa2", "wpa-mixed", "wpa3", "wpa3-mixed" ] && if (ssid.encryption.proto in [ "wpa", "wpa2", "wpa-mixed", "wpa3", "wpa3-mixed", "wpa3-192" ] &&
length(certificates)) length(certificates))
return { return {
proto: ssid.encryption.proto, proto: ssid.encryption.proto,
@@ -130,23 +130,14 @@
return 0; return 0;
if (ssid.encryption.proto in [ "sae-mixed", "wpa3-mixed" ]) if (ssid.encryption.proto in [ "sae-mixed", "wpa3-mixed" ])
return 2; return 1;
if (ssid.encryption.proto in [ "sae", "wpa3" ]) if (ssid.encryption.proto in [ "sae", "wpa3", "wpa3-192" ])
return 2; return 2;
return index([ "disabled", "optional", "required" ], ssid.encryption.ieee80211w); return index([ "disabled", "optional", "required" ], ssid.encryption.ieee80211w);
} }
function match_proto(proto) {
let protos = {
"wpa3": "eap256",
"wpa3-mixed": "eap-eap192"
};
return protos[proto] || proto;
}
function match_wds() { function match_wds() {
return index([ "wds-ap", "wds-sta", "wds-repeater" ], ssid.bss_mode) >= 0; return index([ "wds-ap", "wds-sta", "wds-repeater" ], ssid.bss_mode) >= 0;
} }

1
schema/interface.ssid.encryption.yml
View File

@@ -18,6 +18,7 @@ properties:
- sae - sae
- sae-mixed - sae-mixed
- wpa3 - wpa3
- wpa3-192
- wpa3-mixed - wpa3-mixed
examples: examples:
- psk2 - psk2

4
schemareader.uc
View File

@@ -1864,8 +1864,8 @@ function instantiateInterfaceSsidEncryption(location, value, errors) {
if (type(value) != "string") if (type(value) != "string")
push(errors, [ location, "must be of type string" ]); push(errors, [ location, "must be of type string" ]);
if (!(value in [ "none", "psk", "psk2", "psk-mixed", "wpa", "wpa2", "wpa-mixed", "sae", "sae-mixed", "wpa3", "wpa3-mixed" ])) if (!(value in [ "none", "psk", "psk2", "psk-mixed", "wpa", "wpa2", "wpa-mixed", "sae", "sae-mixed", "wpa3", "wpa3-192", "wpa3-mixed" ]))
push(errors, [ location, "must be one of \"none\", \"psk\", \"psk2\", \"psk-mixed\", \"wpa\", \"wpa2\", \"wpa-mixed\", \"sae\", \"sae-mixed\", \"wpa3\" or \"wpa3-mixed\"" ]); push(errors, [ location, "must be one of \"none\", \"psk\", \"psk2\", \"psk-mixed\", \"wpa\", \"wpa2\", \"wpa-mixed\", \"sae\", \"sae-mixed\", \"wpa3\", \"wpa3-192\" or \"wpa3-mixed\"" ]);
return value; return value;
} }

1
ucentral.schema.json
View File

@@ -789,6 +789,7 @@
"sae", "sae",
"sae-mixed", "sae-mixed",
"wpa3", "wpa3",
"wpa3-192",
"wpa3-mixed" "wpa3-mixed"
], ],
"examples": [ "examples": [