Skip to content

Commit 368c511

Browse files
committed
server: add missing user.password.reset.smtp.enabledSecurityProtocols for password reset
1 parent 675cd63 commit 368c511

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ public interface UserPasswordResetManager {
6161
true,
6262
ConfigKey.Scope.Global);
6363

64+
ConfigKey<String> UserPasswordResetSMTPEnabledSecurityProtocols = new ConfigKey<String>(ConfigKey.CATEGORY_ADVANCED,
65+
String.class, "user.password.reset.smtp.enabledSecurityProtocols", "",
66+
"White-space separated security protocols; ex: \"TLSv1 TLSv1.1\". Supported protocols: SSLv2Hello, SSLv3, TLSv1, TLSv1.1 and TLSv1.2",
67+
true, ConfigKey.Kind.WhitespaceSeparatedListWithOptions, "SSLv2Hello,SSLv3,TLSv1,TLSv1.1,TLSv1.2");
68+
6469
ConfigKey<String> UserPasswordResetSMTPUsername = new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED,
6570
String.class, "user.password.reset.smtp.username", null,
6671
"Username for SMTP server for sending emails for resetting password for ACS users",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ public ConfigKey<?>[] getConfigKeys() {
9494
UserPasswordResetSMTPPort,
9595
UserPasswordResetSMTPUseAuth,
9696
UserPasswordResetSMTPUseStartTLS,
97+
UserPasswordResetSMTPEnabledSecurityProtocols,
9798
UserPasswordResetSMTPUsername,
9899
UserPasswordResetSMTPPassword,
99100
PasswordResetMailTemplate

0 commit comments

Comments
 (0)