etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-5734: Fix the regression caused by adding hyper-V support

This commit is contained in:
Kelven Yang 2014-01-10 17:58:26 -08:00
parent 343b6acae2
commit b2d5e374d9
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/servlet/ConsoleProxyServlet.java
View File

@ -334,6 +334,8 @@ public class ConsoleProxyServlet extends HttpServlet {
}
} else if (hostInfo.startsWith("instanceId")) {
host = hostInfo.substring(hostInfo.indexOf('=') + 1);
} else {
host = hostInfo;
}
} else {
host = hostInfo;

35
services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java
View File

@ -23,7 +23,7 @@ import com.cloud.consoleproxy.util.Logger;
public class ConsoleProxyHttpHandlerHelper {
private static final Logger s_logger = Logger.getLogger(ConsoleProxyHttpHandlerHelper.class);
public static Map<String, String> getQueryMap(String query) {
String[] params = query.split("&");
Map<String, String> map = new HashMap<String, String>();
@ -43,26 +43,45 @@ public class ConsoleProxyHttpHandlerHelper {
s_logger.debug("Invalid paramemter in URL found. param: " + param);
}
}
// This is a ugly solution for now. We will do encryption/decryption translation
// here to make it transparent to rest of the code.
if(map.get("token") != null) {
ConsoleProxyPasswordBasedEncryptor encryptor = new ConsoleProxyPasswordBasedEncryptor(
ConsoleProxy.getEncryptorPassword());
ConsoleProxyClientParam param = encryptor.decryptObject(ConsoleProxyClientParam.class, map.get("token"));
// make sure we get information from token only
guardUserInput(map);
if(param != null) {
if(param.getClientHostAddress() != null)
if (param.getClientHostAddress() != null) {
s_logger.debug("decode token. host: " + param.getClientHostAddress());
map.put("host", param.getClientHostAddress());
if(param.getClientHostPort() != 0)
} else {
s_logger.error("decode token. host info is not found!");
}
if (param.getClientHostPort() != 0) {
s_logger.debug("decode token. port: " + param.getClientHostPort());
map.put("port", String.valueOf(param.getClientHostPort()));
if(param.getClientTag() != null)
} else {
s_logger.error("decode token. port info is not found!");
}
if (param.getClientTag() != null) {
s_logger.debug("decode token. tag: " + param.getClientTag());
map.put("tag", param.getClientTag());
if(param.getClientHostPassword() != null)
} else {
s_logger.error("decode token. tag info is not found!");
}
if (param.getClientHostPassword() != null) {
map.put("sid", param.getClientHostPassword());
} else {
s_logger.error("decode token. sid info is not found!");
}
if(param.getClientTunnelUrl() != null)
map.put("consoleurl", param.getClientTunnelUrl());
if(param.getClientTunnelSession() != null)
@ -77,6 +96,8 @@ public class ConsoleProxyHttpHandlerHelper {
map.put("username", param.getUsername());
if (param.getPassword() != null)
map.put("password", param.getPassword());
} else {
s_logger.error("Unable to decode token");
}
} else {
// we no longer accept information from parameter other than token