feat: fix name with special char

ADORSYS-GIS · Dec 3, 2024 · 25b3e72 · 25b3e72
1 parent 101a5f8
commit 25b3e72
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 17 deletions.
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.8
+version: 0.2.9
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/scripts/install.sh b/scripts/install.sh
@@ -10,7 +10,7 @@ fi
 # Default log level and application details
 LOG_LEVEL=${LOG_LEVEL:-INFO}
 APP_NAME=${APP_NAME:-"wazuh-cert-oauth2-client"}
-WOPS_VERSION=${WOPS_VERSION:-"0.2.8"}
+WOPS_VERSION=${WOPS_VERSION:-"0.2.9"}
 USER="root"
 GROUP="wazuh"
 

diff --git a/wazuh-cert-oauth2-client/Cargo.lock b/wazuh-cert-oauth2-client/Cargo.lock
diff --git a/wazuh-cert-oauth2-client/Cargo.toml b/wazuh-cert-oauth2-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wazuh-cert-oauth2-client"
-version = "0.2.8"
+version = "0.2.9"
 edition = "2021"
 
 [dependencies]
@@ -16,4 +16,5 @@ wazuh-cert-oauth2-model = { path = "../wazuh-cert-oauth2-model" }
 openssl = { version = "0.10.66", features = ["vendored"] }
 mid = "3.0.0"
 local-ip-address = "0.6.3"
-rand = "0.8.5"
+rand = "0.8.5"
+diacritics = "0.2.2"
diff --git a/wazuh-cert-oauth2-client/src/services/set_name.rs b/wazuh-cert-oauth2-client/src/services/set_name.rs
@@ -5,7 +5,8 @@ use tokio::process::Command;
 
 /// Set the name of the agent.
 pub async fn set_name(name: &str) -> Result<()> {
-    let long_machine_id = if let Ok(machine_id) = mid::get(name) {
+    let name = diacritics::remove_diacritics(name);
+    let long_machine_id = if let Ok(machine_id) = mid::get(&name) {
         info!("Machine ID: {}", machine_id);
         machine_id
     } else {
@@ -24,8 +25,8 @@ pub async fn set_name(name: &str) -> Result<()> {
     };
 
     info!("Small machine ID: {}", small_machine_id);
-    let agent_name = format!("{}-{}", name, small_machine_id)
-        .replace(|c: char| !c.is_alphanumeric(), "-");
+    let agent_name = format!("{}-{}", &name, small_machine_id)
+        .replace(|c: char| !c.is_ascii_alphanumeric(), "-");
 
     let ossec_conf = default_path_to_ossec_conf();
     info!("Updating agent name to {} in {}", agent_name, ossec_conf);

diff --git a/wazuh-cert-oauth2-model/Cargo.lock b/wazuh-cert-oauth2-model/Cargo.lock
diff --git a/wazuh-cert-oauth2-model/Cargo.toml b/wazuh-cert-oauth2-model/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wazuh-cert-oauth2-model"
-version = "0.2.8"
+version = "0.2.9"
 edition = "2021"
 
 [dependencies]

diff --git a/wazuh-cert-oauth2/Cargo.lock b/wazuh-cert-oauth2/Cargo.lock
diff --git a/wazuh-cert-oauth2/Cargo.toml b/wazuh-cert-oauth2/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wazuh-cert-oauth2"
-version = "0.2.8"
+version = "0.2.9"
 edition = "2021"
 
 [dependencies]