address code review comments

holochain · Apr 24, 2024 · fade996 · fade996
1 parent f1bad2f
commit fade996
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/rust/sbd-client/src/lib.rs b/rust/sbd-client/src/lib.rs
@@ -49,10 +49,17 @@ mod default_crypto {
 
     impl Default for DefaultCrypto {
         fn default() -> Self {
-            let k =
-                ed25519_dalek::SigningKey::generate(&mut rand::thread_rng());
-            let pk = k.verifying_key().to_bytes();
-            Self(pk, k)
+            loop {
+                let k = ed25519_dalek::SigningKey::generate(
+                    &mut rand::thread_rng(),
+                );
+                let pk = k.verifying_key().to_bytes();
+                if &pk[..28] == CMD_PREFIX {
+                    continue;
+                } else {
+                    return Self(pk, k);
+                }
+            }
         }
     }
 

diff --git a/rust/sbd-server/src/cmd.rs b/rust/sbd-server/src/cmd.rs
@@ -25,7 +25,7 @@ pub enum SbdCmd<'c> {
     Unknown,
 }
 
-const CMD_PREFIX: &[u8; 28] = &[0; 28];
+pub(crate) const CMD_PREFIX: &[u8; 28] = &[0; 28];
 
 impl<'c> SbdCmd<'c> {
     pub fn parse(payload: Payload<'c>) -> Result<Self> {

diff --git a/rust/sbd-server/src/lib.rs b/rust/sbd-server/src/lib.rs
@@ -165,6 +165,11 @@ async fn check_accept_connection(
                 Err(_) => return,
             };
 
+        // illegal pub key
+        if &pub_key.0[..28] == cmd::CMD_PREFIX {
+            return;
+        }
+
         let ws = Arc::new(ws);
 
         if let Some(ip) = ip {