Merge pull request #2059 from Jixabon/fix/api-fixes

API Fixes

Author: billz

api/modules/ap.py

@@ -32,10 +32,10 @@ def ieee80211n():
     return subprocess.run("cat /etc/hostapd/hostapd.conf | grep ieee80211n= | cut -d'=' -f2", shell=True, capture_output=True, text=True).stdout.strip()
 
 def wpa_passphrase():
-    return subprocess.run("sed -En 's/wpa_passphrase=(.*)/\1/p' /etc/hostapd/hostapd.conf", shell=True, capture_output=True, text=True).stdout.strip()
+    return subprocess.run("sed -En 's/wpa_passphrase=(.*)/\\1/p' /etc/hostapd/hostapd.conf", shell=True, capture_output=True, text=True).stdout.strip()
 
 def interface():
-    return subprocess.run("cat /etc/hostapd/hostapd.conf | grep interface= | cut -d'=' -f2 | head -1", shell=True, capture_output=True, text=True).stdout.strip()
+    return subprocess.run("cat /etc/hostapd/hostapd.conf | grep '^interface=' | cut -d'=' -f2", shell=True, capture_output=True, text=True).stdout.strip()
 
 def wpa():
     return subprocess.run("cat /etc/hostapd/hostapd.conf | grep wpa= | cut -d'=' -f2", shell=True, capture_output=True, text=True).stdout.strip()
@@ -61,4 +61,4 @@ def logging():
                 logs[interface] = []
             logs[interface].append(message)
 
-    return json.dumps(logs, indent=2)
+    return json.dumps(logs, indent=2)

api/modules/client.py

@@ -3,7 +3,7 @@
 
 def get_active_clients_amount(interface):
     arp_output = subprocess.run(['arp', '-i', interface], capture_output=True, text=True)
-    mac_addresses = arp_output.stdout.splitlines()
+    mac_addresses = mac_addresses = set(line.split()[2] for line in arp_output.stdout.splitlines()[1:])
 
     if mac_addresses:
         grep_pattern = '|'.join(mac_addresses)