[java-identity-provider] branch master updated: IDP-1161 Conform CAS service comparator config.

[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=03c81f2e3549d00575bb97d2321af4c6bfa7b156

The following commit(s) were added to refs/heads/master by this push:
       new  03c81f2   IDP-1161 Conform CAS service comparator config.
03c81f2 is described below

commit 03c81f2e3549d00575bb97d2321af4c6bfa7b156
Author: Marvin S. Addison <serac at vt.edu>
AuthorDate: Thu Jun 14 08:18:18 2018 -0400

    IDP-1161 Conform CAS service comparator config.
    
    Define a default bean for CAS service URL comparison in system config
    that can be overridden in user-space cas-protocol.xml.
---
 idp-conf/src/main/resources/conf/cas-protocol.xml                | 8 ++++++++
 idp-conf/src/main/resources/system/conf/cas-protocol-system.xml  | 3 +++
 idp-conf/src/main/resources/system/conf/relying-party-system.xml | 3 ++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/idp-conf/src/main/resources/conf/cas-protocol.xml b/idp-conf/src/main/resources/conf/cas-protocol.xml
index d0b3d55..1c2ce92 100644
--- a/idp-conf/src/main/resources/conf/cas-protocol.xml
+++ b/idp-conf/src/main/resources/conf/cas-protocol.xml
@@ -67,6 +67,14 @@
           class="com.google.common.base.Predicates"
           factory-method="alwaysFalse" />
 
+    <!--
+       | Uncomment the following bean if you want to ignore jsessionid artifacts in service URLs.
+       | Those sorts of URLs are commonly emitted by Java servlet-based web applications.
+       -->
+    <!--<bean id="shibboleth.CASServiceComparator"
+          class="net.shibboleth.idp.cas.service.impl.DefaultServiceComparator"
+          c:parameterNames="[a-z]+sessionid" />-->
+
 
     <!-- ============== Advanced CAS Configuration ============== -->
 
diff --git a/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml b/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml
index 30f21b7..3591d0b 100644
--- a/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml
+++ b/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml
@@ -43,6 +43,9 @@
           class="com.google.common.base.Predicates"
           factory-method="alwaysFalse" />
 
+    <bean id="shibboleth.DefaultCASServiceComparator"
+          class="net.shibboleth.idp.cas.service.impl.DefaultServiceComparator" />
+
     <import resource="../../conf/cas-protocol.xml" />
 
 </beans>
\ No newline at end of file
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 6a7a759..6276b33 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,8 @@
     <!-- 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: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.