apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

consoleproxy: Fixes #2733 invalid consoleproxy url after upgrade (#2734)

Browse Source 
Ensures we have a valid console proxy domain for protocol http even a * setting is used. See #2733
This commit is contained in:
René Moser 2018-07-26 09:31:23 +02:00 committed by Rohit Yadav
parent 4c66908b1f
commit f88d606acb
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
core/src/com/cloud/info/ConsoleProxyInfo.java
View File

@ -35,40 +35,42 @@ public class ConsoleProxyInfo {
public ConsoleProxyInfo(boolean sslEnabled, String proxyIpAddress, int port, int proxyUrlPort, String consoleProxyUrlDomain) {
this.sslEnabled = sslEnabled;
this.proxyPort = port;
this.proxyUrlPort = proxyUrlPort;
this.proxyAddress = this.formatProxyAddress(consoleProxyUrlDomain, proxyIpAddress);
if (sslEnabled) {
StringBuffer sb = new StringBuffer();
if (consoleProxyUrlDomain.startsWith("*")) {
sb.append(proxyIpAddress);
for (int i = 0; i < proxyIpAddress.length(); i++)
if (sb.charAt(i) == '.')
sb.setCharAt(i, '-');
sb.append(consoleProxyUrlDomain.substring(1));//skip the *
} else {
//LB address
sb.append(consoleProxyUrlDomain);
}
proxyAddress = sb.toString();
proxyPort = port;
this.proxyUrlPort = proxyUrlPort;
proxyImageUrl = "https://" + proxyAddress;
if (proxyUrlPort != 443)
if (proxyUrlPort != 443) {
proxyImageUrl += ":" + this.proxyUrlPort;
} else {
proxyAddress = proxyIpAddress;
if (StringUtils.isNotBlank(consoleProxyUrlDomain)) {
proxyAddress = consoleProxyUrlDomain;
}
proxyPort = port;
this.proxyUrlPort = proxyUrlPort;
} else {
proxyImageUrl = "http://" + proxyAddress;
if (proxyUrlPort != 80)
if (proxyUrlPort != 80) {
proxyImageUrl += ":" + proxyUrlPort;
}
}
}
private String formatProxyAddress(String consoleProxyUrlDomain, String proxyIpAddress) {
StringBuffer sb = new StringBuffer();
// Domain in format *.example.com, proxy IP is 1.2.3.4 --> 1-2-3-4.example.com
if (consoleProxyUrlDomain.startsWith("*")) {
sb.append(proxyIpAddress.replaceAll("\\.", "-"));
sb.append(consoleProxyUrlDomain.substring(1)); // skip the *
// Otherwise we assume a valid domain if config not blank
} else if (StringUtils.isNotBlank(consoleProxyUrlDomain)) {
sb.append(consoleProxyUrlDomain);
// Blank config, we use the proxy IP
} else {
sb.append(proxyIpAddress);
}
return sb.toString();
}
public String getProxyAddress() {
return proxyAddress;
}