feat: replace wpactl with nmcli

BREAKING CHANGE: This will require Raspbian Bookworm or newer.

Author: DASPRiD

Cargo.lock

@@ -8,32 +8,31 @@ readme = "README.md"
 license-file = "LICENSE"
 
 [dependencies]
-env_logger = "0.9.0"
+env_logger = "0.10.0"
 anyhow = "1.0.57"
 log = "0.4.16"
 clap = { version = "4.1.4", features = ["derive"] }
 tokio = { version = "1.17.0", features = ["full"] }
-tokio-graceful-shutdown = "0.7.0"
+tokio-graceful-shutdown = "0.13.0"
 async-trait = "0.1.53"
-rppal = "0.13.1"
+rppal = "0.14.1"
 untildify = "0.1.0"
-toml = "0.5.9"
+toml = "0.8.2"
 serde = { version = "1.0.136", features = ["derive"] }
 rand = "0.8.5"
-mfrc522 = "0.4.0"
+mfrc522 = "0.6.0"
 serde_json = "1.0.85"
-wpactrl = "0.5.1"
-tokio-rustls = "0.23.4"
-rustls = { version = "0.20.8", features = ["dangerous_configuration"] }
-webpki-roots = "0.22.5"
+tokio-rustls = "0.24.1"
+rustls = { version = "0.21.7", features = ["dangerous_configuration"] }
+webpki-roots = "0.25.2"
 tokio-io-timeout = "1.2.0"
 thiserror = "1.0.37"
 futures-util = "0.3.24"
 glob = "0.3.0"
 hex = "0.4.3"
 linux-embedded-hal = "0.3.2"
 embedded-hal = "0.2.7"
-rodio = { version = "0.16.0", features = ["symphonia-mp3"] }
+rodio = { version = "0.17.1", features = ["symphonia-mp3"] }
 aw2013 = "1.0.0"
 rand_distr = "0.4.3"
 regex = "1.7.1"
@@ -44,7 +43,7 @@ local-ip-address = "0.5.6"
 strip = "debuginfo"
 
 [package.metadata.deb]
-depends = "adduser, bloop-box-data, systemd"
+depends = "adduser, bloop-box-data, systemd, network-manager"
 conf-files = ["/etc/bloop-box.conf"]
 maintainer-scripts = "debian/"
 systemd-units = { enable = true }
@@ -57,6 +56,6 @@ assets = [
     ["target/arm-unknown-linux-gnueabihf/release/bloop-box", "usr/bin/", "755"],
     ["README.md", "usr/share/doc/bloop-box/", "644"],
     ["etc/bloop-box.conf", "etc/", "644"],
-    ["etc/011_bloop-box-shutdown", "etc/sudoers.d/", "440"],
+    ["etc/011_bloop-box", "etc/sudoers.d/", "440"],
     ["etc/99-systemd-spidev.rules", "lib/udev/rules.d/", "644"]
 ]

Cargo.toml

@@ -1 +1,2 @@
 bloop-box ALL=(ALL) NOPASSWD:/usr/sbin/shutdown
+bloop-box ALL=(ALL) NOPASSWD:/usr/bin/nmcli

etc/011_bloop-box-shutdown renamed to etc/011_bloop-box

@@ -127,6 +127,8 @@ fn main() -> Result<()> {
             )
             .catch_signals()
             .handle_shutdown_requests(Duration::from_millis(1000))
-            .await
+            .await?;
+
+        Ok(())
     })
 }

src/main.rs

@@ -1,23 +1,17 @@
 use anyhow::{anyhow, Result};
-use embedded_hal as hal;
-use hal::blocking::spi;
-use hal::digital::v2::OutputPin;
-use mfrc522::Mfrc522;
+use mfrc522::comm::Interface;
+use mfrc522::{Initialized, Mfrc522};
 
 use crate::nfc::ndef::{parse_ndef_text_record, NdefMessageParser};
 
 pub type Uid = [u8; 7];
 
-pub struct NfcReader<SPI, NSS> {
-    mfrc522: Mfrc522<SPI, NSS>,
+pub struct NfcReader<COMM: Interface> {
+    mfrc522: Mfrc522<COMM, Initialized>,
 }
 
-impl<E, SPI, NSS> NfcReader<SPI, NSS>
-where
-    SPI: spi::Transfer<u8, Error = E> + spi::Write<u8, Error = E>,
-    NSS: OutputPin,
-{
-    pub fn new(mfrc522: Mfrc522<SPI, NSS>) -> Self {
+impl<E, COMM: Interface<Error = E>> NfcReader<COMM> {
+    pub fn new(mfrc522: Mfrc522<COMM, Initialized>) -> Self {
         Self { mfrc522 }
     }
 

src/nfc/reader.rs

@@ -8,6 +8,7 @@ use rppal::gpio::Gpio;
 use std::thread;
 use std::thread::sleep;
 use std::time::Duration;
+use mfrc522::comm::eh02::spi::SpiInterface;
 use tokio::sync::mpsc;
 use tokio::sync::oneshot;
 use tokio::sync::oneshot::error::TryRecvError;
@@ -47,7 +48,8 @@ pub fn start_nfc_listener(mut nfc_rx: mpsc::Receiver<NfcCommand>, config: NfcCon
         reset_pin.set_high();
         sleep(Duration::from_micros(50));
 
-        let mfrc522 = Mfrc522::new(spi).unwrap();
+        let interface = SpiInterface::new(spi);
+        let mfrc522 = Mfrc522::new(interface).init().unwrap();
         let mut nfc_reader = NfcReader::new(mfrc522);
 
         'command: while let Some(command) = nfc_rx.blocking_recv() {

src/nfc/thread.rs

@@ -18,7 +18,7 @@ use crate::subsystems::audio_player::PlayerCommand;
 use crate::subsystems::config_manager::{ConfigCommand, ConnectionConfig};
 use crate::subsystems::led::{LedState, BLUE, CYAN, GREEN, MAGENTA, RED, YELLOW};
 use crate::subsystems::networker::{CheckUidResponse, NetworkerCommand, NetworkerStatus};
-use crate::wifi::wpa_supplicant::set_wifi;
+use crate::wifi::nw::set_wifi;
 
 pub struct Controller {
     etc_config: EtcConfig,
@@ -85,10 +85,17 @@ impl Controller {
                     if config_uids.contains(&uid) {
                         self.led.send(LedState::On { color: YELLOW }).await?;
 
-                        if self.process_config_command(uid, &mut config_uids, nfc.clone()).await.is_ok() {
-                            self.led.send(LedState::On { color: CYAN }).await?;
-                        } else {
-                            self.led.send(LedState::On { color: RED }).await?;
+                        match self.process_config_command(uid, &mut config_uids, nfc.clone()).await {
+                            Ok(shutdown) => {
+                                if shutdown {
+                                    return Ok(());
+                                }
+
+                                self.led.send(LedState::On { color: CYAN }).await?;
+                            },
+                            Err(_) => {
+                                self.led.send(LedState::On { color: RED }).await?;
+                            },
                         }
 
                         sleep(Duration::from_millis(500)).await;
@@ -199,7 +206,7 @@ impl Controller {
         uid: Uid,
         config_uids: &mut Vec<Uid>,
         nfc: mpsc::Sender<NfcCommand>,
-    ) -> Result<()> {
+    ) -> Result<bool> {
         let (value_tx, value_rx) = oneshot::channel();
         nfc.send(NfcCommand::Read {
             responder: value_tx,
@@ -269,13 +276,15 @@ impl Controller {
                     .args(["shutdown", "now"])
                     .output()
                     .expect("Failed to shut down system");
+
+                return Ok(true);
             }
             _ => {
                 return Err(anyhow!("Value too short"));
             }
         }
 
-        Ok(())
+        Ok(false)
     }
 
     async fn wait_for_release(&self, nfc: &mpsc::Sender<NfcCommand>) -> Result<()> {

src/subsystems/controller.rs

@@ -219,7 +219,7 @@ impl Networker {
         }
 
         let mut root_cert_store = rustls::RootCertStore::empty();
-        root_cert_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(
+        root_cert_store.add_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.iter().map(
             |ta| {
                 OwnedTrustAnchor::from_subject_spki_name_constraints(
                     ta.subject,

src/subsystems/networker.rs

@@ -1 +1 @@
-pub mod wpa_supplicant;
+pub mod nw;

src/wifi/mod.rs

@@ -0,0 +1,20 @@
+use std::process::Command;
+use anyhow::Result;
+
+pub fn set_wifi(ssid: String, password: String) -> Result<()> {
+    Command::new("sudo")
+        .args([
+            &"nwcli",
+            &"wifi",
+            &"connect",
+            ssid.as_str(),
+            &"password",
+            password.as_str(),
+            &"ifname",
+            &"wlan0",
+        ])
+        .output()
+        .expect("Failed to set WiFi credentials");
+
+    Ok(())
+}