[cloudstack] branch master updated: console-proxy: fix potential NPE condition (#3419)

[rohit]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new 2c3c88e  console-proxy: fix potential NPE condition (#3419)
2c3c88e is described below

commit 2c3c88e2092dae44de823cf52cb3e2cc787bb3a1
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Wed Jun 26 23:18:20 2019 +0530

    console-proxy: fix potential NPE condition (#3419)
    
    When checking if the console proxy URL domain starts with *, the code
    does not check if the provided string is null. When domain is not
    configured the IP address should be used.
    
    Fixes #3164
    
    Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
---
 core/src/main/java/com/cloud/info/ConsoleProxyInfo.java | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/com/cloud/info/ConsoleProxyInfo.java 
b/core/src/main/java/com/cloud/info/ConsoleProxyInfo.java
index 78cb877..7e1be6a 100644
--- a/core/src/main/java/com/cloud/info/ConsoleProxyInfo.java
+++ b/core/src/main/java/com/cloud/info/ConsoleProxyInfo.java
@@ -55,18 +55,16 @@ public class ConsoleProxyInfo {
 
     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("*")) {
+        if (StringUtils.isBlank(consoleProxyUrlDomain)) {
+            // Blank config, we use the proxy IP
+            sb.append(proxyIpAddress);
+        } else if (consoleProxyUrlDomain.startsWith("*")) {
+            // Domain in format *.example.com, proxy IP is 1.2.3.4 --> 
1-2-3-4.example.com
             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);
+            // Otherwise we assume a valid domain if config not blank
+            sb.append(consoleProxyUrlDomain);
         }
         return sb.toString();
     }