Merge pull request #175 from cinovo/cloudconductorpropertyproviderfix

better error handling in CloudconductorPropertyProvider

Author: YukiInu

CHANGELOG.md

@@ -17,6 +17,7 @@
     * Swagger 2.2.40
     * Velocity Engine 2.4.1
 * Fixing DaemonExceptionMapper 
+* Better error handling in CloudconductorPropertyProvider
 * Fixed vulnerabilities: CVE-2024-13009(Jetty), CVE-2025-23184(Apache CXF), CVE-2024-57699 (Json-smart),CVE-2025-27533 (ActiveMQ)
 
 # 1.37

daemon/src/main/java/de/taimos/daemon/properties/CloudConductorPropertyProvider.java

@@ -21,9 +21,9 @@
  */
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
 import java.util.Properties;
 
 import de.taimos.daemon.DaemonStarter;
@@ -73,32 +73,25 @@ public CloudConductorPropertyProvider(String server, String template, String tok
 	}
 
     private void checkSecureConnections() {
-        String secureConnection = CloudConductorPropertyProvider.getProperty(CloudConductorPropertyProvider.CLOUDCONDUCTOR_SECURE_CONNECTIONS);
-        if (Boolean.parseBoolean(secureConnection)){
-            this.setProtocol(CloudConductorPropertyProvider.HTTPS);
+        String secureConnection = System.getProperty(CloudConductorPropertyProvider.CLOUDCONDUCTOR_SECURE_CONNECTIONS);
+        if (secureConnection == null) {
+            secureConnection = System.getenv(CloudConductorPropertyProvider.CLOUDCONDUCTOR_SECURE_CONNECTIONS);
         }
-    }
-
-    private static String getProperty(String name) {
-        String property = System.getProperty(name);
-        if(property == null) {
-            property = System.getenv(name);
+        if (Boolean.parseBoolean(secureConnection)) {
+            this.setProtocol(CloudConductorPropertyProvider.HTTPS);
         }
-        return property;
     }
 
-	/**
-	 * @param protocol http or https, http is default;
-	 * @return this provider
-	 */
-	public CloudConductorPropertyProvider setProtocol(String protocol) {
+    /**
+     * @param protocol http or https, http is default;
+     */
+	public void setProtocol(String protocol) {
 		if(protocol.equalsIgnoreCase(CloudConductorPropertyProvider.HTTPS)) {
 			this.protocol = CloudConductorPropertyProvider.HTTPS;
 		} else {
 			this.protocol = "http";
 		}
-		return this;
-	}
+    }
 
 	@Override
 	protected String getDescription() {
@@ -113,7 +106,12 @@ protected HTTPResponse getResponse() {
 		if(this.jwt != null) {
 			req.authBearer(this.jwt);
 		}
-		return req.get();
+        HTTPResponse httpResponse = req.get();
+        int status = httpResponse.getStatus();
+        if (200 > status || 300 < status) {
+            this.logger.warn("Config request with CloudConductor Server {} failed with status {}", this.server, status);
+        }
+        return httpResponse;
 	}
 
 	private void readPropertyFile(String propFile) {
@@ -125,7 +123,7 @@ private void readPropertyFile(String propFile) {
 			file = new File(CloudConductorPropertyProvider.CLOUDCONDUCTOR_PROP_FILE_DEFAULT_PATH);
 		}
 		if(file.exists()) {
-			try(InputStream reader = new FileInputStream(file)) {
+			try(InputStream reader = Files.newInputStream(file.toPath())) {
 				Properties prop = new Properties();
 				prop.load(reader);
 				if(this.server == null && prop.containsKey(CloudConductorPropertyProvider.CLOUDCONDUCTOR_URL)) {