[java-identity-provider] branch master updated: IDP-1150 Set default PGT period in constructor.

[Marvin S. Addison]

This is an automated email from the git hooks/post-receive script.

serac pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=302a2f7f84c5cc1cc04f2e5772729a590b1e6516

The following commit(s) were added to refs/heads/master by this push:
       new  302a2f7   IDP-1150 Set default PGT period in constructor.
302a2f7 is described below

commit 302a2f7f84c5cc1cc04f2e5772729a590b1e6516
Author: Marvin S. Addison <serac at vt.edu>
AuthorDate: Thu Jun 14 14:46:42 2018 -0400

    IDP-1150 Set default PGT period in constructor.
    
    Set ticketValidityPeriod for ValidateConfiguration by calling superclass
    constructor with value that is appropriate for proxy-granting tickets
    (PGT), 12 hours.
    
    See https://issues.shibboleth.net/jira/browse/IDP-1150
---
 .../idp/cas/config/impl/AbstractProtocolConfiguration.java   | 12 +++++++++++-
 .../idp/cas/config/impl/ValidateConfiguration.java           |  4 +++-
 .../main/resources/system/conf/relying-party-mddriven.xml    |  1 -
 .../src/main/resources/system/conf/relying-party-system.xml  |  1 -
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProtocolConfiguration.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProtocolConfiguration.java
index dca1e61..7ea84d8 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProtocolConfiguration.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/AbstractProtocolConfiguration.java
@@ -67,9 +67,19 @@ public abstract class AbstractProtocolConfiguration extends AbstractConditionalP
      * @param profileId Unique profile identifier.
      */
     public AbstractProtocolConfiguration(@Nonnull @NotEmpty final String profileId) {
+        this(profileId, 15000L);
+    }
+
+    /**
+     * Creates a new configuration instance.
+     *
+     * @param profileId Unique profile identifier.
+     * @param ticketTTL Ticket validity period in milliseconds.
+     */
+    public AbstractProtocolConfiguration(@Nonnull @NotEmpty final String profileId, @Positive long ticketTTL) {
         super(profileId);
         resolveAttributesPredicate = Predicates.alwaysTrue();
-        ticketValidityPeriod = 15000L;
+        ticketValidityPeriod = ticketTTL;
         setSecurityConfiguration(new SecurityConfiguration(TimeUnit.MILLISECONDS.convert(5, TimeUnit.MINUTES),
                 new TicketIdentifierGenerationStrategy(getDefaultTicketPrefix(), getDefaultTicketLength())));
     }
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/ValidateConfiguration.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/ValidateConfiguration.java
index a4452e0..0eabf72 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/ValidateConfiguration.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/config/impl/ValidateConfiguration.java
@@ -73,7 +73,9 @@ public class ValidateConfiguration extends AbstractProtocolConfiguration {
 
     /** Creates a new instance. */
     public ValidateConfiguration() {
-        super(PROFILE_ID);
+        // Ticket validity period for this configuration container applies to proxy-granting tickets
+        // Default to 12H
+        super(PROFILE_ID, 12 * 60 * 60 * 1000);
         
         pgtIOUGenerator = new TicketIdentifierGenerationStrategy("PGTIOU", 50);
         serviceComparator = new DefaultServiceComparator();
diff --git a/idp-conf/src/main/resources/system/conf/relying-party-mddriven.xml b/idp-conf/src/main/resources/system/conf/relying-party-mddriven.xml
index 8e2a0a6..200d240 100644
--- a/idp-conf/src/main/resources/system/conf/relying-party-mddriven.xml
+++ b/idp-conf/src/main/resources/system/conf/relying-party-mddriven.xml
@@ -465,7 +465,6 @@
     <bean id="CAS.ProxyConfiguration.MDDriven" parent="AbstractMDDrivenCASProfile" lazy-init="true"
         class="net.shibboleth.idp.cas.config.impl.ProxyConfiguration" />
 
-    <!-- TODO: ticketValidityPeriod default here needs its default overridden, see IDP-1150. -->
     <bean id="CAS.ValidateConfiguration.MDDriven" parent="AbstractMDDrivenCASProfile" lazy-init="true"
             class="net.shibboleth.idp.cas.config.impl.ValidateConfiguration">
         <property name="serviceComparatorLookupStrategy">
diff --git a/idp-conf/src/main/resources/system/conf/relying-party-system.xml b/idp-conf/src/main/resources/system/conf/relying-party-system.xml
index 6276b33..4183b74 100644
--- a/idp-conf/src/main/resources/system/conf/relying-party-system.xml
+++ b/idp-conf/src/main/resources/system/conf/relying-party-system.xml
@@ -117,7 +117,6 @@
     <!-- Ticket validity period applies to proxy-granting tickets created upon successful proxy callback validation -->
     <bean id="CAS.ValidateConfiguration" parent="AbstractProfileConfig" lazy-init="true"
         class="net.shibboleth.idp.cas.config.impl.ValidateConfiguration"
-        p:ticketValidityPeriod="PT12H"
         p:serviceComparator="#{getObject('shibboleth.CASServiceComparator') ?: getObject('shibboleth.DefaultCASServiceComparator')}" />
 
     <!-- Artifact Configuration Defaults -->

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.