Browse Source

INVALID_ID_FORMAT

opentrade 4 years ago
parent
commit
710f0b2681
3 changed files with 5 additions and 2 deletions
  1. 1 0
      Cargo.lock
  2. 1 1
      libs/hbb_common
  3. 3 1
      src/rendezvous_server.rs

+ 1 - 0
Cargo.lock

@@ -514,6 +514,7 @@ dependencies = [
514 514
  "protobuf-codegen-pure",
515 515
  "quinn",
516 516
  "rand",
517
+ "regex",
517 518
  "serde",
518 519
  "serde_derive",
519 520
  "serde_json",

+ 1 - 1
libs/hbb_common

@@ -1 +1 @@
1
-Subproject commit 7bf9906c1fabc2e4437871715db4ef7883fca3d4
1
+Subproject commit 4d5b935f16abe33e106b13f30877edb2960f53e9

+ 3 - 1
src/rendezvous_server.rs

@@ -392,7 +392,9 @@ impl RendezvousServer {
392 392
                     }
393 393
                     let id = rk.id;
394 394
                     let mut res = register_pk_response::Result::OK;
395
-                    if let Some(peer) = self.pm.get(&id).await {
395
+                    if !hbb_common::is_valid_custom_id(&id) {
396
+                        res = register_pk_response::Result::INVALID_ID_FORMAT;
397
+                    } else if let Some(peer) = self.pm.get(&id).await {
396 398
                         if peer.uuid != rk.uuid {
397 399
                             log::warn!(
398 400
                                 "Peer {} uuid mismatch: {:?} vs {:?}",