From 492a26efe99164ecc8e656cf7949860ee56c0bda Mon Sep 17 00:00:00 2001 From: Lautaro Mazzitelli Date: Thu, 3 Oct 2024 15:17:30 +0200 Subject: [PATCH 1/2] fix(node_manager): force lowercase discord username --- sn_node_manager/src/add_services/mod.rs | 9 +++++++-- sn_node_manager/src/add_services/tests.rs | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sn_node_manager/src/add_services/mod.rs b/sn_node_manager/src/add_services/mod.rs index bb9b75541a..fd268f692e 100644 --- a/sn_node_manager/src/add_services/mod.rs +++ b/sn_node_manager/src/add_services/mod.rs @@ -78,6 +78,11 @@ pub async fn add_node( check_port_availability(port_option, &node_registry.nodes)?; } + let owner = match &options.owner { + Some(owner) => Some(owner.to_lowercase()), + None => None, + }; + let safenode_file_name = options .safenode_src_path .file_name() @@ -221,7 +226,7 @@ pub async fn add_node( name: service_name.clone(), node_ip: options.node_ip, node_port, - owner: options.owner.clone(), + owner: owner.clone(), rpc_socket_addr, safenode_path: service_safenode_path.clone(), service_user: options.user.clone(), @@ -256,7 +261,7 @@ pub async fn add_node( number: node_number, reward_balance: None, rpc_socket_addr, - owner: options.owner.clone(), + owner: owner.clone(), peer_id: None, pid: None, safenode_path: service_safenode_path, diff --git a/sn_node_manager/src/add_services/tests.rs b/sn_node_manager/src/add_services/tests.rs index ed10be31cf..fe806da6e8 100644 --- a/sn_node_manager/src/add_services/tests.rs +++ b/sn_node_manager/src/add_services/tests.rs @@ -4066,7 +4066,7 @@ async fn add_node_should_add_the_node_with_upnp_enabled() -> Result<()> { } #[tokio::test] -async fn add_node_should_assign_an_owner() -> Result<()> { +async fn add_node_should_assign_an_owner_in_lowercase() -> Result<()> { let tmp_data_dir = assert_fs::TempDir::new()?; let node_reg_path = tmp_data_dir.child("node_reg.json"); @@ -4155,7 +4155,7 @@ async fn add_node_should_assign_an_owner() -> Result<()> { local: false, log_format: None, metrics_port: None, - owner: Some("discord_username".to_string()), + owner: Some("Discord_Username".to_string()), node_ip: None, node_port: None, rpc_address: None, From be48bc14ca2cb07765ffab3f425a62c6b0a78f98 Mon Sep 17 00:00:00 2001 From: Lautaro Mazzitelli Date: Thu, 3 Oct 2024 15:31:35 +0200 Subject: [PATCH 2/2] fix(node_manager): adding warn to log in case the user has uppercase --- sn_node_manager/src/add_services/mod.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sn_node_manager/src/add_services/mod.rs b/sn_node_manager/src/add_services/mod.rs index fd268f692e..9530f5c973 100644 --- a/sn_node_manager/src/add_services/mod.rs +++ b/sn_node_manager/src/add_services/mod.rs @@ -79,7 +79,12 @@ pub async fn add_node( } let owner = match &options.owner { - Some(owner) => Some(owner.to_lowercase()), + Some(owner) => { + if owner.chars().any(|c| c.is_uppercase()) { + warn!("Owner name ({owner}) contains uppercase characters and will be converted to lowercase"); + } + Some(owner.to_lowercase()) + } None => None, };