fix: quick but remove bssid for macOS Monterey

friedrith · Oct 21, 2021 · a450bec · a450bec
1 parent c33b4f3
commit a450bec
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 2 deletions.
diff --git a/src/macOS/scan/__test__/parser.spec.js b/src/macOS/scan/__test__/parser.spec.js
@@ -152,4 +152,57 @@ describe('parse macOS scan output', () => {
       }
     ]);
   });
+
+  it('should return wifi networks on macOS Monterey', async () => {
+    const output = await unlog(log('scan-monterey.log'));
+
+    const networks = parse(output);
+
+    expect(networks).toEqual([
+      {
+        mac: '',
+        bssid: '',
+        ssid: 'XXXX-AMPLIFI',
+        channel: 36,
+        frequency: 5180,
+        quality: 38,
+        signal_level: '-81',
+        security: 'WPA2',
+        security_flags: ['(PSK/AES/AES)']
+      },
+      {
+        mac: '',
+        bssid: '',
+        ssid: 'XXXX-AMPLIFI',
+        channel: 36,
+        frequency: 5180,
+        quality: 70,
+        signal_level: '-65',
+        security: 'WPA2',
+        security_flags: ['(PSK/AES/AES)']
+      },
+      {
+        mac: '',
+        bssid: '',
+        ssid: 'XXXX-2.4GHz',
+        channel: 11,
+        frequency: 2462,
+        quality: 146,
+        signal_level: '-27',
+        security: 'WPA WPA2',
+        security_flags: ['(PSK/TKIP,AES/TKIP)', '(PSK/TKIP,AES/TKIP)']
+      },
+      {
+        mac: '',
+        bssid: '',
+        ssid: 'XXXX-5GHz',
+        channel: 149,
+        frequency: 5745,
+        quality: 134,
+        signal_level: '-33',
+        security: 'WPA WPA2',
+        security_flags: ['(PSK/TKIP,AES/TKIP)', '(PSK/TKIP,AES/TKIP)']
+      }
+    ]);
+  });
 });
diff --git a/src/macOS/scan/parser.js b/src/macOS/scan/parser.js
@@ -32,7 +32,7 @@ const parse = stdout => {
     .map(line => line.trim())
     .map(line => {
       const match = line.match(
-        /(.*)\s+([a-zA-Z0-9]{2}:[a-zA-Z0-9]{2}:[a-zA-Z0-9]{2}:[a-zA-Z0-9]{2}:[a-zA-Z0-9]{2}:[a-zA-Z0-9]{2})\s+(-[0-9]+)\s+([0-9]+).*\s+([A-Z]+)\s+([a-zA-Z-]+)\s+([A-Z0-9(,)\s/]+)/
+        /(.*)\s+([a-zA-Z0-9]{2}:[a-zA-Z0-9]{2}:[a-zA-Z0-9]{2}:[a-zA-Z0-9]{2}:[a-zA-Z0-9]{2}:[a-zA-Z0-9]{2}|)\s+(-[0-9]+)\s+([0-9]+).*\s+([A-Z]+)\s+([a-zA-Z-]+)\s+([A-Z0-9(,)\s/]+)/
       );
 
       if (match) {
@@ -54,7 +54,7 @@ const parse = stdout => {
         return {
           mac: bssid, // for retrocompatibility
           bssid,
-          ssid,
+          ssid: ssid.trim(),
           channel,
           frequency: frequencyFromChannel(channel),
           signal_level: rssi,