Skip to content

Remove Domain/IP from Password Reset Link to custom Global Setting #11379

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
merged 6 commits into from
Aug 31, 2025
Merged

Remove Domain/IP from Password Reset Link to custom Global Setting #11379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b6c3fbc
Remove Domain/IP from Password Reset Link to custom Global Setting
Aug 1, 2025
1745c33
Update UserPasswordResetManagerImpl.java
daviftorres Aug 2, 2025
5efad39
updated global setting example
Aug 6, 2025
b025a9c
Update server/src/main/java/org/apache/cloudstack/user/UserPasswordRe…
daviftorres Aug 15, 2025
abd87c2
Update UserPasswordResetManager.java
daviftorres Aug 15, 2025
919f1f8
Creates the variable
Aug 15, 2025
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
5 changes: 5 additions & 0 deletions server/src/main/java/org/apache/cloudstack/user/UserPasswordResetManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ public interface UserPasswordResetManager {
"Password for SMTP server for sending emails for resetting password for ACS users",
false, ConfigKey.Scope.Global);

ConfigKey<String> UserPasswordResetDomainURL = new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED,
String.class, "user.password.reset.mail.domain.url", null,
"Domain URL for reset password links sent to the user via email", true,
ConfigKey.Scope.Global);

void setResetTokenAndSend(UserAccount userAccount);

boolean validateAndResetPassword(UserAccount user, String token, String password);
Expand Down
9 changes: 5 additions & 4 deletions server/src/main/java/org/apache/cloudstack/user/UserPasswordResetManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
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;

Expand All @@ -69,7 +68,7 @@ public class UserPasswordResetManagerImpl extends ManagerBase implements UserPas
new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, String.class,
"user.password.reset.mail.template", "Hello {{username}}!\n" +
"You have requested to reset your password. Please click the following link to reset your password:\n" +
"http://{{{resetLink}}}\n" +
"{{{domainUrl}}}{{{resetLink}}}\n" +
"If you did not request a password reset, please ignore this email.\n" +
"\n" +
"Regards,\n" +
Expand All @@ -95,6 +94,7 @@ public ConfigKey<?>[] getConfigKeys() {
UserPasswordResetSMTPUseAuth,
UserPasswordResetSMTPUsername,
UserPasswordResetSMTPPassword,
UserPasswordResetDomainURL,
PasswordResetMailTemplate
};
}
Expand Down Expand Up @@ -173,9 +173,10 @@ public void setResetTokenAndSend(UserAccount userAccount) {
final String email = userAccount.getEmail();
final String username = userAccount.getUsername();
final String subject = "Password Reset Request";
final String domainUrl = UserPasswordResetDomainURL.value();

String resetLink = String.format("%s/client/#/user/resetPassword?username=%s&token=%s",
ManagementServerAddresses.value().split(",")[0], username, resetToken);
String resetLink = String.format("/client/#/user/resetPassword?username=%s&token=%s",
username, resetToken);
String content = getMessageBody(userAccount, resetToken, resetLink);

SMTPMailProperties mailProperties = new SMTPMailProperties();
Expand Down
Loading