GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6062 from nymtech/benny/gw-fixes

Browse Source 
Bugfix | Fix the registration handshake
This commit is contained in:
benedetta davico
2025-09-24 15:28:15 +02:00
committed by GitHub
parent 44ac5e1ced 7bcd3fe754
commit b9fb2c4e0a
9 changed files with 53 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci-build-upload-binaries.yml
+1 -1
View File
@@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [ arc-ubuntu-22.04 ]
platform: [ arc-linux-latest ]
runs-on: ${{ matrix.platform }}
env:
Cargo.lock
Generated
+6 -6
View File
@@ -4883,7 +4883,7 @@ dependencies = [
[[package]]
name = "nym-api"
version = "1.1.65"
version = "1.1.66"
dependencies = [
"anyhow",
"async-trait",
@@ -5095,7 +5095,7 @@ dependencies = [
[[package]]
name = "nym-cli"
version = "1.1.62"
version = "1.1.63"
dependencies = [
"anyhow",
"base64 0.22.1",
@@ -5178,7 +5178,7 @@ dependencies = [
[[package]]
name = "nym-client"
version = "1.1.62"
version = "1.1.63"
dependencies = [
"bs58",
"clap",
@@ -6316,7 +6316,7 @@ dependencies = [
[[package]]
name = "nym-network-requester"
version = "1.1.63"
version = "1.1.64"
dependencies = [
"addr",
"anyhow",
@@ -6853,7 +6853,7 @@ dependencies = [
[[package]]
name = "nym-socks5-client"
version = "1.1.62"
version = "1.1.63"
dependencies = [
"bs58",
"clap",
@@ -7611,7 +7611,7 @@ dependencies = [
[[package]]
name = "nymvisor"
version = "0.1.27"
version = "0.1.28"
dependencies = [
"anyhow",
"bytes",
clients/native/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "nym-client"
version = "1.1.62"
version = "1.1.63"
authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
description = "Implementation of the Nym Client"
edition = "2021"
clients/socks5/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "nym-socks5-client"
version = "1.1.62"
version = "1.1.63"
authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
edition = "2021"
gateway/src/node/client_handling/websocket/connection_handler/fresh.rs
+40 -39
View File
@@ -922,47 +922,48 @@ impl<R, S> FreshHandler<R, S> {
S: AsyncRead + AsyncWrite + Unpin + Send,
R: CryptoRng + RngCore + Send,
{
let initial_request = match self.wait_for_initial_message().await {
Ok(req) => req,
Err(err) => {
self.send_and_forget_error_response(err).await;
return None;
loop {
let req = self.wait_for_initial_message().await;
let initial_request = match req {
Ok(req) => req,
Err(err) => {
self.send_and_forget_error_response(err).await;
return None;
}
};
// see if we managed to register the client through this request
let maybe_auth_res = match self.handle_initial_client_request(initial_request).await {
Ok(maybe_auth_res) => maybe_auth_res,
Err(err) => {
debug!("initial client request handling error: {err}");
self.send_and_forget_error_response(err).await;
return None;
}
};
if let Some(registration_details) = maybe_auth_res {
let (mix_sender, mix_receiver) = mpsc::unbounded();
// Channel for handlers to ask other handlers if they are still active.
let (is_active_request_sender, is_active_request_receiver) = mpsc::unbounded();
self.shared_state.active_clients_store.insert_remote(
registration_details.address,
mix_sender,
is_active_request_sender,
registration_details.session_request_timestamp,
);
return AuthenticatedHandler::upgrade(
self,
registration_details,
mix_receiver,
is_active_request_receiver,
)
.await
.inspect_err(|err| error!("failed to upgrade client handler: {err}"))
.ok();
}
};
// see if we managed to register the client through this request
let maybe_auth_res = match self.handle_initial_client_request(initial_request).await {
Ok(maybe_auth_res) => maybe_auth_res,
Err(err) => {
debug!("initial client request handling error: {err}");
self.send_and_forget_error_response(err).await;
return None;
}
};
if let Some(registration_details) = maybe_auth_res {
let (mix_sender, mix_receiver) = mpsc::unbounded();
// Channel for handlers to ask other handlers if they are still active.
let (is_active_request_sender, is_active_request_receiver) = mpsc::unbounded();
self.shared_state.active_clients_store.insert_remote(
registration_details.address,
mix_sender,
is_active_request_sender,
registration_details.session_request_timestamp,
);
AuthenticatedHandler::upgrade(
self,
registration_details,
mix_receiver,
is_active_request_receiver,
)
.await
.inspect_err(|err| error!("failed to upgrade client handler: {err}"))
.ok();
}
None
}
pub(crate) async fn wait_for_initial_message(
nym-api/Cargo.toml
+1 -1
View File
@@ -4,7 +4,7 @@
[package]
name = "nym-api"
license = "GPL-3.0"
version = "1.1.65"
version = "1.1.66"
authors.workspace = true
edition = "2021"
rust-version.workspace = true
service-providers/network-requester/Cargo.toml
+1 -1
View File
@@ -4,7 +4,7 @@
[package]
name = "nym-network-requester"
license = "GPL-3.0"
version = "1.1.63"
version = "1.1.64"
authors.workspace = true
edition.workspace = true
rust-version = "1.70"
tools/nym-cli/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "nym-cli"
version = "1.1.62"
version = "1.1.63"
authors.workspace = true
edition = "2021"
license.workspace = true
tools/nymvisor/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "nymvisor"
version = "0.1.27"
version = "0.1.28"
authors.workspace = true
repository.workspace = true
homepage.workspace = true