[java-identity-provider] branch master updated: IDP-1372 - shibboleth.ComputedIdExceptionMap can't affect eduPersonTargetedID
Scott Cantor
cantor.2 at osu.edu
Mon Jun 24 11:49:06 EDT 2019
This is an automated email from the git hooks/post-receive script.
scantor 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=7086e41b74e2e50d8ca9c8c10835ea8db97d6fd1
The following commit(s) were added to refs/heads/master by this push:
new 7086e41 IDP-1372 - shibboleth.ComputedIdExceptionMap can't affect eduPersonTargetedID
7086e41 is described below
commit 7086e41b74e2e50d8ca9c8c10835ea8db97d6fd1
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jun 24 11:49:02 2019 -0400
IDP-1372 - shibboleth.ComputedIdExceptionMap can't affect
eduPersonTargetedID
https://issues.shibboleth.net/jira/browse/IDP-1372
Added exceptionMapRef to ComputedId and StoredId connectors.
---
.../spring/dc/impl/ComputedIdDataConnectorParser.java | 4 ++++
.../dc/rdbms/rdbms-attribute-resolver-spring-context.xml | 13 ++++++++++++-
.../resolver/spring/dc/resolver/storedBeanManaged.xml | 1 +
.../resources/schema/shibboleth-attribute-resolver.xsd | 16 ++++++++++++++++
4 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java
index d59b87a..19be01c 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java
@@ -72,6 +72,10 @@ public class ComputedIdDataConnectorParser extends PairwiseIdDataConnectorParser
if (config.hasAttributeNS(null, "encoding")) {
builder.addPropertyValue("encoding", config.getAttributeNS(null, "encoding"));
}
+
+ if (config.hasAttributeNS(null, "exceptionMapRef")) {
+ builder.addPropertyReference("exceptionMap", config.getAttributeNS(null, "exceptionMapRef"));
+ }
final String salt;
if (config.hasAttributeNS(null, "salt")) {
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-context.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-context.xml
index ac57a2b..fa57646 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-context.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-context.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
default-init-method="initialize"
default-destroy-method="destroy">
@@ -27,4 +29,13 @@
</property>
</bean>
<bean id="validator" class="net.shibboleth.idp.attribute.resolver.dc.rdbms.impl.DataSourceValidator" p:dataSource-ref="dataSource" p:throwValidateError="true" />
+
+ <util:map id="computedIdExceptions">
+ <entry key="*"> <!-- all users -->
+ <map>
+ <entry key="https://legacysp.example.org/sp" value="legacysalt" />
+ </map>
+ </entry>
+ </util:map>
+
</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/storedBeanManaged.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/storedBeanManaged.xml
index 297bdcf..834d6d8 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/storedBeanManaged.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/storedBeanManaged.xml
@@ -8,6 +8,7 @@
retryableErrors="25000 25001"
generatedAttributeID="jenny"
salt="abcdefghijklmnopqrst"
+ exceptionMapRef="computedIdExceptions"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
diff --git a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
index c20c476..70644ec 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
@@ -713,6 +713,14 @@
</documentation>
</annotation>
</attribute>
+ <attribute name="exceptionMapRef" type="string">
+ <annotation>
+ <documentation>
+ Spring bean reference to a map of overrides that alter salt or suppress generation
+ for particular users/services.
+ </documentation>
+ </annotation>
+ </attribute>
</extension>
</complexContent>
</complexType>
@@ -1443,6 +1451,14 @@
</documentation>
</annotation>
</attribute>
+ <attribute name="exceptionMapRef" type="string">
+ <annotation>
+ <documentation>
+ Spring bean reference to a map of overrides that alter salt or suppress generation
+ for particular users/services.
+ </documentation>
+ </annotation>
+ </attribute>
</extension>
</complexContent>
</complexType>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list