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

CLOUDSTACK-7124: Fix semicolon caused VPN programming issue on Xen 

(cherry picked from commit abc0b40acb)
This commit is contained in:
Sheng Yang 2014-07-25 16:17:30 -07:00 committed by Daan Hoogland
parent 8138984dc9
commit 018bcd26f8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -566,9 +566,12 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
@Override
public ExecutionResult executeInVR(String routerIP, String script, String args, int timeout) {
Pair<Boolean, String> result;
String cmdline = "/opt/cloud/bin/router_proxy.sh " + script + " " + routerIP + " " + args;
// semicolon need to be escape for bash
cmdline = cmdline.replaceAll(";", "\\\\;");
try {
s_logger.debug("Executing command in VR: /opt/cloud/bin/router_proxy.sh " + script + " " + routerIP + " " + args);
result = SshHelper.sshExecute(_host.ip, 22, _username, null, _password.peek(), "/opt/cloud/bin/router_proxy.sh " + script + " " + routerIP + " " + args,
s_logger.debug("Executing command in VR: " + cmdline);
result = SshHelper.sshExecute(_host.ip, 22, _username, null, _password.peek(), cmdline,
60000, 60000, timeout * 1000);
} catch (Exception e) {
return new ExecutionResult(false, e.getMessage());