review comments

Author: sureshanaparti

client/src/main/java/org/apache/cloudstack/ServerDaemon.java

@@ -74,9 +74,6 @@ public class ServerDaemon implements Daemon {
     private static final String BIND_INTERFACE = "bind.interface";
     private static final String CONTEXT_PATH = "context.path";
     private static final String SESSION_TIMEOUT = "session.timeout";
-    private static final String HTTP_ENABLE = "http.enable";
-    private static final String HTTP_PORT = "http.port";
-    private static final String HTTPS_PORT = "https.port";
     private static final String KEYSTORE_PASSWORD = "https.keystore.password";
     private static final String WEBAPP_DIR = "webapp.dir";
     private static final String ACCESS_LOG = "access.log";
@@ -138,10 +135,10 @@ public void init(final DaemonContext context) {
             }
             setBindInterface(properties.getProperty(BIND_INTERFACE, null));
             setContextPath(properties.getProperty(CONTEXT_PATH, "/client"));
-            setHttpEnable(Boolean.valueOf(properties.getProperty(HTTP_ENABLE, "true")));
-            setHttpPort(Integer.valueOf(properties.getProperty(HTTP_PORT, "8080")));
+            setHttpEnable(Boolean.valueOf(properties.getProperty(ServerProperties.HTTP_ENABLE, "true")));
+            setHttpPort(Integer.valueOf(properties.getProperty(ServerProperties.HTTP_PORT, "8080")));
             setHttpsEnable(Boolean.valueOf(properties.getProperty(ServerProperties.HTTPS_ENABLE, "false")));
-            setHttpsPort(Integer.valueOf(properties.getProperty(HTTPS_PORT, "8443")));
+            setHttpsPort(Integer.valueOf(properties.getProperty(ServerProperties.HTTPS_PORT, "8443")));
             setKeystoreFile(properties.getProperty(ServerProperties.KEYSTORE_FILE));
             setKeystorePassword(properties.getProperty(KEYSTORE_PASSWORD));
             setWebAppLocation(properties.getProperty(WEBAPP_DIR));

server/src/main/java/org/apache/cloudstack/user/UserPasswordResetManager.java

@@ -78,7 +78,7 @@ public interface UserPasswordResetManager {
 
     ConfigKey<String> UserPasswordResetDomainURL = new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED,
             String.class, "user.password.reset.mail.domain.url", null,
-            "Domain URL (along with http:// or https:// as applicable) for reset password links sent to the user via email. " +
+            "Domain URL (along with scheme - http:// or https:// and port as applicable) for reset password links sent to the user via email. " +
                     "If this is not set, CloudStack would determine the domain url based on the first management server from 'host' setting " +
                     "and http scheme based on the https.enabled flag from server.properties file in the management server.", true,
             ConfigKey.Scope.Global);

server/src/main/java/org/apache/cloudstack/user/UserPasswordResetManagerImpl.java

@@ -183,17 +183,22 @@ public void setResetTokenAndSend(UserAccount userAccount) {
         final String subject = "Password Reset Request";
         String domainUrl = UserPasswordResetDomainURL.value();
         if (StringUtils.isBlank(domainUrl)) {
-            domainUrl = ManagementServerAddresses.value().split(",")[0];
-        }
-        domainUrl = domainUrl.replaceAll("/+$", "");
-
-        if (!domainUrl.startsWith("http://") && !domainUrl.startsWith("https://")) {
+            String mgmtServerAddr = ManagementServerAddresses.value().split(",")[0];
+            if (ServerProperties.isHttpsEnabled()) {
+                domainUrl = "https://" + mgmtServerAddr + ":" + ServerProperties.getHttpsPort();
+            } else {
+                domainUrl = "http://" + mgmtServerAddr + ":" + ServerProperties.getHttpPort();
+            }
+        } else if (!domainUrl.startsWith("http://") && !domainUrl.startsWith("https://")) {
             if (ServerProperties.isHttpsEnabled()) {
                 domainUrl = "https://" + domainUrl;
             } else {
                 domainUrl = "http://" + domainUrl;
             }
         }
+
+        domainUrl = domainUrl.replaceAll("/+$", "");
+
         String resetLink = String.format("%s/client/#/user/resetPassword?username=%s&token=%s",
                 domainUrl, username, resetToken);
         String content = getMessageBody(userAccount, resetToken, resetLink);

utils/src/main/java/com/cloud/utils/server/ServerProperties.java

@@ -16,29 +16,35 @@
 // under the License.
 package com.cloud.utils.server;
 
-import com.cloud.utils.PropertiesUtil;
 import com.cloud.utils.crypt.EncryptionSecretKeyChecker;
 import com.cloud.utils.StringUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
 public class ServerProperties {
     protected Logger logger = LogManager.getLogger(getClass());
 
+    public static final String HTTP_ENABLE = "http.enable";
+    public static final String HTTP_PORT = "http.port";
     public static final String HTTPS_ENABLE = "https.enable";
+    public static final String HTTPS_PORT = "https.port";
     public static final String KEYSTORE_FILE = "https.keystore";
     public static final String PASSWORD_ENCRYPTION_TYPE = "password.encryption.type";
 
     private static Properties properties = new Properties();
     private static boolean loaded = false;
 
+    private static int httpPort = 8080;
+
+    private static boolean httpsEnable = false;
+    private static int httpsPort = 8443;
+
     public synchronized static Properties getServerProperties(InputStream inputStream) {
         if (!loaded) {
             Properties serverProps = new Properties();
@@ -57,31 +63,29 @@ public synchronized static Properties getServerProperties(InputStream inputStrea
                 IOUtils.closeQuietly(inputStream);
             }
 
+            httpPort = Integer.parseInt(serverProps.getProperty(ServerProperties.HTTP_PORT, "8080"));
+
+            boolean httpsEnabled = Boolean.parseBoolean(serverProps.getProperty(ServerProperties.HTTPS_ENABLE, "false"));
+            String keystoreFile = serverProps.getProperty(KEYSTORE_FILE);
+            httpsEnable =  httpsEnabled && StringUtils.isNotEmpty(keystoreFile) && new File(keystoreFile).exists();
+            httpsPort = Integer.parseInt(serverProps.getProperty(ServerProperties.HTTPS_PORT, "8443"));
+
             properties = serverProps;
             loaded = true;
         }
 
         return properties;
     }
 
-    public static boolean isHttpsEnabled() {
-        final File confFile = PropertiesUtil.findConfigFile("server.properties");
-        if (confFile == null) {
-            return false;
-        }
+    public static int getHttpPort() {
+        return httpPort;
+    }
 
-        try {
-            InputStream is = new FileInputStream(confFile);
-            final Properties properties = ServerProperties.getServerProperties(is);
-            if (properties == null) {
-                return false;
-            }
+    public static boolean isHttpsEnabled() {
+        return httpsEnable;
+    }
 
-            boolean httpsEnable = Boolean.parseBoolean(properties.getProperty(HTTPS_ENABLE, "false"));
-            String keystoreFile = properties.getProperty(KEYSTORE_FILE);
-            return httpsEnable && StringUtils.isNotEmpty(keystoreFile) && new File(keystoreFile).exists();
-        } catch (final IOException e) {
-            return false;
-        }
+    public static int getHttpsPort() {
+        return httpsPort;
     }
 }