Skip to content

Fix invalid consoleproxy url after upgrade #2734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 1 commit into from
Jul 26, 2018
Merged

Fix invalid consoleproxy url after upgrade #2734

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 25 additions & 23 deletions core/src/com/cloud/info/ConsoleProxyInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

@rafaelweingartner rafaelweingartner Jul 13, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@resmo you already did a lot! I would like to see a documentation (instead of inline comments) and unit tests for this method though.

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() {
Expand Down