[java-identity-provider] branch master updated: IDP-1413 - Clean up StoredID support classes/interfaces/beans
Scott Cantor
cantor.2 at osu.edu
Tue Feb 19 11:23:34 EST 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=8ae2ffbd6e68af05739df00f267bd257f7af9644
The following commit(s) were added to refs/heads/master by this push:
new 8ae2ffb IDP-1413 - Clean up StoredID support classes/interfaces/beans
8ae2ffb is described below
commit 8ae2ffbd6e68af05739df00f267bd257f7af9644
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 19 11:23:24 2019 -0500
IDP-1413 - Clean up StoredID support classes/interfaces/beans
https://issues.shibboleth.net/jira/browse/IDP-1413
Add generic PairwiseId connector parser/schema.
Rename parser types to match ID/Id convention.
---
...ser.java => ComputedIdDataConnectorParser.java} | 4 +--
...arser.java => StoredIdDataConnectorParser.java} | 4 +--
.../impl/AttributeResolverNamespaceHandler.java | 13 +++++----
...java => ComputedIdDataConnectorParserTest.java} | 6 ++---
...t.java => StoredIdDataConnectorParserTest.java} | 6 ++---
.../schema/shibboleth-attribute-resolver.xsd | 31 ++++++++++++++++++++++
6 files changed, 49 insertions(+), 15 deletions(-)
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
similarity index 97%
rename from idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIDDataConnectorParser.java
rename to idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java
index c7a45ac..b55c8e9 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
@@ -33,14 +33,14 @@ import org.w3c.dom.Element;
/**
* Spring bean definition parser for configuring {@link ComputedIDDataConnector}.
*/
-public class ComputedIDDataConnectorParser extends PairwiseIdDataConnectorParser {
+public class ComputedIdDataConnectorParser extends PairwiseIdDataConnectorParser {
/** Schema type - resolver. */
@Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"ComputedId");
/** Class logger. */
- @Nonnull private final Logger log = LoggerFactory.getLogger(ComputedIDDataConnectorParser.class);
+ @Nonnull private final Logger log = LoggerFactory.getLogger(ComputedIdDataConnectorParser.class);
/** {@inheritDoc} */
@Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIDDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParser.java
similarity index 97%
rename from idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIDDataConnectorParser.java
rename to idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParser.java
index ee77c0c..b04f2b9 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIDDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParser.java
@@ -35,14 +35,14 @@ import org.w3c.dom.Element;
/**
* Spring bean definition parser for {@link StoredIDDataConnector}.
*/
-public class StoredIDDataConnectorParser extends ComputedIDDataConnectorParser {
+public class StoredIdDataConnectorParser extends ComputedIdDataConnectorParser {
/** Schema type - resolver. */
@Nonnull public static final QName TYPE_NAME_RESOLVER =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "StoredId");
/** Class logger. */
- @Nonnull private final Logger log = LoggerFactory.getLogger(StoredIDDataConnectorParser.class);
+ @Nonnull private final Logger log = LoggerFactory.getLogger(StoredIdDataConnectorParser.class);
/** {@inheritDoc} */
@Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java
index 0b03fbd..42e2c37 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java
@@ -37,10 +37,11 @@ import net.shibboleth.idp.attribute.resolver.spring.ad.mapped.impl.MappedAttribu
import net.shibboleth.idp.attribute.resolver.spring.ad.mapped.impl.SourceValueParser;
import net.shibboleth.idp.attribute.resolver.spring.ad.mapped.impl.ValueMapParser;
import net.shibboleth.idp.attribute.resolver.spring.dc.http.impl.HTTPDataConnectorParser;
-import net.shibboleth.idp.attribute.resolver.spring.dc.impl.ComputedIDDataConnectorParser;
+import net.shibboleth.idp.attribute.resolver.spring.dc.impl.ComputedIdDataConnectorParser;
+import net.shibboleth.idp.attribute.resolver.spring.dc.impl.PairwiseIdDataConnectorParser;
import net.shibboleth.idp.attribute.resolver.spring.dc.impl.ScriptDataConnectorParser;
import net.shibboleth.idp.attribute.resolver.spring.dc.impl.StaticDataConnectorParser;
-import net.shibboleth.idp.attribute.resolver.spring.dc.impl.StoredIDDataConnectorParser;
+import net.shibboleth.idp.attribute.resolver.spring.dc.impl.StoredIdDataConnectorParser;
import net.shibboleth.idp.attribute.resolver.spring.dc.ldap.impl.LDAPDataConnectorParser;
import net.shibboleth.idp.attribute.resolver.spring.dc.rdbms.impl.RDBMSDataConnectorParser;
import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML1Base64AttributeEncoderParser;
@@ -99,14 +100,16 @@ public class AttributeResolverNamespaceHandler extends BaseSpringNamespaceHandle
new MappedAttributeDefinitionParser());
// Data Connectors
- registerBeanDefinitionParser(ComputedIDDataConnectorParser.TYPE_NAME_RESOLVER,
- new ComputedIDDataConnectorParser());
+ registerBeanDefinitionParser(ComputedIdDataConnectorParser.TYPE_NAME_RESOLVER,
+ new ComputedIdDataConnectorParser());
registerBeanDefinitionParser(RDBMSDataConnectorParser.TYPE_NAME_RESOLVER, new RDBMSDataConnectorParser());
registerBeanDefinitionParser(LDAPDataConnectorParser.TYPE_NAME_RESOLVER, new LDAPDataConnectorParser());
+ registerBeanDefinitionParser(PairwiseIdDataConnectorParser.TYPE_NAME_RESOLVER,
+ new PairwiseIdDataConnectorParser());
registerBeanDefinitionParser(HTTPDataConnectorParser.TYPE_NAME, new HTTPDataConnectorParser());
registerBeanDefinitionParser(ScriptDataConnectorParser.TYPE_NAME_RESOLVER, new ScriptDataConnectorParser());
registerBeanDefinitionParser(StaticDataConnectorParser.TYPE_NAME_RESOLVER, new StaticDataConnectorParser());
- registerBeanDefinitionParser(StoredIDDataConnectorParser.TYPE_NAME_RESOLVER, new StoredIDDataConnectorParser());
+ registerBeanDefinitionParser(StoredIdDataConnectorParser.TYPE_NAME_RESOLVER, new StoredIdDataConnectorParser());
// Encoders
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIdDataConnectorParserTest.java
similarity index 97%
rename from idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java
rename to idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIdDataConnectorParserTest.java
index 09f9757..e031b73 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIdDataConnectorParserTest.java
@@ -31,13 +31,13 @@ import net.shibboleth.idp.attribute.impl.ComputedPairwiseIdStore;
import net.shibboleth.idp.attribute.impl.ComputedPairwiseIdStore.Encoding;
import net.shibboleth.idp.attribute.resolver.dc.impl.PairwiseIdDataConnector;
import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.idp.attribute.resolver.spring.dc.impl.ComputedIDDataConnectorParser;
+import net.shibboleth.idp.attribute.resolver.spring.dc.impl.ComputedIdDataConnectorParser;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * Test for {@link ComputedIDDataConnectorParser}.
+ * Test for {@link ComputedIdDataConnectorParser}.
*/
-public class ComputedIDDataConnectorParserTest extends BaseAttributeDefinitionParserTest {
+public class ComputedIdDataConnectorParserTest extends BaseAttributeDefinitionParserTest {
@Test public void withSalt() throws ComponentInitializationException {
final PairwiseIdDataConnector connector = getDataConnector("resolver/computed.xml", PairwiseIdDataConnector.class);
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIDDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIdDataConnectorParserTest.java
similarity index 97%
rename from idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIDDataConnectorParserTest.java
rename to idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIdDataConnectorParserTest.java
index 4bd2498..c3a5089 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIDDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIdDataConnectorParserTest.java
@@ -35,14 +35,14 @@ import net.shibboleth.idp.attribute.impl.JDBCPairwiseIdStore;
import net.shibboleth.idp.attribute.resolver.ResolverAttributeDefinitionDependency;
import net.shibboleth.idp.attribute.resolver.dc.impl.PairwiseIdDataConnector;
import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.idp.attribute.resolver.spring.dc.impl.StoredIDDataConnectorParser;
+import net.shibboleth.idp.attribute.resolver.spring.dc.impl.StoredIdDataConnectorParser;
import net.shibboleth.idp.attribute.resolver.spring.dc.rdbms.RDBMSDataConnectorParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * Test for {@link StoredIDDataConnectorParser}.
+ * Test for {@link StoredIdDataConnectorParser}.
*/
-public class StoredIDDataConnectorParserTest extends BaseAttributeDefinitionParserTest {
+public class StoredIdDataConnectorParserTest extends BaseAttributeDefinitionParserTest {
private void testIt(final PairwiseIdDataConnector connector) throws ComponentInitializationException {
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 faf3d60..8c54897 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
@@ -936,6 +936,37 @@
</complexContent>
</complexType>
+ <complexType name="PairwiseId">
+ <annotation>
+ <documentation>
+ An ID created by digesting the requesting entityID, an attribute value (usually a user identifier), and a salt.
+ </documentation>
+ </annotation>
+ <complexContent>
+ <extension base="resolver:BaseDataConnectorType">
+ <choice maxOccurs="unbounded" minOccurs="0">
+ <element ref="resolver:InputAttributeDefinition"/>
+ <element ref="resolver:InputDataConnector"/>
+ <element ref="resolver:FailoverDataConnector"/>
+ </choice>
+ <attribute name="pairwiseIdStoreRef" type="string" use="required">
+ <annotation>
+ <documentation>
+ Bean name of the PairwiseIdStore to use.
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="generatedAttributeID" type="string">
+ <annotation>
+ <documentation>
+ The name of the attribute produced by this data connector.
+ </documentation>
+ </annotation>
+ </attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
<complexType name="RelationalDatabase">
<annotation>
<documentation>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list