Removed sensitive info from UI/API when volume attach/detach fails (#4476)

Spaceman1984 · web-flow · commit 87e1fa9e02fa · 2020-11-19T04:39:37.000+05:30
* Removed sensitive info from UI when attach/detach fails

* minor formatting change
diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -2248,15 +2248,16 @@ private Answer attachVolume(Command cmd, DiskTO disk, boolean isAttach, boolean
             String msg = "";
 
             if (isAttach) {
-                msg += "Failed to attach volume: " + e.getMessage();
+                msg += "Failed to attach volume: ";
             }
             else {
-                msg += "Failed to detach volume: " + e.getMessage();
+                msg += "Failed to detach volume: ";
             }
 
-            s_logger.error(msg, e);
+            s_logger.error(msg + e.getMessage(), e);
 
-            return new AttachAnswer(msg);
+            // Sending empty error message - too many duplicate errors in UI
+            return new AttachAnswer("");
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2248,15 +2248,16 @@ private Answer attachVolume(Command cmd, DiskTO disk, boolean isAttach, boolean`
`2248`	`2248`	`String msg = "";`
`2249`	`2249`
`2250`	`2250`	`if (isAttach) {`
`2251`		`- msg += "Failed to attach volume: " + e.getMessage();`
	`2251`	`+ msg += "Failed to attach volume: ";`
`2252`	`2252`	`}`
`2253`	`2253`	`else {`
`2254`		`- msg += "Failed to detach volume: " + e.getMessage();`
	`2254`	`+ msg += "Failed to detach volume: ";`
`2255`	`2255`	`}`
`2256`	`2256`
`2257`		`- s_logger.error(msg, e);`
	`2257`	`+ s_logger.error(msg + e.getMessage(), e);`
`2258`	`2258`
`2259`		`- return new AttachAnswer(msg);`
	`2259`	`+ // Sending empty error message - too many duplicate errors in UI`
	`2260`	`+ return new AttachAnswer("");`
`2260`	`2261`	`}`
`2261`	`2262`	`}`
`2262`	`2263`