[java-plugin-shibd-saml] branch main updated: Remove overridden NameID decoder from test config, IdP handles it now.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 24 21:29:53 UTC 2025
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-plugin-shibd-saml.
View the commit online:
http://git.shibboleth.net/view/?p=java-plugin-shibd-saml.git;a=commit;h=8de3c8b13ca497bb2626703bfa4f86b2755dbc7d
The following commit(s) were added to refs/heads/main by this push:
new 8de3c8b Remove overridden NameID decoder from test config, IdP handles it now.
8de3c8b is described below
commit 8de3c8b13ca497bb2626703bfa4f86b2755dbc7d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 24 17:29:51 2025 -0400
Remove overridden NameID decoder from test config, IdP handles it now.
---
.../flows/saml2/SAML2TokenConsumerFlowTest.java | 2 +-
.../idp/module/conf/attributes/default-rules.xml | 31 -------------
.../idp/module/conf/attributes/nameid-testing.xml | 54 ----------------------
3 files changed, 1 insertion(+), 86 deletions(-)
diff --git a/sp-saml-conf-impl/src/test/java/net/shibboleth/sp/saml/flows/saml2/SAML2TokenConsumerFlowTest.java b/sp-saml-conf-impl/src/test/java/net/shibboleth/sp/saml/flows/saml2/SAML2TokenConsumerFlowTest.java
index 152641e..3a2df85 100644
--- a/sp-saml-conf-impl/src/test/java/net/shibboleth/sp/saml/flows/saml2/SAML2TokenConsumerFlowTest.java
+++ b/sp-saml-conf-impl/src/test/java/net/shibboleth/sp/saml/flows/saml2/SAML2TokenConsumerFlowTest.java
@@ -543,7 +543,7 @@ public class SAML2TokenConsumerFlowTest extends AbstractSPFlowTest {
mutableIds.remove(attr.name());
if ("mail".equals(attr.name())) {
Assert.assertEquals(attr.asList().stream().map(DDF::string).toList(),
- CollectionSupport.singletonList("jdoe at example.org!!https://idp.example.org!!https://testsp.example.org"));
+ CollectionSupport.singletonList("jdoe at example.org"));
} else if ("displayName".equals(attr.name())) {
Assert.assertEquals(attr.asList().stream().map(DDF::string).toList(),
CollectionSupport.singletonList("John Doe"));
diff --git a/sp-saml-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml b/sp-saml-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml
deleted file mode 100644
index 96cb402..0000000
--- a/sp-saml-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-
- <!-- Default Attribute transcoding rules. -->
-
- <!--
- Many if not most of these attributes are not suited or may even be actively discouraged
- from use in federated protocols, but this is merely a set of well-known definitions, not
- a recommended set to support or use.
- -->
-
- <import resource="inetOrgPerson.xml" />
- <import resource="eduPerson.xml" />
- <import resource="eduCourse.xml" />
- <import resource="schac.xml" />
- <import resource="samlSubject.xml" />
-
- <import resource="nameid-testing.xml" />
-
-</beans>
diff --git a/sp-saml-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attributes/nameid-testing.xml b/sp-saml-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attributes/nameid-testing.xml
deleted file mode 100644
index 3a5a8fb..0000000
--- a/sp-saml-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attributes/nameid-testing.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-
- <!--
- Note that all built-in rules rely on URI-naming and thus include the implied settings:
-
- <prop key="saml2.nameFormat">urn:oasis:names:tc:SAML:2.0:attrname-format:uri</prop>
- <prop key="saml1.namespace">urn:mace:shibboleth:1.0:attributeNamespace:uri</prop>
- -->
-
- <!-- https://tools.ietf.org/html/rfc2798 -->
-
- <bean parent="shibboleth.TranscodingRuleLoader">
- <constructor-arg>
- <list>
-
- <bean parent="shibboleth.TranscodingProperties">
- <property name="properties">
- <props merge="true">
- <prop key="id">mail</prop>
- <prop key="transcoder">SAML2StringNameIDTranscoder</prop>
- <prop key="saml2.nameFormat">urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</prop>
- <prop key="saml2.defaultQualifiers">true</prop>
- <prop key="displayName.en">E-mail</prop>
- <prop key="displayName.de">E-Mail</prop>
- <prop key="displayName.fr">Email</prop>
- <prop key="displayName.it">E-mail</prop>
- <prop key="displayName.ja">メールアドレス</prop>
- <prop key="description.en">E-Mail: Preferred address for e-mail to be sent to this person</prop>
- <prop key="description.de">E-Mail-Adresse</prop>
- <prop key="description.de-ch">E-Mail Adresse</prop>
- <prop key="description.fr">Adresse de courrier électronique</prop>
- <prop key="description.it">E-Mail: l'indirizzo e-mail preferito dall'utente</prop>
- <prop key="description.ja">メールアドレス</prop>
- </props>
- </property>
- </bean>
-
- </list>
- </constructor-arg>
- </bean>
-
-</beans>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list