diff --git a/shell/plugins/panels/network/Model.js b/shell/plugins/panels/network/Model.js index bf5fa41d..2c9e3ebb 100644 --- a/shell/plugins/panels/network/Model.js +++ b/shell/plugins/panels/network/Model.js @@ -88,7 +88,28 @@ function parseBandStatus(raw) { } } +function decodeIwSsid(value) { + var raw = String(value || "") + try { + var encoded = "" + + for (var i = 0; i < raw.length; i++) { + if (raw[i] === "\\" && raw[i + 1] === "x" && /^[0-9a-f]{2}$/i.test(raw.substring(i + 2, i + 4))) { + var hex = raw.substring(i + 2, i + 4) + var byte = parseInt(hex, 16) + encoded += byte < 32 || byte === 127 ? encodeURIComponent(raw.substring(i, i + 4)) : "%" + hex + i += 3 + } else { + encoded += encodeURIComponent(raw[i]) + } + } + + return decodeURIComponent(encoded) + } catch (error) { + return raw + } +} function parseKeyValue(raw) { var next = {} @@ -98,7 +119,9 @@ function parseKeyValue(raw) { if (!line) continue var idx = line.indexOf("\t") if (idx === -1) continue - next[line.substring(0, idx)] = line.substring(idx + 1).trim() + var key = line.substring(0, idx) + var value = line.substring(idx + 1) + next[key] = key === "ssid" ? decodeIwSsid(value) : value.trim() } return next } @@ -331,6 +354,7 @@ if (typeof module !== "undefined") { bandSectionTitle: bandSectionTitle, bandTooltip: bandTooltip, parseBandStatus: parseBandStatus, + decodeIwSsid: decodeIwSsid, parseKeyValue: parseKeyValue, throughputState: throughputState, pingLatencyState: pingLatencyState, diff --git a/test/shell.d/network-test.sh b/test/shell.d/network-test.sh index 2c8d9067..a6c98e18 100644 --- a/test/shell.d/network-test.sh +++ b/test/shell.d/network-test.sh @@ -26,6 +26,17 @@ assertDeepEqual( { iface: 'wlan0', rx_bytes: '100', tx_bytes: '50' }, 'network parses detail key values' ) +assertEqual(network.decodeIwSsid('Cafe\\xe2\\x80\\x99'), 'Cafe’', 'network decodes UTF-8 SSID bytes') +assertEqual(network.decodeIwSsid('Smile \\xf0\\x9f\\x98\\x80'), 'Smile 😀', 'network decodes emoji SSID bytes') +assertEqual(network.decodeIwSsid('\\x20Cafe\\x20'), ' Cafe ', 'network preserves edge spaces in SSIDs') +assertEqual(network.decodeIwSsid('slash\\x5cname'), 'slash\\name', 'network decodes SSID backslashes once') +assertEqual(network.decodeIwSsid('invalid\\xff'), 'invalid\\xff', 'network preserves invalid UTF-8 escapes') +assertEqual(network.decodeIwSsid('already 😀'), 'already 😀', 'network safely preserves unexpected non-BMP input') +assertDeepEqual( + network.parseKeyValue('ssid\tline\\x0abreak\\x09tab\\x00nul\nsignal_dbm\t-40\n'), + { ssid: 'line\\x0abreak\\x09tab\\x00nul', signal_dbm: '-40' }, + 'network leaves control-byte escapes safe for single-line display' +) assertDeepEqual( network.throughputState({ prevIface: '', prevSampleTime: 0 }, { iface: 'wlan0', rx_bytes: '100', tx_bytes: '50' }, 10), { prevIface: 'wlan0', prevRxBytes: 100, prevTxBytes: 50, prevSampleTime: 10, downloadRate: 0, uploadRate: 0 },