Add property option for mail.smtp.ssl.protocols

k8s/matchers/uaa_config_structs.go

@@ -61,10 +61,11 @@ type Database struct {
 }
 
 type Smtp struct {
-	Host        string `yaml:"host"`
-	Port        string `yaml:"port"`
-	Starttls    string `yaml:"starttls"`
-	FromAddress string `yaml:"from_address"`
+	Host         string `yaml:"host"`
+	Port         string `yaml:"port"`
+	Starttls     string `yaml:"starttls"`
+	FromAddress  string `yaml:"from_address"`
+	Sslprotocols string `yaml:"sslprotocols"`
 }
 
 type OauthClient struct {

k8s/templates/uaa.lib.yml

@@ -23,6 +23,7 @@ smtp:
   port: #@ data.values.smtp.port
   starttls: #@ data.values.smtp.starttls
   from_address: #@ data.values.smtp.from_address
+  sslprotocols: #@ data.values.smtp.sslprotocols
 
 oauth:
   client:

k8s/templates/values/_values.yml

@@ -64,6 +64,7 @@ smtp:
   password: ~
   starttls: ~
   from_address: ~
+  sslprotocols: ~
 
 admin:
   client_secret: ~

k8s/test/config_map_test.go

@@ -130,6 +130,7 @@ logger.cfIdentity.appenderRef.uaaDefaultAppender.ref = UaaDefaultAppender`
 					"smtp.port":         "smtp port",
 					"smtp.starttls":     "smtp starttls",
 					"smtp.from_address": "smtp from_address",
+					"smtp.sslprotocols": "smtp sslprotocols",
 					"issuer.uri":        "http://some.example.com/with/path",
 				})
 
@@ -145,10 +146,11 @@ logger.cfIdentity.appenderRef.uaaDefaultAppender.ref = UaaDefaultAppender`
 									"Url":      Equal("any other database connection string"),
 								}),
 								"Smtp": MatchFields(IgnoreExtras, Fields{
-									"Host":        Equal("smtp host"),
-									"Port":        Equal("smtp port"),
-									"Starttls":    Equal("smtp starttls"),
-									"FromAddress": Equal("smtp from_address"),
+									"Host":         Equal("smtp host"),
+									"Port":         Equal("smtp port"),
+									"Starttls":     Equal("smtp starttls"),
+									"Sslprotocols": Equal("smtp sslprotocols"),
+									"FromAddress":  Equal("smtp from_address"),
 								}),
 							})
 						}),

server/src/main/resources/spring/login-ui.xml

@@ -452,7 +452,7 @@
             <props>
                 <prop key="mail.smtp.auth">${smtp.auth:false}</prop>
                 <prop key="mail.smtp.starttls.enable">${smtp.starttls:false}</prop>
-                <prop key="mail.smtp.ssl.protocols">${smtp.protocols:TLSv1.2 TLSv1.4}</prop>
+                <prop key="mail.smtp.ssl.protocols">${smtp.sslprotocols:TLSv1.2}</prop>
             </props>
         </property>
     </bean>