From 42b6a9153db118d7f80ed9a88afa01f752af73d7 Mon Sep 17 00:00:00 2001
From: Jean Christophe Roques <jcroques@centreon.com>
Date: Wed, 5 Feb 2025 08:32:33 +0100
Subject: [PATCH 1/2] fix installer .crt .key extension issue

---
 agent/installer/resources/encryption_dlg.nsddef | 4 ++--
 agent/installer/resources/encryption_dlg.nsdinc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/agent/installer/resources/encryption_dlg.nsddef b/agent/installer/resources/encryption_dlg.nsddef
index c4a55c45b4e..28bc9b04b33 100644
--- a/agent/installer/resources/encryption_dlg.nsddef
+++ b/agent/installer/resources/encryption_dlg.nsddef
@@ -16,9 +16,9 @@ Call on_encryptioncheckbox_click</CreateFunctionCustomScript>
     <TextBox Name="ca_name" Location="162, 103" Size="193, 20" TabIndex="4" />
     <Label Name="label_ca_name" Location="6, 106" Size="140, 17" Text="Certificate Common Name" TabIndex="5" />
     <FileRequest Name="ca_file" Location="162, 72" Size="193, 20" TabIndex="6" Filter="*.crt files|*.crt" />
-    <FileRequest Name="certificate_file" Location="162, 42" Size="193, 20" TabIndex="7" Filter="*.key files|*.key" />
+    <FileRequest Name="certificate_file" Location="162, 42" Size="193, 20" TabIndex="7" Filter="*.crt files|*.crt" />
     <Label Name="label_ca_file" Location="6, 76" Size="150, 16" Text="Trusted CA's certificate file:" TabIndex="8" />
-    <FileRequest Name="private_key_file" Location="162, 12" Size="193, 20" TabIndex="9" Filter="*.crt files|*.crt" />
+    <FileRequest Name="private_key_file" Location="162, 12" Size="193, 20" TabIndex="9" Filter="*.key files|*.key" />
     <Label Name="label_certificate_file" Location="6, 46" Size="100, 16" Text="Certificate file:" TabIndex="10" />
     <Label Name="label_private_key_file" Location="6, 16" Size="100, 16" Text="Private key file:" TabIndex="11" />
   </GroupBox>
diff --git a/agent/installer/resources/encryption_dlg.nsdinc b/agent/installer/resources/encryption_dlg.nsdinc
index 6a56fbe5191..aa09f388460 100644
--- a/agent/installer/resources/encryption_dlg.nsdinc
+++ b/agent/installer/resources/encryption_dlg.nsdinc
@@ -157,7 +157,7 @@ Function fnc_hCtl_encryption_certificate_file_Click
 	Pop $R0
 	${If} $R0 == $hCtl_encryption_certificate_file_Btn
 		${NSD_GetText} $hCtl_encryption_certificate_file_Txt $R0
-		nsDialogs::SelectFileDialog open "$R0" "*.key files|*.key"
+		nsDialogs::SelectFileDialog open "$R0" "*.crt files|*.crt"
 		Pop $R0
 		${If} "$R0" != ""
 			${NSD_SetText} $hCtl_encryption_certificate_file_Txt "$R0"
@@ -170,7 +170,7 @@ Function fnc_hCtl_encryption_private_key_file_Click
 	Pop $R0
 	${If} $R0 == $hCtl_encryption_private_key_file_Btn
 		${NSD_GetText} $hCtl_encryption_private_key_file_Txt $R0
-		nsDialogs::SelectFileDialog open "$R0" "*.crt files|*.crt"
+		nsDialogs::SelectFileDialog open "$R0" "*.key files|*.key"
 		Pop $R0
 		${If} "$R0" != ""
 			${NSD_SetText} $hCtl_encryption_private_key_file_Txt "$R0"

From 46452c72d54b8f1530c528e4340d8f6d62b9f3bb Mon Sep 17 00:00:00 2001
From: Jean Christophe Roques <jcroques@centreon.com>
Date: Wed, 5 Feb 2025 09:16:18 +0100
Subject: [PATCH 2/2] fix certificate => public_cert issue

---
 .github/scripts/agent_installer_test.ps1 |  16 ++++++++--------
 agent/bench/create_many_linux_agent.py   |   2 +-
 agent/conf/centagent.json.in             |   2 +-
 agent/conf/centagent.reg                 | Bin 1712 -> 1712 bytes
 agent/installer/dlg_helper.nsi           |   4 ++--
 agent/installer/silent.nsi               |   6 +++---
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/scripts/agent_installer_test.ps1 b/.github/scripts/agent_installer_test.ps1
index 62ece6b0762..da3662f8493 100644
--- a/.github/scripts/agent_installer_test.ps1
+++ b/.github/scripts/agent_installer_test.ps1
@@ -337,38 +337,38 @@ $expected = @{ 'endpoint' = '127.0.0.3:4317'; 'host' = 'my_host_name_2'; 'log_ty
 test_args_to_registry "agent/installer/centreon-monitoring-agent.exe" $exe_args $expected
 
 $exe_args = '/S', '--install_cma', '--hostname', "my_host_name_2", "--endpoint", "127.0.0.4:4317", "--log_type", "file", "--log_file", "C:\Users\Public\cma.log", "--log_level", "trace", "--encryption", "--private_key", "C:\Users crypto\private.key", "--public_cert", "D:\tutu\titi.crt", "--ca", "C:\Users\Public\ca.crt", "--ca_name", "tls_ca_name"
-$expected = @{ 'endpoint' = '127.0.0.4:4317'; 'host' = 'my_host_name_2'; 'log_type' = 'File'; 'log_level' = 'trace'; 'log_file' = 'C:\Users\Public\cma.log'; 'encryption' = 1; 'reversed_grpc_streaming' = 0; 'certificate' = 'D:\tutu\titi.crt'; 'private_key' = 'C:\Users crypto\private.key'; 'ca_certificate' = 'C:\Users\Public\ca.crt'; 'ca_name' = 'tls_ca_name' }
+$expected = @{ 'endpoint' = '127.0.0.4:4317'; 'host' = 'my_host_name_2'; 'log_type' = 'File'; 'log_level' = 'trace'; 'log_file' = 'C:\Users\Public\cma.log'; 'encryption' = 1; 'reversed_grpc_streaming' = 0; 'public_cert' = 'D:\tutu\titi.crt'; 'private_key' = 'C:\Users crypto\private.key'; 'ca_certificate' = 'C:\Users\Public\ca.crt'; 'ca_name' = 'tls_ca_name' }
 test_args_to_registry "agent/installer/centreon-monitoring-agent.exe" $exe_args $expected
 
 $exe_args = '/S', '--install_cma', '--hostname', "my_host_name_2", "--endpoint", "127.0.0.5:4317", "--log_type", "file", "--log_file", "C:\Users\Public\cma_rev.log", "--log_level", "trace", "--encryption", "--reverse", "--private_key", "C:\Users crypto\private_rev.key", "--public_cert", "D:\tutu\titi_rev.crt", "--ca", "C:\Users\Public\ca_rev.crt", "--ca_name", "tls_ca_name_rev"
-$expected = @{ 'endpoint' = '127.0.0.5:4317'; 'host' = 'my_host_name_2'; 'log_type' = 'File'; 'log_level' = 'trace'; 'log_file' = 'C:\Users\Public\cma_rev.log'; 'encryption' = 1; 'reversed_grpc_streaming' = 1; 'certificate' = 'D:\tutu\titi_rev.crt'; 'private_key' = 'C:\Users crypto\private_rev.key'; 'ca_certificate' = 'C:\Users\Public\ca_rev.crt'; 'ca_name' = 'tls_ca_name_rev' }
+$expected = @{ 'endpoint' = '127.0.0.5:4317'; 'host' = 'my_host_name_2'; 'log_type' = 'File'; 'log_level' = 'trace'; 'log_file' = 'C:\Users\Public\cma_rev.log'; 'encryption' = 1; 'reversed_grpc_streaming' = 1; 'public_cert' = 'D:\tutu\titi_rev.crt'; 'private_key' = 'C:\Users crypto\private_rev.key'; 'ca_certificate' = 'C:\Users\Public\ca_rev.crt'; 'ca_name' = 'tls_ca_name_rev' }
 test_args_to_registry "agent/installer/centreon-monitoring-agent.exe" $exe_args $expected
 
 
 Write-Host "############################  modifier test   ############################"
 
 $exe_args = '/S', '--hostname', "my_host_name_10", "--endpoint", "127.0.0.10:4317", "--no_reverse"
-$expected = @{ 'endpoint' = '127.0.0.10:4317'; 'host' = 'my_host_name_10'; 'log_type' = 'File'; 'log_level' = 'trace'; 'log_file' = 'C:\Users\Public\cma_rev.log'; 'encryption' = 1; 'reversed_grpc_streaming' = 0; 'certificate' = 'D:\tutu\titi_rev.crt'; 'private_key' = 'C:\Users crypto\private_rev.key'; 'ca_certificate' = 'C:\Users\Public\ca_rev.crt'; 'ca_name' = 'tls_ca_name_rev' }
+$expected = @{ 'endpoint' = '127.0.0.10:4317'; 'host' = 'my_host_name_10'; 'log_type' = 'File'; 'log_level' = 'trace'; 'log_file' = 'C:\Users\Public\cma_rev.log'; 'encryption' = 1; 'reversed_grpc_streaming' = 0; 'public_cert' = 'D:\tutu\titi_rev.crt'; 'private_key' = 'C:\Users crypto\private_rev.key'; 'ca_certificate' = 'C:\Users\Public\ca_rev.crt'; 'ca_name' = 'tls_ca_name_rev' }
 test_args_to_registry "agent/installer/centreon-monitoring-agent-modify.exe" $exe_args $expected
 
 $exe_args = '/S', "--log_type", "file", "--log_file", "C:\Users\Public\cma_rev2.log", "--log_level", "debug", "--log_max_file_size", "50", "--log_max_files", "20"
-$expected = @{ 'endpoint' = '127.0.0.10:4317'; 'host' = 'my_host_name_10'; 'log_type' = 'File'; 'log_level' = 'debug'; 'log_file' = 'C:\Users\Public\cma_rev2.log'; 'encryption' = 1; 'reversed_grpc_streaming' = 0; 'certificate' = 'D:\tutu\titi_rev.crt'; 'log_max_file_size' = 50; 'log_max_files' = 20; 'private_key' = 'C:\Users crypto\private_rev.key'; 'ca_certificate' = 'C:\Users\Public\ca_rev.crt'; 'ca_name' = 'tls_ca_name_rev' }
+$expected = @{ 'endpoint' = '127.0.0.10:4317'; 'host' = 'my_host_name_10'; 'log_type' = 'File'; 'log_level' = 'debug'; 'log_file' = 'C:\Users\Public\cma_rev2.log'; 'encryption' = 1; 'reversed_grpc_streaming' = 0; 'public_cert' = 'D:\tutu\titi_rev.crt'; 'log_max_file_size' = 50; 'log_max_files' = 20; 'private_key' = 'C:\Users crypto\private_rev.key'; 'ca_certificate' = 'C:\Users\Public\ca_rev.crt'; 'ca_name' = 'tls_ca_name_rev' }
 test_args_to_registry "agent/installer/centreon-monitoring-agent-modify.exe" $exe_args $expected
 
 $exe_args = '/S', "--log_type", "event-log", "--log_level", "error"
-$expected = @{ 'endpoint' = '127.0.0.10:4317'; 'host' = 'my_host_name_10'; 'log_type' = 'event-log'; 'log_level' = 'error'; 'encryption' = 1; 'reversed_grpc_streaming' = 0; 'certificate' = 'D:\tutu\titi_rev.crt'; 'private_key' = 'C:\Users crypto\private_rev.key'; 'ca_certificate' = 'C:\Users\Public\ca_rev.crt'; 'ca_name' = 'tls_ca_name_rev' }
+$expected = @{ 'endpoint' = '127.0.0.10:4317'; 'host' = 'my_host_name_10'; 'log_type' = 'event-log'; 'log_level' = 'error'; 'encryption' = 1; 'reversed_grpc_streaming' = 0; 'public_cert' = 'D:\tutu\titi_rev.crt'; 'private_key' = 'C:\Users crypto\private_rev.key'; 'ca_certificate' = 'C:\Users\Public\ca_rev.crt'; 'ca_name' = 'tls_ca_name_rev' }
 test_args_to_registry "agent/installer/centreon-monitoring-agent-modify.exe" $exe_args $expected
 
 $exe_args = '/S', "--private_key", "C:\Users crypto\private_rev2.key", "--public_cert", "D:\tutu\titi_rev2.crt"
-$expected = @{ 'endpoint' = '127.0.0.10:4317'; 'host' = 'my_host_name_10'; 'log_type' = 'event-log'; 'log_level' = 'error'; 'encryption' = 1; 'reversed_grpc_streaming' = 0; 'certificate' = 'D:\tutu\titi_rev2.crt'; 'private_key' = 'C:\Users crypto\private_rev2.key'; 'ca_certificate' = 'C:\Users\Public\ca_rev.crt'; 'ca_name' = 'tls_ca_name_rev' }
+$expected = @{ 'endpoint' = '127.0.0.10:4317'; 'host' = 'my_host_name_10'; 'log_type' = 'event-log'; 'log_level' = 'error'; 'encryption' = 1; 'reversed_grpc_streaming' = 0; 'public_cert' = 'D:\tutu\titi_rev2.crt'; 'private_key' = 'C:\Users crypto\private_rev2.key'; 'ca_certificate' = 'C:\Users\Public\ca_rev.crt'; 'ca_name' = 'tls_ca_name_rev' }
 test_args_to_registry "agent/installer/centreon-monitoring-agent-modify.exe" $exe_args $expected
 
 $exe_args = '/S', "--ca", "C:\Users\Public\ca_rev2.crt", "--ca_name", "tls_ca_name_rev2"
-$expected = @{ 'endpoint' = '127.0.0.10:4317'; 'host' = 'my_host_name_10'; 'log_type' = 'event-log'; 'log_level' = 'error'; 'encryption' = 1; 'reversed_grpc_streaming' = 0; 'certificate' = 'D:\tutu\titi_rev2.crt'; 'private_key' = 'C:\Users crypto\private_rev2.key'; 'ca_certificate' = 'C:\Users\Public\ca_rev2.crt'; 'ca_name' = 'tls_ca_name_rev2' }
+$expected = @{ 'endpoint' = '127.0.0.10:4317'; 'host' = 'my_host_name_10'; 'log_type' = 'event-log'; 'log_level' = 'error'; 'encryption' = 1; 'reversed_grpc_streaming' = 0; 'public_cert' = 'D:\tutu\titi_rev2.crt'; 'private_key' = 'C:\Users crypto\private_rev2.key'; 'ca_certificate' = 'C:\Users\Public\ca_rev2.crt'; 'ca_name' = 'tls_ca_name_rev2' }
 test_args_to_registry "agent/installer/centreon-monitoring-agent-modify.exe" $exe_args $expected
 
 $exe_args = '/S', "--no_encryption"
-$expected = @{ 'endpoint' = '127.0.0.10:4317'; 'host' = 'my_host_name_10'; 'log_type' = 'event-log'; 'log_level' = 'error'; 'encryption' = 0; 'reversed_grpc_streaming' = 0; 'certificate' = 'D:\tutu\titi_rev2.crt'; 'private_key' = 'C:\Users crypto\private_rev2.key'; 'ca_certificate' = 'C:\Users\Public\ca_rev2.crt'; 'ca_name' = 'tls_ca_name_rev2' }
+$expected = @{ 'endpoint' = '127.0.0.10:4317'; 'host' = 'my_host_name_10'; 'log_type' = 'event-log'; 'log_level' = 'error'; 'encryption' = 0; 'reversed_grpc_streaming' = 0; 'public_cert' = 'D:\tutu\titi_rev2.crt'; 'private_key' = 'C:\Users crypto\private_rev2.key'; 'ca_certificate' = 'C:\Users\Public\ca_rev2.crt'; 'ca_name' = 'tls_ca_name_rev2' }
 test_args_to_registry "agent/installer/centreon-monitoring-agent-modify.exe" $exe_args $expected
 
 
diff --git a/agent/bench/create_many_linux_agent.py b/agent/bench/create_many_linux_agent.py
index 80bd5c41613..54d22ce0c90 100755
--- a/agent/bench/create_many_linux_agent.py
+++ b/agent/bench/create_many_linux_agent.py
@@ -214,7 +214,7 @@ def create_agent_config_file(host_ip:str, first_agent_index:int):
     "log_max_files":3,
     "endpoint":"{endpoint}",
     "encryption":false,
-    "certificate":"",
+    "public_cert":"",
     "private_key":"",
     "ca_certificate":"",
     "ca_name":"",
diff --git a/agent/conf/centagent.json.in b/agent/conf/centagent.json.in
index cf3bc510cb2..e6baa2d8461 100644
--- a/agent/conf/centagent.json.in
+++ b/agent/conf/centagent.json.in
@@ -6,7 +6,7 @@
     "log_max_files":3,
     "endpoint":"<poller ip>:4317",
     "encryption":false,
-    "certificate":"",
+    "public_cert":"",
     "private_key":"",
     "ca_certificate":"",
     "ca_name":"",
diff --git a/agent/conf/centagent.reg b/agent/conf/centagent.reg
index ba43c5406a93f129db9fe747c0c76d7374607ab1..777dce4b68b3137e2a23444990f92cdee43fee84 100644
GIT binary patch
delta 34
ocmdnMyMcGZEGE$chEj$kh8%`WhGd3#AWmf{Vkp_Xo{5nK0H|OH(EtDd

delta 16
YcmdnMyMcGZET+jXm{d0JWBSAl06N14&;S4c

diff --git a/agent/installer/dlg_helper.nsi b/agent/installer/dlg_helper.nsi
index 6a35e5c9fee..2b8bca8f284 100644
--- a/agent/installer/dlg_helper.nsi
+++ b/agent/installer/dlg_helper.nsi
@@ -284,7 +284,7 @@ Function init_encryption_dlg
     ${OrIf} $0 > 0
         ${NSD_Check} $hCtl_encryption_EncryptionCheckBox
     ${EndIf}
-    ReadRegStr $0 HKLM ${CMA_REG_KEY} "certificate"
+    ReadRegStr $0 HKLM ${CMA_REG_KEY} "public_cert"
     ${NSD_SetText} $hCtl_encryption_certificate_file_Txt $0
     ReadRegStr $0 HKLM ${CMA_REG_KEY} "private_key"
     ${NSD_SetText} $hCtl_encryption_private_key_file_Txt $0
@@ -361,7 +361,7 @@ Function encryption_dlg_onNext
             Abort
         ${EndIf}
 
-        WriteRegStr HKLM ${CMA_REG_KEY} "certificate" $1
+        WriteRegStr HKLM ${CMA_REG_KEY} "public_cert" $1
         WriteRegStr HKLM ${CMA_REG_KEY} "private_key" $2
         WriteRegStr HKLM ${CMA_REG_KEY} "ca_certificate" $3
         ${NSD_GetText} $hCtl_encryption_ca_name $1
diff --git a/agent/installer/silent.nsi b/agent/installer/silent.nsi
index 0bc14085920..a339b63aa8a 100644
--- a/agent/installer/silent.nsi
+++ b/agent/installer/silent.nsi
@@ -233,7 +233,7 @@ Function cmd_line_to_registry
                 Call silent_fatal_error
             ${EndIf}
         ${EndIf}
-        WriteRegStr HKLM ${CMA_REG_KEY} "certificate" $0
+        WriteRegStr HKLM ${CMA_REG_KEY} "public_cert" $0
 
         StrCpy $0 ""
         ${GetOptions} $cmdline_parameters "--ca" $0
@@ -360,7 +360,7 @@ Function silent_update_conf
                 Strcpy $1 "Bad certificate file path."
                 Call silent_fatal_error
             ${EndIf}
-            WriteRegStr HKLM ${CMA_REG_KEY} "certificate" $0
+            WriteRegStr HKLM ${CMA_REG_KEY} "public_cert" $0
         ${EndIf}
         ${GetOptions} $cmdline_parameters "--ca" $0
         ${IfNot} ${Errors}
@@ -396,7 +396,7 @@ Function silent_update_conf
                 Strcpy $1 "If encryption and poller-initiated connection are active, the private key is mandatory."
                 Call silent_fatal_error
             ${EndIf}
-            ReadRegStr $0 HKLM ${CMA_REG_KEY} "certificate"
+            ReadRegStr $0 HKLM ${CMA_REG_KEY} "public_cert"
             ${If} $0 == ""
                 WriteRegDWORD HKLM ${CMA_REG_KEY} "encryption" 0
                 Strcpy $1 "If encryption and poller-initiated connection are active, the certificate is mandatory."