CLOUDSTACK-1655: A regression in ConsoleProxy caused by deprecating old URL form
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bf15eb0c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/bf15eb0c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/bf15eb0c Branch: refs/heads/ui-multiple-vlan-ranges Commit: bf15eb0c7fbb8716a9df1fb1cd2209a68eed3d20 Parents: d55560a Author: Kelven Yang <[email protected]> Authored: Tue Mar 12 17:26:10 2013 -0700 Committer: Kelven Yang <[email protected]> Committed: Tue Mar 12 17:30:30 2013 -0700 ---------------------------------------------------------------------- .../ConsoleProxyHttpHandlerHelper.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bf15eb0c/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java ---------------------------------------------------------------------- diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java index 7f79bae..6815b0d 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java @@ -50,9 +50,10 @@ public class ConsoleProxyHttpHandlerHelper { ConsoleProxyPasswordBasedEncryptor encryptor = new ConsoleProxyPasswordBasedEncryptor( ConsoleProxy.getEncryptorPassword()); + ConsoleProxyClientParam param = encryptor.decryptObject(ConsoleProxyClientParam.class, map.get("token")); + // make sure we get information from token only map.clear(); - ConsoleProxyClientParam param = encryptor.decryptObject(ConsoleProxyClientParam.class, map.get("token")); if(param != null) { if(param.getClientHostAddress() != null) map.put("host", param.getClientHostAddress());
