From e44b081d493afa0714b99817df46751e3f3412df Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Wed, 18 Sep 2024 17:04:51 +0200
Subject: [PATCH] feat(ci-wlan): use wpa_supplicant

---
 default.nix                     |  1 +
 overlay.nix                     |  6 +++++-
 tests/wlan/configuration.nix    | 19 ++++++++++++++++++-
 tests/wlan/test.nix             |  1 +
 tests/wlan/wait-for-wlan.expect |  4 ++--
 tests/wlan/wpa_service.nix      | 21 +++++++++++++++++++++
 tests/wlan/wpa_supplicant.nix   | 15 +++++++++++++++
 7 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 tests/wlan/wpa_service.nix
 create mode 100644 tests/wlan/wpa_supplicant.nix

diff --git a/default.nix b/default.nix
index 33593dc..fd1c357 100644
--- a/default.nix
+++ b/default.nix
@@ -27,6 +27,7 @@ let
     modules = [
       {
         nixpkgs = {
+          source = nixpkgs;
           overlays = [ overlay ];
           config.permittedInsecurePackages = [
             "python-2.7.18.8"
diff --git a/overlay.nix b/overlay.nix
index dda4ddc..891e9a0 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -194,7 +194,11 @@ extraPkgs // {
     });
   in h.override { openssl = null; sqlite = null; };
 
-
+  wpa_supplicant = prev.wpa_supplicant.override {
+    dbusSupport = false;
+    withPcsclite = false;
+    wpa_supplicant_gui = null;
+  };
 
   kexec-tools-static = prev.kexec-tools.overrideAttrs(o: {
     # For kexecboot we copy kexec into a ramdisk on the system being
diff --git a/tests/wlan/configuration.nix b/tests/wlan/configuration.nix
index 6dc4b44..ed1d948 100644
--- a/tests/wlan/configuration.nix
+++ b/tests/wlan/configuration.nix
@@ -7,6 +7,7 @@ in rec {
     ../../modules/wlan.nix
     ../../modules/hostapd
     ../../modules/network
+    ./wpa_supplicant.nix
   ];
 
   services.hostap = config.system.service.hostapd.build {
@@ -27,5 +28,21 @@ in rec {
     };
   };
 
-  defaultProfile.packages = with pkgs;  [ tcpdump ] ;
+  services.wpa_supplicant = config.system.service.wpa_supplicant.build {
+    interface = "wlan1";
+    driver = "nl80211";
+    config-file = pkgs.writeText "wpa_supplicant.conf" ''
+      country=us
+      update_config=1
+      ctrl_interface=/run/wpa_supplicant
+
+      network={
+       scan_ssid=1
+       ssid="liminix"
+       psk="colourless green ideas"
+      }
+    '';
+  };
+
+  defaultProfile.packages = with pkgs; [ tcpdump wpa_supplicant ];
 }
diff --git a/tests/wlan/test.nix b/tests/wlan/test.nix
index f644fb9..f1f20c2 100644
--- a/tests/wlan/test.nix
+++ b/tests/wlan/test.nix
@@ -3,6 +3,7 @@
 , nixpkgs
 }:
 let img = (import liminix {
+      inherit nixpkgs;
       device = import "${liminix}/devices/qemu/";
       liminix-config = ./configuration.nix;
     }).outputs.default;
diff --git a/tests/wlan/wait-for-wlan.expect b/tests/wlan/wait-for-wlan.expect
index 1d42a4e..5e0f073 100644
--- a/tests/wlan/wait-for-wlan.expect
+++ b/tests/wlan/wait-for-wlan.expect
@@ -14,10 +14,10 @@ expect {
 }
 expect "#"
 while { $FINISHED < 10 } {
-  send "date && grep AP-ENABLED /run/uncaught-logs/* || echo \$NOT\r\n"
+  send "date && grep CTRL-EVENT-CONNECTED /run/uncaught-logs/* || echo \$NOT\r\n"
   
   expect {
-    "wlan0: AP-ENABLED" { set FINISHED 999; set EXIT 0; }
+    "wlan1: CTRL-EVENT-CONNECTED" { set FINISHED 999; set EXIT 0; }
     "not_present" { send_user "waiting ...\n" ; sleep 5 }
   }
   set FINISHED [ expr $FINISHED + 1 ]
diff --git a/tests/wlan/wpa_service.nix b/tests/wlan/wpa_service.nix
new file mode 100644
index 0000000..ae70db3
--- /dev/null
+++ b/tests/wlan/wpa_service.nix
@@ -0,0 +1,21 @@
+{
+  liminix,
+  wpa_supplicant,
+  lib,
+}:
+{
+  interface,
+  driver,
+  config-file,
+}:
+let
+  inherit (liminix.services) longrun;
+  inherit (lib.strings) escapeShellArg;
+in
+longrun {
+  name = "wpa_supplicant";
+  run =
+  ''
+    ${wpa_supplicant}/bin/wpa_supplicant -D${driver} -i${interface} -c ${config-file}
+  '';
+}
diff --git a/tests/wlan/wpa_supplicant.nix b/tests/wlan/wpa_supplicant.nix
new file mode 100644
index 0000000..98f7f08
--- /dev/null
+++ b/tests/wlan/wpa_supplicant.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+with lib; {
+  options.system.service.wpa_supplicant = mkOption { type = pkgs.liminix.lib.types.serviceDefn; };
+  config.system.service.wpa_supplicant = config.system.callService ./wpa_service.nix {
+    interface = mkOption {
+      type = types.str;
+    };
+    driver = mkOption {
+      type = types.str;
+    };
+    config-file = mkOption {
+      type = types.package;
+    };
+  };
+}