[java-identity-provider] branch main updated: Uncomment non-defaulted supportedPrincipals properties.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-identity-provider.

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

The following commit(s) were added to refs/heads/main by this push:
       new  7ffacae2e Uncomment non-defaulted supportedPrincipals properties.
7ffacae2e is described below

commit 7ffacae2e0183f3a35be482366ff0c01cc5a01a2
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Oct 27 17:40:06 2020 -0400

    Uncomment non-defaulted supportedPrincipals properties.
---
 .../net/shibboleth/idp/conf/authn-system.xml       | 32 ----------------------
 .../src/main/resources/conf/authn/authn.properties | 26 +++++++++---------
 2 files changed, 13 insertions(+), 45 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/authn-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/authn-system.xml
index dd829bc13..0567bb8e0 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/authn-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/authn-system.xml
@@ -72,10 +72,6 @@
             p:inactivityTimeout="%{idp.authn.IPAddress.inactivityTimeout:PT60S}"
             p:reuseCondition-ref="#{'%{idp.authn.IPAddress.reuseCondition:shibboleth.Conditions.TRUE}'.trim()}"
             p:activationCondition-ref="#{'%{idp.authn.IPAddress.activationCondition:shibboleth.Conditions.TRUE}'.trim()}">
-        <property name="supportedPrincipals">
-            <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocol" />
-        </property>
         <property name="supportedPrincipalsByString">
             <bean parent="shibboleth.CommaDelimStringArray"
                 c:_0="#{'%{idp.authn.IPAddress.supportedPrincipals:}'.trim()}" />
@@ -184,14 +180,6 @@
             p:inactivityTimeout="%{idp.authn.SPNEGO.inactivityTimeout:%{idp.authn.defaultTimeout:PT30M}}"
             p:reuseCondition-ref="#{'%{idp.authn.SPNEGO.reuseCondition:shibboleth.Conditions.TRUE}'.trim()}"
             p:activationCondition-ref="#{'%{idp.authn.SPNEGO.activationCondition:shibboleth.Conditions.TRUE}'.trim()}">
-        <property name="supportedPrincipals">
-            <list>
-                <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                    c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:Kerberos" />
-                <bean parent="shibboleth.SAML1AuthenticationMethod"
-                    c:method="urn:ietf:rfc:1510" />
-            </list>
-        </property>
         <property name="supportedPrincipalsByString">
             <bean parent="shibboleth.CommaDelimStringArray"
                 c:_0="#{'%{idp.authn.SPNEGO.supportedPrincipals:}'.trim()}" />
@@ -210,16 +198,6 @@
             p:inactivityTimeout="%{idp.authn.X509.inactivityTimeout:%{idp.authn.defaultTimeout:PT30M}}"
             p:reuseCondition-ref="#{'%{idp.authn.X509.reuseCondition:shibboleth.Conditions.TRUE}'.trim()}"
             p:activationCondition-ref="#{'%{idp.authn.X509.activationCondition:shibboleth.Conditions.TRUE}'.trim()}">
-        <property name="supportedPrincipals">
-            <list>
-                <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                    c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:X509" />
-                <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                    c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:TLSClient" />
-                <bean parent="shibboleth.SAML1AuthenticationMethod"
-                    c:method="urn:ietf:rfc:2246" />
-            </list>
-        </property>
         <property name="supportedPrincipalsByString">
             <bean parent="shibboleth.CommaDelimStringArray"
                 c:_0="#{'%{idp.authn.X509.supportedPrincipals:}'.trim()}" />
@@ -238,16 +216,6 @@
             p:inactivityTimeout="%{idp.authn.X509Internal.inactivityTimeout:%{idp.authn.defaultTimeout:PT30M}}"
             p:reuseCondition-ref="#{'%{idp.authn.X509Internal.reuseCondition:shibboleth.Conditions.TRUE}'.trim()}"
             p:activationCondition-ref="#{'%{idp.authn.X509Internal.activationCondition:shibboleth.Conditions.TRUE}'.trim()}">
-        <property name="supportedPrincipals">
-            <list>
-                <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                    c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:X509" />
-                <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                    c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:TLSClient" />
-                <bean parent="shibboleth.SAML1AuthenticationMethod"
-                    c:method="urn:ietf:rfc:2246" />
-            </list>
-        </property>
         <property name="supportedPrincipalsByString">
             <bean parent="shibboleth.CommaDelimStringArray"
                 c:_0="#{'%{idp.authn.X509Internal.supportedPrincipals:}'.trim()}" />
diff --git a/idp-conf/src/main/resources/conf/authn/authn.properties b/idp-conf/src/main/resources/conf/authn/authn.properties
index 33b76157c..c1395b1d7 100644
--- a/idp-conf/src/main/resources/conf/authn/authn.properties
+++ b/idp-conf/src/main/resources/conf/authn/authn.properties
@@ -119,9 +119,9 @@ idp.authn.External.externalAuthnPath = contextRelative:external.jsp
 #idp.authn.SPNEGO.enforceRun = false
 #idp.authn.SPNEGO.refreshKrbConfig = false
 #idp.authn.SPNEGO.matchExpression = 
-#idp.authn.SPNEGO.supportedPrincipals = \
-#    saml2/urn:oasis:names:tc:SAML:2.0:ac:classes:Kerberos, \
-#    saml1/urn:ietf:rfc:1510
+idp.authn.SPNEGO.supportedPrincipals = \
+    saml2/urn:oasis:names:tc:SAML:2.0:ac:classes:Kerberos, \
+    saml1/urn:ietf:rfc:1510
 
 #### X509 ####
 
@@ -129,19 +129,19 @@ idp.authn.External.externalAuthnPath = contextRelative:external.jsp
 #idp.authn.X509.nonBrowserSupported = false
 # Servlet context-relative path to wherever your implementation lives
 #idp.authn.X509.externalAuthnPath = contextRelative:x509-prompt.jsp
-#idp.authn.X509.supportedPrincipals = \
-#    saml2/urn:oasis:names:tc:SAML:2.0:ac:classes:X509, \
-#    saml2/urn:oasis:names:tc:SAML:2.0:ac:classes:TLSClient, \
-#    saml1/urn:ietf:rfc:2246
+idp.authn.X509.supportedPrincipals = \
+    saml2/urn:oasis:names:tc:SAML:2.0:ac:classes:X509, \
+    saml2/urn:oasis:names:tc:SAML:2.0:ac:classes:TLSClient, \
+    saml1/urn:ietf:rfc:2246
 
 #### X509Internal ####
 
 #idp.authn.X509Internal.order = 1000
 #idp.authn.X509Internal.nonBrowserSupported = false
-#idp.authn.X509Internal.supportedPrincipals = \
-#    saml2/urn:oasis:names:tc:SAML:2.0:ac:classes:X509, \
-#    saml2/urn:oasis:names:tc:SAML:2.0:ac:classes:TLSClient, \
-#    saml1/urn:ietf:rfc:2246
+idp.authn.X509Internal.supportedPrincipals = \
+    saml2/urn:oasis:names:tc:SAML:2.0:ac:classes:X509, \
+    saml2/urn:oasis:names:tc:SAML:2.0:ac:classes:TLSClient, \
+    saml1/urn:ietf:rfc:2246
 
 #### IPAddress ####
 
@@ -149,8 +149,8 @@ idp.authn.External.externalAuthnPath = contextRelative:external.jsp
 #idp.authn.IPAddress.passiveAuthenticationSupported = true
 #idp.authn.IPAddress.lifetime = PT60S
 #idp.authn.IPAddress.inactivityTimeout = PT60S
-#idp.authn.IPAddress.supportedPrincipals = \
-#   saml2/urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocol
+idp.authn.IPAddress.supportedPrincipals = \
+   saml2/urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocol
 
 #### Function ####
 

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