'api setup' must not override existing certificate and api-users.conf file

fixes #10560

diff --git a/lib/cli/apisetuputility.cpp b/lib/cli/apisetuputility.cpp
index 585432955953ecc823573e7fe5436e1f418a1b79..0582476f9ec25132f648871afe5f0b0f2947a829 100644 (file)
--- a/lib/cli/apisetuputility.cpp
+++ b/lib/cli/apisetuputility.cpp
@@ -83,6 +83,12 @@ bool ApiSetupUtility::SetupMasterCertificates(const String& cn)
        String key = pki_path + "/" + cn + ".key";
        String csr = pki_path + "/" + cn + ".csr";
 
+       if (Utility::PathExists(key)) {
+               Log(LogInformation, "cli")
+                   << "Private key file '" << key << "' already existing, skipping.";
+               return true;
+       }
+
        Log(LogInformation, "cli")
            << "Generating new CSR in '" << csr << "'.";
 
@@ -153,6 +159,12 @@ bool ApiSetupUtility::SetupMasterApiUser(void)
        String api_password = RandomString(8);
        String apiuserspath = GetConfdPath() + "/api-users.conf";
 
+       if (Utility::PathExists(apiuserspath)) {
+               Log(LogInformation, "cli")
+                   << "API user config file '" << apiuserspath << "' already existing, skipping.";
+               return true;
+       }
+
        Log(LogInformation, "cli")
            << "Adding new ApiUser '" << api_username << "' in '" << apiuserspath << "'.";