feat: packet signing

Author: filipton

src/battery.rs

@@ -82,6 +82,7 @@ pub async fn battery_read_task(
                     level: Some(bat_percentage as f64),
                     voltage: Some(bat_calc_mv / 1000.0),
                 },
+                sign_key: Some(unsafe { crate::state::SIGN_KEY }),
             })
             .await;
         }

src/buttons.rs

@@ -146,6 +146,7 @@ async fn submit_up(
                 firmware: alloc::string::ToString::to_string(crate::version::FIRMWARE),
                 sign_key: unsafe { crate::state::SIGN_KEY },
             },
+            sign_key: None,
         })
         .await;
 

src/main.rs

@@ -118,17 +118,11 @@ async fn main(spawner: Spawner) {
     // TODO: add error handling here
     let mut sign_key = [0; 4];
     if nvs.get_key(b"SIGN_KEY", &mut sign_key).await.is_ok() {
-        unsafe {
-            crate::state::SIGN_KEY =
-                u32::from_be_bytes(sign_key.try_into().expect("Cannot fail")) >> 1;
-        }
+        unsafe { crate::state::SIGN_KEY = u32::from_be_bytes(sign_key) >> 1 };
     } else {
         _ = getrandom::getrandom(&mut sign_key);
         _ = nvs.append_key(b"SIGN_KEY", &sign_key).await;
-        unsafe {
-            crate::state::SIGN_KEY =
-                u32::from_be_bytes(sign_key.try_into().expect("Cannot fail")) >> 1;
-        }
+        unsafe { crate::state::SIGN_KEY = u32::from_be_bytes(sign_key) >> 1 };
     }
 
     spawner.must_spawn(lcd::lcd_task(
@@ -351,6 +345,7 @@ async fn logger_task(global_state: GlobalState) {
             ws::send_packet(structs::TimerPacket {
                 tag: None,
                 data: structs::TimerPacketInner::Logs { logs: tmp_logs },
+                sign_key: None,
             })
             .await;
         }

src/structs.rs

@@ -24,6 +24,9 @@ pub struct TimerPacket {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub tag: Option<u64>,
     pub data: TimerPacketInner,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sign_key: Option<u32>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]

src/ws.rs

@@ -205,6 +205,7 @@ async fn ws_loop(
                         firmware: alloc::string::ToString::to_string(crate::version::FIRMWARE),
                         sign_key: unsafe { crate::state::SIGN_KEY },
                     },
+                    sign_key: None,
                 })
                 .await;
             }
@@ -463,6 +464,7 @@ pub async fn send_test_ack(global_state: &GlobalState) {
     send_packet(TimerPacket {
         tag: None,
         data: TimerPacketInner::TestAck(global_state.state.value().await.snapshot_data()),
+        sign_key: Some(unsafe { crate::state::SIGN_KEY }),
     })
     .await;
 }
@@ -505,6 +507,7 @@ where
     let packet = TimerPacket {
         tag: Some(tag),
         data: packet,
+        sign_key: Some(unsafe { crate::state::SIGN_KEY }),
     };
     send_packet(packet).await;