rhtyd closed pull request #2734: Fix invalid consoleproxy url after upgrade
URL: https://github.com/apache/cloudstack/pull/2734
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/core/src/com/cloud/info/ConsoleProxyInfo.java
b/core/src/com/cloud/info/ConsoleProxyInfo.java
index 16993d71bdc..78cb877e7db 100644
--- a/core/src/com/cloud/info/ConsoleProxyInfo.java
+++ b/core/src/com/cloud/info/ConsoleProxyInfo.java
@@ -35,38 +35,40 @@ public ConsoleProxyInfo(int proxyUrlPort) {
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() {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
