lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

basic enterprise support

Browse Source
This commit is contained in:
Turann_
2026-03-08 06:17:34 +03:00
parent d4f2ebb9a5
commit 88618b68f4
3 changed files with 154 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Services/Networking/NetworkService.qml
+24 -6
View File
@@ -342,10 +342,18 @@ Singleton {
refreshActiveEthernetDetails();
}
function connect(ssid, password = "", isHidden = false) {
function connect(ssid, password = "", isHidden = false, identity = "") {
if (!ProgramCheckerService.nmcliAvailable || connecting) {
return;
}
// For enterprise networks, use the robust manual connection logic (profile creation)
// as it handles 802.1X parameters much more reliably than 'device wifi connect'.
if (isEnterprise(networks[ssid] ? networks[ssid].security : "")) {
connectManual(ssid, password, "wpa-eap", identity);
return;
}
connecting = true;
connectingTo = ssid;
lastError = "";
@@ -366,7 +374,7 @@ Singleton {
connectProcess.running = true;
}
function connectManual(ssid, password, securityKey) {
function connectManual(ssid, password, securityKey, identity = "") {
if (!ProgramCheckerService.nmcliAvailable || connecting) {
return;
}
@@ -377,6 +385,7 @@ Singleton {
manualConnectProcess.ssid = ssid;
manualConnectProcess.password = password;
manualConnectProcess.securityKey = securityKey;
manualConnectProcess.identity = identity;
manualConnectProcess.running = true;
}
@@ -468,6 +477,14 @@ Singleton {
return security && security !== "--" && security.trim() !== "";
}
function isEnterprise(security) {
if (!security) {
return false;
}
const s = security.toUpperCase();
return s.indexOf("802.1X") !== -1 || s.indexOf("EAP") !== -1 || s.indexOf("ENTERPRISE") !== -1;
}
function getSignalStrengthLabel(signal) {
switch (true) {
case (signal >= 80):
@@ -1434,6 +1451,7 @@ Singleton {
property string ssid: ""
property string password: ""
property string securityKey: ""
property string identity: ""
running: false
command: {
@@ -1441,6 +1459,7 @@ Singleton {
SSID="$1"
PWD="$2"
SEC="$3"
IDENT="$4"
# Remove existing profile to avoid conflict
nmcli connection delete id "$SSID" 2>/dev/null || true
@@ -1453,9 +1472,8 @@ elif [ "$SEC" = "sae" ]; then
elif [ "$SEC" = "wep" ]; then
nmcli connection add type wifi con-name "$SSID" ssid "$SSID" -- wifi-sec.key-mgmt none wifi-sec.wep-key0 "$PWD" 802-11-wireless.hidden yes
elif [[ "$SEC" == *-eap ]]; then
# Enterprise not fully supported in Stage 1
echo "Enterprise networks not supported yet"
exit 1
# WPA Enterprise (PEAP-MSCHAPv2 default)
nmcli connection add type wifi con-name "$SSID" ssid "$SSID" -- wifi-sec.key-mgmt wpa-eap 802-1x.eap peap 802-1x.phase2-auth mschapv2 802-1x.identity "$IDENT" 802-1x.password "$PWD" 802-11-wireless.hidden yes
else
nmcli connection add type wifi con-name "$SSID" ssid "$SSID" -- 802-11-wireless.hidden yes
fi
@@ -1464,7 +1482,7 @@ fi
nmcli connection up id "$SSID"
`;
return ["sh", "-c", script, "--", ssid, password, securityKey];
return ["sh", "-c", script, "--", ssid, password, securityKey, identity];
}
stdout: StdioCollector {