Mdk/enhance wlan support

debian/changelog

@@ -5,6 +5,19 @@ wlanpi-core (2.0.0~dev20250214.2) unstable; urgency=high
 
  -- Josh Schmelzle <[email protected]>  Fri, 14 Jan 2025 00:00:00 -0400
 
+wlanpi-core (2.0.0~dev20250214.1) UNRELEASED; urgency=medium
+
+  [ Michael Ketchel ]
+  * Draft build of new wlan control features
+  * Fixed an api definition typo
+  * More tweaks, and a version bump to fire dev package deploy
+  * Increased resistance to injection attacks
+  * Version bump for build
+  * Add automatic default gateway configuration for wlan api
+  * Fix some auto gateway config quirks
+
+ -- Michael Ketchel <[email protected]>  Wed, 13 Nov 2024 21:22:34 +0000
+
 wlanpi-core (1.0.5-1) unstable; urgency=high
 
   * API hardening by blocking iptables rule added by pi-gen

debian/rules

@@ -23,7 +23,6 @@ SDIST_DIR=debian/$(PACKAGE)-$(VERSION)
 
 # ensure that the systemd services are handled by systemd.
 override_dh_installsystemd:
-	dh_installsystemd --name=wpa_supplicant@wlan0 [email protected]
 	dh_installsystemd wlanpi-core.service
 	dh_installsystemd wlanpi-core.socket
 	dh_installsystemd var-log-wlanpi_core-debug.mount

debian/wlanpi-core.install

@@ -8,6 +8,5 @@
 /install/etc/wlanpi-core/ufw/wlanpi-core.rules /etc/wlanpi-core/ufw
 /install/lib/systemd/system/wlanpi-core-ufw-first-boot.service /lib/systemd/system
 /install/etc/wlanpi-core/ufw/current-rules-version /etc/wlanpi-core/ufw
-/install/etc/wpa_supplicant/wpa_supplicant-wlan0.conf /etc/wpa_supplicant
 /install/usr/bin/getjwt /usr/bin
 /install/usr/bin/lhapitest /usr/bin

debian/wpa_supplicant@wlan0.service

@@ -1,20 +0,0 @@
-# DBUS managed wpa_supplicant service on wlan0
-
-[Unit]
-Description=WPA supplicant daemon (interface-specific version)
-Requires=sys-subsystem-net-devices-%i.device
-After=sys-subsystem-net-devices-%i.device
-Before=network.target
-Wants=network.target
-
-# NetworkManager users will probably want the dbus version instead.
-
-[Service]
-Type=simple
-#ExecStart=/sbin/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-%I.conf -i%I
-ExecStart=/sbin/wpa_supplicant -u -s -O /run/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-%I.conf -i%I
-ExecReload=/bin/kill -HUP \$MAINPID
-
-[Install]
-WantedBy=multi-user.target
-Alias=dbus-fi.w1.wpa_supplicant1.service

setup.py

@@ -18,14 +18,14 @@
 
 
 def parse_requires(_list):
-    requires = list()
+    require_list = list()
     trims = ["#", "piwheels.org"]
     for require in _list:
         if any(match in require for match in trims):
             continue
-        requires.append(require)
-    requires = list(filter(None, requires))  # remove "" from list
-    return requires
+        require_list.append(require)
+    require_list = list(filter(None, require_list))  # remove "" from list
+    return require_list
 
 
 # important to collect various modules in the package directory

wlanpi_core/__main__.py

@@ -18,6 +18,7 @@
 import os
 import platform
 import sys
+from typing import Union
 
 # third party imports
 import uvicorn
@@ -26,7 +27,7 @@
 from .__version__ import __version__
 
 
-def port(port) -> int:
+def check_port(port: Union[int, str]) -> int:
     """Check if the provided port is valid"""
     try:
         # make sure port is an int
@@ -60,7 +61,7 @@ def setup_parser() -> argparse.ArgumentParser:
         "--port",
         "-p",
         dest="port",
-        type=port,
+        type=check_port,
         default=8000,
         help="Port number to run the server on",
     )
@@ -73,7 +74,11 @@ def setup_parser() -> argparse.ArgumentParser:
         help="Enable debug mode with verbose logging",
     )
     parser.add_argument(
-        "--version", "-V", "-v", action="version", version=f"{__version__}"
+        "--version",
+        "-V",
+        "-v",
+        action="version",
+        version=f"{__version__}"
     )
     return parser