Fix findbugs warning in LibvirtConsoleProxyLoadCommandWrapper Encoding is now specified in both server and clients for the console proxy getstatus command For some reason, findbugs did not detect unsafe encoding issue in ConsoleProxyResource.java, is properly specified now though... CitrixConsoleProxyLoadCommandWrapper was specifying system default encoding for operation, should be ok because default for xenserver is UTF-8 since it's linux based, but it's best to specify exact encoding set on the server end to be consistent

rsafonseca · yadvr · commit 949e97dec656 · 2015-06-15T12:04:18.000+03:00
Signed-off-by: Rohit Yadav &lt;rohit.yadav@shapeblue.com&gt;
diff --git a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
@@ -149,7 +149,7 @@ private Answer executeProxyLoadScan(final Command cmd, final long proxyVmId, fin
             final URLConnection conn = url.openConnection();
 
             final InputStream is = conn.getInputStream();
-            final BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+            final BufferedReader reader = new BufferedReader(new InputStreamReader(is,"UTF-8"));
             final StringBuilder sb2 = new StringBuilder();
             String line = null;
             try {
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConsoleProxyLoadCommandWrapper.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConsoleProxyLoadCommandWrapper.java
@@ -50,7 +50,7 @@ public Answer executeProxyLoadScan(final Command cmd, final long proxyVmId, fina
             final URLConnection conn = url.openConnection();
 
             final InputStream is = conn.getInputStream();
-            final BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+            final BufferedReader reader = new BufferedReader(new InputStreamReader(is,"UTF-8"));
             final StringBuilder sb2 = new StringBuilder();
             String line = null;
             try {
@@ -75,4 +75,4 @@ public Answer executeProxyLoadScan(final Command cmd, final long proxyVmId, fina
 
         return new ConsoleProxyLoadAnswer(cmd, proxyVmId, proxyVmName, success, result);
     }
-}
+}
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java
@@ -55,7 +55,7 @@ protected Answer executeProxyLoadScan(final Command cmd, final long proxyVmId, f
             conn.setReadTimeout(5000);
 
             final InputStream is = conn.getInputStream();
-            final BufferedReader reader = new BufferedReader(new InputStreamReader(is, Charset.defaultCharset()));
+            final BufferedReader reader = new BufferedReader(new InputStreamReader(is,"UTF-8"));
             final StringBuilder sb2 = new StringBuilder();
             String line = null;
             try {
@@ -80,4 +80,4 @@ protected Answer executeProxyLoadScan(final Command cmd, final long proxyVmId, f
 
         return new ConsoleProxyLoadAnswer(cmd, proxyVmId, proxyVmName, success, result);
     }
-}
+}
diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyCmdHandler.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyCmdHandler.java
@@ -63,7 +63,7 @@ public void doHandle(HttpExchange t) throws Exception {
             Headers hds = t.getResponseHeaders();
             hds.set("Content-Type", "text/plain");
             t.sendResponseHeaders(200, 0);
-            OutputStreamWriter os = new OutputStreamWriter(t.getResponseBody());
+            OutputStreamWriter os = new OutputStreamWriter(t.getResponseBody(),"UTF-8");
             statsCollector.getStatsReport(os);
             os.close();
         }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public void doHandle(HttpExchange t) throws Exception {`
`63`	`63`	`Headers hds = t.getResponseHeaders();`
`64`	`64`	`hds.set("Content-Type", "text/plain");`
`65`	`65`	`t.sendResponseHeaders(200, 0);`
`66`		`- OutputStreamWriter os = new OutputStreamWriter(t.getResponseBody());`
	`66`	`+ OutputStreamWriter os = new OutputStreamWriter(t.getResponseBody(),"UTF-8");`
`67`	`67`	`statsCollector.getStatsReport(os);`
`68`	`68`	`os.close();`
`69`	`69`	`}`