convert session keys from binary to hex strings (#408)

helium · Mar 14, 2023 · 79964fe · 79964fe
1 parent 46ce965
commit 79964fe
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/iot_config/migrations/6_session_key_filters.sql b/iot_config/migrations/6_session_key_filters.sql
@@ -1,7 +1,7 @@
 create table session_key_filters (
     oui bigint not null references organizations(oui) on delete cascade,
     devaddr int not null,
-    session_key bytea not null,
+    session_key text not null,
 
     inserted_at timestamptz not null default now(),
     updated_at timestamptz not null default now(),

diff --git a/iot_config/src/session_key.rs b/iot_config/src/session_key.rs
@@ -10,15 +10,15 @@ use tokio::sync::broadcast::Sender;
 pub struct SessionKeyFilter {
     pub oui: u64,
     pub devaddr: DevAddrField,
-    pub session_key: Vec<u8>,
+    pub session_key: String,
 }
 
 impl FromRow<'_, PgRow> for SessionKeyFilter {
     fn from_row(row: &PgRow) -> sqlx::Result<Self> {
         Ok(Self {
             oui: row.get::<i64, &str>("oui") as u64,
             devaddr: row.get::<i32, &str>("devaddr").into(),
-            session_key: row.get::<Vec<u8>, &str>("session_key"),
+            session_key: row.get::<String, &str>("session_key"),
         })
     }
 }

diff --git a/iot_config/src/session_key_service.rs b/iot_config/src/session_key_service.rs
@@ -126,8 +126,7 @@ impl iot_config::SessionKeyFilter for SessionKeyFilterService {
                 let message = match filter {
                     Ok(filter) => Ok(filter.into()),
                     Err(bad_filter) => Err(Status::internal(format!(
-                        "invalid session key filter {:?}",
-                        bad_filter
+                        "invalid session key filter {bad_filter:?}"
                     ))),
                 };
                 if tx.send(message).await.is_err() {
@@ -156,8 +155,7 @@ impl iot_config::SessionKeyFilter for SessionKeyFilterService {
                 let message = match filter {
                     Ok(filter) => Ok(filter.into()),
                     Err(bad_filter) => Err(Status::internal(format!(
-                        "invalid session key filter {:?}",
-                        bad_filter
+                        "invalid session key filter {bad_filter:?}"
                     ))),
                 };
                 if tx.send(message).await.is_err() {