From 26ea65ddb178d8c2286fbc431d17d5592615fcee Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Mon, 28 Jan 2008 16:04:38 +0000 Subject: [PATCH] SEC-652: Add a trustPassword to AbstractTicketValidator for use with password protected keystores (as in the sample application). --- .../ticketvalidator/AbstractTicketValidator.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/core/src/main/java/org/springframework/security/providers/cas/ticketvalidator/AbstractTicketValidator.java b/core/src/main/java/org/springframework/security/providers/cas/ticketvalidator/AbstractTicketValidator.java index 3b9c69f59d..4fccdf99aa 100644 --- a/core/src/main/java/org/springframework/security/providers/cas/ticketvalidator/AbstractTicketValidator.java +++ b/core/src/main/java/org/springframework/security/providers/cas/ticketvalidator/AbstractTicketValidator.java @@ -44,6 +44,7 @@ public abstract class AbstractTicketValidator implements TicketValidator, Initia private ServiceProperties serviceProperties; private String casValidate; private String trustStore; + private String trustPassword; //~ Methods ======================================================================================================== @@ -60,6 +61,10 @@ public abstract class AbstractTicketValidator implements TicketValidator, Initia System.setProperty("javax.net.ssl.trustStore", trustStore); } + + if (StringUtils.hasLength(trustPassword)) { + System.setProperty("javax.net.ssl.trustStorePassword", trustPassword); + } } /** @@ -97,4 +102,13 @@ public abstract class AbstractTicketValidator implements TicketValidator, Initia public void setTrustStore(String trustStore) { this.trustStore = trustStore; } + + /** + * Optional property which causes the system property javax.net.ssl.trustStorePassword to be set. + * + * @param trustPassword + */ + public void setTrustPassword(String trustPassword) { + this.trustPassword = trustPassword; + } }