harikrishna-patnala commented on code in PR #9509:
URL: https://github.com/apache/cloudstack/pull/9509#discussion_r1723173726
##########
server/pom.xml:
##########
@@ -101,6 +101,11 @@
<artifactId>commons-math3</artifactId>
<version>${cs.commons-math3.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.github.spullara.mustache.java</groupId>
+ <artifactId>compiler</artifactId>
+ <version>0.9.14</version>
Review Comment:
can we have variable here for the version number ?
##########
server/src/main/java/org/apache/cloudstack/user/PasswordReset.java:
##########
@@ -0,0 +1,55 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.user;
+
+import com.cloud.user.UserAccount;
+import org.apache.cloudstack.framework.config.ConfigKey;
+
+public interface PasswordReset {
+ ConfigKey<Long> PasswordResetTtl = new
ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, Long.class,
+ "password.reset.ttl", "30",
Review Comment:
This may confuse operators later on whether this is for VM instances or
users. Can you please add user context here in the name and description for all
the settings. something like "user.password.reset.ttl"
##########
server/src/main/java/org/apache/cloudstack/user/PasswordReset.java:
##########
@@ -0,0 +1,55 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.user;
+
+import com.cloud.user.UserAccount;
+import org.apache.cloudstack.framework.config.ConfigKey;
+
+public interface PasswordReset {
+ ConfigKey<Long> PasswordResetTtl = new
ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, Long.class,
+ "password.reset.ttl", "30",
+ "Password reset ttl in minutes", true, ConfigKey.Scope.Global);
+
+ ConfigKey<String> PasswordResetEmailSender = new
ConfigKey<>(ConfigKey.CATEGORY_ADVANCED,
+ String.class, "password.reset.email.sender", null,
+ "Password reset email sender", true, ConfigKey.Scope.Global);
+
+ ConfigKey<String> PasswordResetSMTPHost = new
ConfigKey<>(ConfigKey.CATEGORY_ADVANCED,
Review Comment:
Does it makes sense to keep all the settings to the Account Scope ?
##########
server/src/main/java/org/apache/cloudstack/user/PasswordResetImpl.java:
##########
@@ -0,0 +1,248 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.user;
+
+import com.cloud.user.AccountManager;
+import com.cloud.user.UserAccount;
+import com.cloud.user.UserVO;
+import com.cloud.user.dao.UserDao;
+import com.cloud.utils.StringUtils;
+import com.cloud.utils.component.ManagerBase;
+import com.github.mustachejava.DefaultMustacheFactory;
+import com.github.mustachejava.Mustache;
+import com.github.mustachejava.MustacheFactory;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.resourcedetail.UserDetailVO;
+import org.apache.cloudstack.resourcedetail.dao.UserDetailsDao;
+import org.apache.cloudstack.utils.mailing.MailAddress;
+import org.apache.cloudstack.utils.mailing.SMTPMailProperties;
+import org.apache.cloudstack.utils.mailing.SMTPMailSender;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import static
org.apache.cloudstack.config.ApiServiceConfiguration.ManagementServerAddresses;
+import static
org.apache.cloudstack.resourcedetail.UserDetailVO.PasswordResetToken;
+import static
org.apache.cloudstack.resourcedetail.UserDetailVO.PasswordResetTokenExpiryDate;
+
+public class PasswordResetImpl extends ManagerBase implements PasswordReset,
Configurable {
Review Comment:
```suggestion
public class PasswordResetManagerImpl extends ManagerBase implements
PasswordResetManager, Configurable {
```
##########
server/src/main/java/com/cloud/api/auth/DefaultForgotPasswordAPIAuthenticatorCmd.java:
##########
@@ -0,0 +1,163 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.api.auth;
+
+import com.cloud.api.ApiServlet;
+import com.cloud.api.response.ApiResponseSerializer;
+import com.cloud.domain.Domain;
+import com.cloud.user.Account;
+import com.cloud.user.User;
+import com.cloud.user.UserAccount;
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ApiServerService;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.auth.APIAuthenticationType;
+import org.apache.cloudstack.api.auth.APIAuthenticator;
+import org.apache.cloudstack.api.auth.PluggableAPIAuthenticator;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.jetbrains.annotations.Nullable;
+
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.net.InetAddress;
+import java.util.List;
+import java.util.Map;
+
+@APICommand(name = "forgotPassword",
Review Comment:
Add "since" attribute to all the APIs
##########
server/src/main/java/org/apache/cloudstack/user/PasswordResetImpl.java:
##########
@@ -0,0 +1,248 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.user;
+
+import com.cloud.user.AccountManager;
+import com.cloud.user.UserAccount;
+import com.cloud.user.UserVO;
+import com.cloud.user.dao.UserDao;
+import com.cloud.utils.StringUtils;
+import com.cloud.utils.component.ManagerBase;
+import com.github.mustachejava.DefaultMustacheFactory;
+import com.github.mustachejava.Mustache;
+import com.github.mustachejava.MustacheFactory;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.resourcedetail.UserDetailVO;
+import org.apache.cloudstack.resourcedetail.dao.UserDetailsDao;
+import org.apache.cloudstack.utils.mailing.MailAddress;
+import org.apache.cloudstack.utils.mailing.SMTPMailProperties;
+import org.apache.cloudstack.utils.mailing.SMTPMailSender;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import static
org.apache.cloudstack.config.ApiServiceConfiguration.ManagementServerAddresses;
+import static
org.apache.cloudstack.resourcedetail.UserDetailVO.PasswordResetToken;
+import static
org.apache.cloudstack.resourcedetail.UserDetailVO.PasswordResetTokenExpiryDate;
+
+public class PasswordResetImpl extends ManagerBase implements PasswordReset,
Configurable {
+
+ @Inject
+ private AccountManager accountManager;
+
+ @Inject
+ private UserDetailsDao userDetailsDao;
+
+ @Inject
+ private UserDao userDao;
+
+ private SMTPMailSender mailSender;
+
+ public static ConfigKey<String> PasswordResetMailTemplate =
+ new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, String.class,
+ "password.reset.mail.template", "Hello {{username}}!\n" +
+ "You have requested to reset your password. Please click the
following link to reset your password:\n" +
+ "{{{reset_link}}}\n" +
+ "If you did not request a password reset, please ignore this
email.\n" +
+ "\n" +
+ "Regards,\n" +
+ "The CloudStack Team",
+ "Password reset mail template. This uses mustache template engine.
Available " +
+ "variables are: username, firstName, lastName, resetLink,
token",
+ true,
+ ConfigKey.Scope.Global);
+
+ @Override
+ public String getConfigComponentName() {
+ return PasswordResetImpl.class.getSimpleName();
+ }
+
+ @Override
+ public ConfigKey<?>[] getConfigKeys() {
+ return new ConfigKey<?>[]{PasswordResetTtl,
+ PasswordResetEmailSender,
+ PasswordResetSMTPHost,
+ PasswordResetSMTPPort,
+ PasswordResetSMTPUseAuth,
+ PasswordResetSMTPUsername,
+ PasswordResetSMTPPassword,
+ PasswordResetMailTemplate
+ };
+ }
+
+ @Override
+ public boolean configure(String name, Map<String, Object> params) throws
ConfigurationException {
+ String smtpHost = PasswordResetSMTPHost.value();
+ Integer smtpPort = PasswordResetSMTPPort.value();
+ Boolean useAuth = PasswordResetSMTPUseAuth.value();
+ String username = PasswordResetSMTPUsername.value();
+ String password = PasswordResetSMTPPassword.value();
+
+ String namespace = "password.reset.smtp";
+
+ Map<String, String> configs = new HashMap<>();
+
+ configs.put(getKey(namespace, SMTPMailSender.CONFIG_HOST), smtpHost);
+ configs.put(getKey(namespace, SMTPMailSender.CONFIG_PORT),
smtpPort.toString());
+ configs.put(getKey(namespace, SMTPMailSender.CONFIG_USE_AUTH),
useAuth.toString());
+ configs.put(getKey(namespace, SMTPMailSender.CONFIG_USERNAME),
username);
+ configs.put(getKey(namespace, SMTPMailSender.CONFIG_PASSWORD),
password);
+
+ mailSender = new SMTPMailSender(configs, namespace);
+ return true;
+ }
+
+ private String getKey(String namespace, String config) {
+ return String.format("%s.%s", namespace, config);
+ }
+
+
+ public void setResetTokenAndSend(UserAccount userAccount) {
Review Comment:
Please add some logging in all the methods to log the flow in the management
server logs.
##########
server/src/main/java/org/apache/cloudstack/user/PasswordResetImpl.java:
##########
@@ -0,0 +1,248 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.user;
+
+import com.cloud.user.AccountManager;
+import com.cloud.user.UserAccount;
+import com.cloud.user.UserVO;
+import com.cloud.user.dao.UserDao;
+import com.cloud.utils.StringUtils;
+import com.cloud.utils.component.ManagerBase;
+import com.github.mustachejava.DefaultMustacheFactory;
+import com.github.mustachejava.Mustache;
+import com.github.mustachejava.MustacheFactory;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.resourcedetail.UserDetailVO;
+import org.apache.cloudstack.resourcedetail.dao.UserDetailsDao;
+import org.apache.cloudstack.utils.mailing.MailAddress;
+import org.apache.cloudstack.utils.mailing.SMTPMailProperties;
+import org.apache.cloudstack.utils.mailing.SMTPMailSender;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import static
org.apache.cloudstack.config.ApiServiceConfiguration.ManagementServerAddresses;
+import static
org.apache.cloudstack.resourcedetail.UserDetailVO.PasswordResetToken;
+import static
org.apache.cloudstack.resourcedetail.UserDetailVO.PasswordResetTokenExpiryDate;
+
+public class PasswordResetImpl extends ManagerBase implements PasswordReset,
Configurable {
+
+ @Inject
+ private AccountManager accountManager;
+
+ @Inject
+ private UserDetailsDao userDetailsDao;
+
+ @Inject
+ private UserDao userDao;
+
+ private SMTPMailSender mailSender;
+
+ public static ConfigKey<String> PasswordResetMailTemplate =
+ new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, String.class,
+ "password.reset.mail.template", "Hello {{username}}!\n" +
+ "You have requested to reset your password. Please click the
following link to reset your password:\n" +
+ "{{{reset_link}}}\n" +
+ "If you did not request a password reset, please ignore this
email.\n" +
+ "\n" +
+ "Regards,\n" +
+ "The CloudStack Team",
+ "Password reset mail template. This uses mustache template engine.
Available " +
+ "variables are: username, firstName, lastName, resetLink,
token",
+ true,
+ ConfigKey.Scope.Global);
+
+ @Override
+ public String getConfigComponentName() {
+ return PasswordResetImpl.class.getSimpleName();
+ }
+
+ @Override
+ public ConfigKey<?>[] getConfigKeys() {
+ return new ConfigKey<?>[]{PasswordResetTtl,
+ PasswordResetEmailSender,
+ PasswordResetSMTPHost,
+ PasswordResetSMTPPort,
+ PasswordResetSMTPUseAuth,
+ PasswordResetSMTPUsername,
+ PasswordResetSMTPPassword,
+ PasswordResetMailTemplate
+ };
+ }
+
+ @Override
+ public boolean configure(String name, Map<String, Object> params) throws
ConfigurationException {
+ String smtpHost = PasswordResetSMTPHost.value();
+ Integer smtpPort = PasswordResetSMTPPort.value();
+ Boolean useAuth = PasswordResetSMTPUseAuth.value();
+ String username = PasswordResetSMTPUsername.value();
+ String password = PasswordResetSMTPPassword.value();
+
+ String namespace = "password.reset.smtp";
+
+ Map<String, String> configs = new HashMap<>();
+
+ configs.put(getKey(namespace, SMTPMailSender.CONFIG_HOST), smtpHost);
+ configs.put(getKey(namespace, SMTPMailSender.CONFIG_PORT),
smtpPort.toString());
+ configs.put(getKey(namespace, SMTPMailSender.CONFIG_USE_AUTH),
useAuth.toString());
+ configs.put(getKey(namespace, SMTPMailSender.CONFIG_USERNAME),
username);
+ configs.put(getKey(namespace, SMTPMailSender.CONFIG_PASSWORD),
password);
+
+ mailSender = new SMTPMailSender(configs, namespace);
+ return true;
+ }
+
+ private String getKey(String namespace, String config) {
+ return String.format("%s.%s", namespace, config);
+ }
+
+
+ public void setResetTokenAndSend(UserAccount userAccount) {
+ final String resetToken = UUID.randomUUID().toString();
+ final Date resetTokenExpiryTime = new Date(System.currentTimeMillis()
+ PasswordResetTtl.value() * 60 * 1000);
+
+ userDetailsDao.addDetail(userAccount.getId(), PasswordResetToken,
resetToken, false);
+ userDetailsDao.addDetail(userAccount.getId(),
PasswordResetTokenExpiryDate, String.valueOf(resetTokenExpiryTime.getTime()),
false);
+
+ final String email = userAccount.getEmail();
+ final String username = userAccount.getUsername();
+ final String subject = "Password Reset Request";
+
+ String resetLink =
String.format("%s/user/resetPassword?username=%s&token=%s",
ManagementServerAddresses.value(), username, resetToken);
Review Comment:
Is it fine if ManagementServerAddresses holds comma separated IP's ?
##########
server/src/main/java/org/apache/cloudstack/user/PasswordReset.java:
##########
@@ -0,0 +1,55 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.user;
+
+import com.cloud.user.UserAccount;
+import org.apache.cloudstack.framework.config.ConfigKey;
+
+public interface PasswordReset {
Review Comment:
```suggestion
public interface PasswordResetManager {
```
##########
server/src/main/java/com/cloud/api/auth/DefaultResetPasswordAPIAuthenticatorCmd.java:
##########
@@ -0,0 +1,192 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.api.auth;
+
+import com.cloud.api.ApiServlet;
+import com.cloud.api.response.ApiResponseSerializer;
+import com.cloud.domain.Domain;
+import com.cloud.exception.CloudAuthenticationException;
+import com.cloud.user.Account;
+import com.cloud.user.User;
+import com.cloud.user.UserAccount;
+import com.cloud.utils.UuidUtils;
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ApiServerService;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.auth.APIAuthenticationType;
+import org.apache.cloudstack.api.auth.APIAuthenticator;
+import org.apache.cloudstack.api.auth.PluggableAPIAuthenticator;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.jetbrains.annotations.Nullable;
+
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.net.InetAddress;
+import java.util.List;
+import java.util.Map;
+
+@APICommand(name = "resetPassword",
Review Comment:
are we checking doing access check anywhere who are able to call this API
and the ownership ?
##########
server/src/main/java/org/apache/cloudstack/user/PasswordResetImpl.java:
##########
@@ -0,0 +1,248 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.user;
+
+import com.cloud.user.AccountManager;
+import com.cloud.user.UserAccount;
+import com.cloud.user.UserVO;
+import com.cloud.user.dao.UserDao;
+import com.cloud.utils.StringUtils;
+import com.cloud.utils.component.ManagerBase;
+import com.github.mustachejava.DefaultMustacheFactory;
+import com.github.mustachejava.Mustache;
+import com.github.mustachejava.MustacheFactory;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.resourcedetail.UserDetailVO;
+import org.apache.cloudstack.resourcedetail.dao.UserDetailsDao;
+import org.apache.cloudstack.utils.mailing.MailAddress;
+import org.apache.cloudstack.utils.mailing.SMTPMailProperties;
+import org.apache.cloudstack.utils.mailing.SMTPMailSender;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import static
org.apache.cloudstack.config.ApiServiceConfiguration.ManagementServerAddresses;
+import static
org.apache.cloudstack.resourcedetail.UserDetailVO.PasswordResetToken;
+import static
org.apache.cloudstack.resourcedetail.UserDetailVO.PasswordResetTokenExpiryDate;
+
+public class PasswordResetImpl extends ManagerBase implements PasswordReset,
Configurable {
+
+ @Inject
+ private AccountManager accountManager;
+
+ @Inject
+ private UserDetailsDao userDetailsDao;
+
+ @Inject
+ private UserDao userDao;
+
+ private SMTPMailSender mailSender;
+
+ public static ConfigKey<String> PasswordResetMailTemplate =
+ new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, String.class,
+ "password.reset.mail.template", "Hello {{username}}!\n" +
+ "You have requested to reset your password. Please click the
following link to reset your password:\n" +
+ "{{{reset_link}}}\n" +
+ "If you did not request a password reset, please ignore this
email.\n" +
+ "\n" +
+ "Regards,\n" +
+ "The CloudStack Team",
+ "Password reset mail template. This uses mustache template engine.
Available " +
+ "variables are: username, firstName, lastName, resetLink,
token",
+ true,
+ ConfigKey.Scope.Global);
+
+ @Override
+ public String getConfigComponentName() {
+ return PasswordResetImpl.class.getSimpleName();
+ }
+
+ @Override
+ public ConfigKey<?>[] getConfigKeys() {
+ return new ConfigKey<?>[]{PasswordResetTtl,
+ PasswordResetEmailSender,
+ PasswordResetSMTPHost,
+ PasswordResetSMTPPort,
+ PasswordResetSMTPUseAuth,
+ PasswordResetSMTPUsername,
+ PasswordResetSMTPPassword,
+ PasswordResetMailTemplate
+ };
+ }
+
+ @Override
+ public boolean configure(String name, Map<String, Object> params) throws
ConfigurationException {
+ String smtpHost = PasswordResetSMTPHost.value();
+ Integer smtpPort = PasswordResetSMTPPort.value();
+ Boolean useAuth = PasswordResetSMTPUseAuth.value();
+ String username = PasswordResetSMTPUsername.value();
+ String password = PasswordResetSMTPPassword.value();
+
+ String namespace = "password.reset.smtp";
+
+ Map<String, String> configs = new HashMap<>();
+
+ configs.put(getKey(namespace, SMTPMailSender.CONFIG_HOST), smtpHost);
Review Comment:
I think we also need to check whether all these values are filled before
sending the reset email.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
