mirror of
https://github.com/rustdesk/rustdesk-server.git
synced 2026-02-16 18:40:50 +00:00
some guys use empty id
This commit is contained in:
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -546,7 +546,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "hbbs"
|
||||
version = "1.1.3"
|
||||
version = "1.1.4"
|
||||
dependencies = [
|
||||
"base64 0.13.0",
|
||||
"clap",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "hbbs"
|
||||
version = "1.1.3"
|
||||
version = "1.1.4"
|
||||
authors = ["open-trade <info@opentradesolutions.com>"]
|
||||
edition = "2018"
|
||||
build= "build.rs"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
use hbb_common::{bail, log, ResultType};
|
||||
use rand::Rng;
|
||||
use serde_derive::{Deserialize, Serialize};
|
||||
use std::io::prelude::*;
|
||||
use std::path::Path;
|
||||
use rand::Rng;
|
||||
|
||||
#[derive(Debug, PartialEq, Default, Serialize, Deserialize, Clone)]
|
||||
pub struct Machine {
|
||||
|
||||
@@ -400,7 +400,9 @@ impl RendezvousServer {
|
||||
}
|
||||
let id = rk.id;
|
||||
let mut res = register_pk_response::Result::OK;
|
||||
if let Some(peer) = self.pm.get(&id).await {
|
||||
if id.len() < 6 {
|
||||
res = register_pk_response::Result::UUID_MISMATCH;
|
||||
} else if let Some(peer) = self.pm.get(&id).await {
|
||||
if peer.uuid.is_empty() {
|
||||
self.pm.update_pk(id, addr, rk.uuid, rk.pk);
|
||||
} else if peer.uuid != rk.uuid {
|
||||
@@ -585,9 +587,13 @@ impl RendezvousServer {
|
||||
&addr
|
||||
);
|
||||
let mut msg_out = RendezvousMessage::new();
|
||||
let pk = match self.pm.get(&la.id).await {
|
||||
Some(peer) => peer.pk,
|
||||
_ => Vec::new(),
|
||||
let pk = if la.id.is_empty() {
|
||||
Vec::new()
|
||||
} else {
|
||||
match self.pm.get(&la.id).await {
|
||||
Some(peer) => peer.pk,
|
||||
_ => Vec::new(),
|
||||
}
|
||||
};
|
||||
let mut p = PunchHoleResponse {
|
||||
socket_addr: la.local_addr.clone(),
|
||||
|
||||
Reference in New Issue
Block a user