mike/systeminformation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi sanitizing iface names

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2023-09-19 15:52:20 +02:00
parent c184c79f84
commit 3c11b2200d
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/util.js
View File

@ -709,6 +709,7 @@ function sanitizeShellString(str, strict) {
(strict && s[i] === '@') || (strict && s[i] === '@') ||
(strict && s[i] === ' ') || (strict && s[i] === ' ') ||
(strict && s[i] == '{') || (strict && s[i] == '{') ||
(strict && s[i] == ';') ||
(strict && s[i] == ')'))) { (strict && s[i] == ')'))) {
result = result + s[i]; result = result + s[i];
} }

22
lib/wifi.js
View File

@ -401,7 +401,15 @@ function wifiNetworks(callback) {
} }
}); });
if (iface) { if (iface) {
const res = getWifiNetworkListIw(iface); let ifaceSanitized = '';
const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(iface);
for (let i = 0; i <= util.mathMin(s.length, 2000); i++) {
if (s[i] !== undefined) {
ifaceSanitized = ifaceSanitized + s[i];
}
}
const res = getWifiNetworkListIw(ifaceSanitized);
if (res === -1) { if (res === -1) {
// try again after 4 secs // try again after 4 secs
setTimeout(function (iface) { setTimeout(function (iface) {
@ -529,8 +537,16 @@ function wifiConnections(callback) {
const ifaces = ifaceListLinux(); const ifaces = ifaceListLinux();
const networkList = getWifiNetworkListNmi(); const networkList = getWifiNetworkListNmi();
ifaces.forEach(ifaceDetail => { ifaces.forEach(ifaceDetail => {
const nmiDetails = nmiDeviceLinux(ifaceDetail.iface); let ifaceSanitized = '';
const wpaDetails = wpaConnectionLinux(ifaceDetail.iface); const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(ifaceDetail.iface);
for (let i = 0; i <= util.mathMin(s.length, 2000); i++) {
if (s[i] !== undefined) {
ifaceSanitized = ifaceSanitized + s[i];
}
}
const nmiDetails = nmiDeviceLinux(ifaceSanitized);
const wpaDetails = wpaConnectionLinux(ifaceSanitized);
const ssid = nmiDetails.ssid || wpaDetails.ssid; const ssid = nmiDetails.ssid || wpaDetails.ssid;
const network = networkList.filter(nw => nw.ssid === ssid); const network = networkList.filter(nw => nw.ssid === ssid);
const nmiConnection = nmiConnectionLinux(ssid); const nmiConnection = nmiConnectionLinux(ssid);