[java-idp-oidc] branch main updated: JOIDC-17 Repackaging into the net.shibboleth.* -namespace
Henri Mikkonen
henri.mikkonen at iki.fi
Fri Jan 29 11:28:38 UTC 2021
This is an automated email from the git hooks/post-receive script.
hjmikkon pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=0c50b97180038ed35fa797bcd157f5313d0e7503
The following commit(s) were added to refs/heads/main by this push:
new 0c50b971 JOIDC-17 Repackaging into the net.shibboleth.* -namespace
0c50b971 is described below
commit 0c50b97180038ed35fa797bcd157f5313d0e7503
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Jan 29 13:19:45 2021 +0200
JOIDC-17 Repackaging into the net.shibboleth.* -namespace
https://issues.shibboleth.net/jira/browse/JOIDC-17
XML namespaces:
org.geant.idpextension.oidc.attribute.encoder -> urn:mace:shibboleth:2.0:resolver:oidc
org.geant.idpextension.oidc.attribute.filter -> urn:mace:shibboleth:2.0:afp:oidc
The resolver plugins (and their unit tests) were moved to the oidc-common library. See:
https://issues.shibboleth.net/jira/browse/JCOMOIDC-8
---
.../impl/AttributeFilterNamespaceHandler.java | 2 +-
.../enc/impl/AttributeEncoderNamespaceHandler.java | 41 --------
.../enc/impl/BaseOIDCAttributeEncoderParser.java | 67 -------------
.../spring/enc/impl/OIDCByteEncoderParser.java | 43 ---------
.../enc/impl/OIDCScopedStringEncoderParser.java | 60 ------------
.../spring/enc/impl/OIDCStringEncoderParser.java | 60 ------------
.../resolver/spring/enc/impl/package-info.java | 19 ----
.../src/main/resources/META-INF/spring.handlers | 3 +-
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../plugin/oidc/op/conf/oidc-attribute-filter.xml | 4 +-
.../oidc/op/conf/oidc-attribute-resolver.xml | 4 +-
.../idp-oidc-extension-attribute-encoder.xsd | 104 ---------------------
...c-extension-afp.xsd => shibboleth-afp-oidc.xsd} | 2 +-
.../spring/enc/impl/OIDCByteEncoderParserTest.java | 43 ---------
.../impl/OIDCScopedStringEncoderParserTest.java | 44 ---------
.../enc/impl/OIDCStringEncoderParserTest.java | 45 ---------
.../src/test/resources/conf/attribute-filter.xml | 4 +-
.../src/test/resources/conf/attribute-resolver.xml | 4 +-
.../idp/attribute/resolver/spring/customBean.xml | 39 --------
.../idp/attribute/resolver/spring/enc/oidcbyte.xml | 10 --
.../resolver/spring/enc/oidcscopedstring.xml | 10 --
.../attribute/resolver/spring/enc/oidcstring.xml | 12 ---
.../attribute/filter/matcher/requestedClaims.xml | 12 ++-
23 files changed, 21 insertions(+), 614 deletions(-)
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/impl/AttributeFilterNamespaceHandler.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/impl/AttributeFilterNamespaceHandler.java
index 710c8d5c..5a04a4ec 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/impl/AttributeFilterNamespaceHandler.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/filter/spring/impl/AttributeFilterNamespaceHandler.java
@@ -25,7 +25,7 @@ import net.shibboleth.idp.plugin.oidc.op.attribute.filter.spring.policyrule.impl
public class AttributeFilterNamespaceHandler extends BaseSpringNamespaceHandler {
/** oidc namespace. */
- public static final String NAMESPACE = "org.geant.idpextension.oidc.attribute.filter";
+ public static final String NAMESPACE = "urn:mace:shibboleth:2.0:afp:oidc";
/** {@inheritDoc} */
@Override
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/AttributeEncoderNamespaceHandler.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/AttributeEncoderNamespaceHandler.java
deleted file mode 100644
index 984114b5..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/AttributeEncoderNamespaceHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.plugin.oidc.op.attribute.resolver.spring.enc.impl;
-
-import javax.annotation.Nonnull;
-
-import net.shibboleth.ext.spring.util.BaseSpringNamespaceHandler;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
-/** Namespace handler for the oidc attribute resolver. */
-public class AttributeEncoderNamespaceHandler extends BaseSpringNamespaceHandler {
-
- /** Namespace for this handler. */
- @Nonnull
- @NotEmpty
- public static final String NAMESPACE = "org.geant.idpextension.oidc.attribute.encoder";
-
- /** {@inheritDoc} */
- @Override
- public void init() {
- registerBeanDefinitionParser(OIDCStringEncoderParser.TYPE_NAME, new OIDCStringEncoderParser());
- registerBeanDefinitionParser(OIDCScopedStringEncoderParser.TYPE_NAME, new OIDCScopedStringEncoderParser());
- registerBeanDefinitionParser(OIDCByteEncoderParser.TYPE_NAME, new OIDCByteEncoderParser());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/BaseOIDCAttributeEncoderParser.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/BaseOIDCAttributeEncoderParser.java
deleted file mode 100644
index e260abe8..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/BaseOIDCAttributeEncoderParser.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.plugin.oidc.op.attribute.resolver.spring.enc.impl;
-
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import net.shibboleth.idp.attribute.resolver.spring.enc.BaseAttributeEncoderParser;
-import net.shibboleth.oidc.attribute.transcoding.OIDCAttributeTranscoder;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
-/**
- * Base class for Spring bean definition parser for OIDC attribute encoders.
- */
-public abstract class BaseOIDCAttributeEncoderParser extends BaseAttributeEncoderParser {
-
- /** {@inheritDoc} */
- @Override
- protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
- @Nonnull final Map<String,Object> rule) {
-
- if (config.hasAttributeNS(null, "name")) {
- rule.put(OIDCAttributeTranscoder.PROP_NAME,
- StringSupport.trimOrNull(config.getAttributeNS(null, "name")));
- }
-
- if (config.hasAttributeNS(null, "asArray")) {
- rule.put(OIDCAttributeTranscoder.PROP_ASARRAY,
- StringSupport.trimOrNull(config.getAttributeNS(null, "asArray")));
- }
-
- if (config.hasAttributeNS(null, "asInt")) {
- rule.put(OIDCAttributeTranscoder.PROP_ASINTEGER,
- StringSupport.trimOrNull(config.getAttributeNS(null, "asInt")));
- }
-
- if (config.hasAttributeNS(null, "asBoolean")) {
- rule.put(OIDCAttributeTranscoder.PROP_ASBOOLEAN,
- StringSupport.trimOrNull(config.getAttributeNS(null, "asBoolean")));
- }
-
- if (config.hasAttributeNS(null, "stringDelimiter")) {
- rule.put(OIDCAttributeTranscoder.PROP_STRING_DELIMITER,
- StringSupport.trimOrNull(config.getAttributeNS(null, "stringDelimiter")));
- }
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCByteEncoderParser.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCByteEncoderParser.java
deleted file mode 100644
index 4a7466c6..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCByteEncoderParser.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.plugin.oidc.op.attribute.resolver.spring.enc.impl;
-
-import javax.annotation.Nonnull;
-import javax.xml.namespace.QName;
-
-import org.springframework.beans.factory.config.BeanReference;
-import org.springframework.beans.factory.config.RuntimeBeanReference;
-
-import net.shibboleth.oidc.attribute.transcoding.impl.OIDCByteAttributeTranscoder;
-
-/**
- * Spring bean definition parser for {@link OIDCByteAttributeTranscoder}.
- */
-public class OIDCByteEncoderParser extends BaseOIDCAttributeEncoderParser {
-
- /** Schema type name:. */
- @Nonnull
- public static final QName TYPE_NAME = new QName(AttributeEncoderNamespaceHandler.NAMESPACE, "OIDCByte");
-
- /** {@inheritDoc} */
- @Override
- protected BeanReference buildTranscoder() {
- return new RuntimeBeanReference("OIDCByteTranscoder");
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCScopedStringEncoderParser.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCScopedStringEncoderParser.java
deleted file mode 100644
index 04fdd29c..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCScopedStringEncoderParser.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.plugin.oidc.op.attribute.resolver.spring.enc.impl;
-
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-import javax.xml.namespace.QName;
-
-import org.springframework.beans.factory.config.BeanReference;
-import org.springframework.beans.factory.config.RuntimeBeanReference;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import net.shibboleth.oidc.attribute.transcoding.impl.OIDCScopedStringAttributeTranscoder;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
-/**
- * Spring bean definition parser for {@link OIDCScopedStringAttributeTranscoder}.
- */
-public class OIDCScopedStringEncoderParser extends BaseOIDCAttributeEncoderParser {
-
- /** Schema type name. */
- @Nonnull
- public static final QName TYPE_NAME = new QName(AttributeEncoderNamespaceHandler.NAMESPACE, "OIDCScopedString");
-
- /** {@inheritDoc} */
- @Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
- @Nonnull final Map<String,Object> rule) {
- super.doParse(config, parserContext, rule);
-
- if (config.hasAttributeNS(null, "scopeDelimiter")) {
- rule.put(OIDCScopedStringAttributeTranscoder.PROP_SCOPE_DELIMITER,
- StringSupport.trimOrNull(config.getAttributeNS(null, "scopeDelimiter")));
- }
-
- }
-
- /** {@inheritDoc} */
- @Override
- protected BeanReference buildTranscoder() {
- return new RuntimeBeanReference("OIDCScopedStringTranscoder");
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCStringEncoderParser.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCStringEncoderParser.java
deleted file mode 100644
index 87361427..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCStringEncoderParser.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.plugin.oidc.op.attribute.resolver.spring.enc.impl;
-
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-import javax.xml.namespace.QName;
-
-import org.springframework.beans.factory.config.BeanReference;
-import org.springframework.beans.factory.config.RuntimeBeanReference;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import net.shibboleth.oidc.attribute.transcoding.impl.OIDCStringAttributeTranscoder;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
-/**
- * Spring bean definition parser for {@link OIDCStringAttributeTranscoder}.
- */
-public class OIDCStringEncoderParser extends BaseOIDCAttributeEncoderParser {
-
- /** Schema type name:. */
- @Nonnull
- public static final QName TYPE_NAME = new QName(AttributeEncoderNamespaceHandler.NAMESPACE, "OIDCString");
-
- /** {@inheritDoc} */
- @Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
- @Nonnull final Map<String,Object> rule) {
- super.doParse(config, parserContext, rule);
-
- if (config.hasAttributeNS(null, "asObject")) {
- rule.put(OIDCStringAttributeTranscoder.PROP_ASOBJECT,
- StringSupport.trimOrNull(config.getAttributeNS(null, "asObject")));
- }
-
- }
-
- /** {@inheritDoc} */
- @Override
- protected BeanReference buildTranscoder() {
- return new RuntimeBeanReference("OIDCStringTranscoder");
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/package-info.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/package-info.java
deleted file mode 100644
index 35fae8c0..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** Attribute encoder namespace implementations.*/
-package net.shibboleth.idp.plugin.oidc.op.attribute.resolver.spring.enc.impl;
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/spring.handlers b/idp-oidc-extension-impl/src/main/resources/META-INF/spring.handlers
index c6173714..1c10d7b0 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/spring.handlers
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/spring.handlers
@@ -1,2 +1 @@
-org.geant.idpextension.oidc.attribute.encoder = net.shibboleth.idp.plugin.oidc.op.attribute.resolver.spring.enc.impl.AttributeEncoderNamespaceHandler
-org.geant.idpextension.oidc.attribute.filter = net.shibboleth.idp.plugin.oidc.op.attribute.filter.spring.impl.AttributeFilterNamespaceHandler
+urn\:mace\:shibboleth\:2.0\:afp\:oidc = net.shibboleth.idp.plugin.oidc.op.attribute.filter.spring.impl.AttributeFilterNamespaceHandler
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/spring.schemas b/idp-oidc-extension-impl/src/main/resources/META-INF/spring.schemas
index 031120eb..d0131483 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/spring.schemas
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1 @@
-classpath\:/schema/idp-oidc-extension-afp.xsd = schema/idp-oidc-extension-afp.xsd
-classpath\:/schema/idp-oidc-extension-attribute-encoder.xsd = schema/idp-oidc-extension-attribute-encoder.xsd
+classpath\:/schema/idp-oidc-extension-afp.xsd = schema/shibboleth-afp-oidc.xsd
diff --git a/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc-attribute-filter.xml b/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc-attribute-filter.xml
index f9f3823f..6d732745 100644
--- a/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc-attribute-filter.xml
+++ b/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc-attribute-filter.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<AttributeFilterPolicyGroup id="ShibbolethFilterPolicy" xmlns="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:oidcext="org.geant.idpextension.oidc.attribute.filter"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:oidcext="urn:mace:shibboleth:2.0:afp:oidc"
xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- org.geant.idpextension.oidc.attribute.filter classpath:/schema/idp-oidc-extension-afp.xsd">
+ urn:mace:shibboleth:2.0:afp:oidc classpath:/schema/idp-oidc-extension-afp.xsd">
<!--
diff --git a/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc-attribute-resolver.xml b/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc-attribute-resolver.xml
index c4a03212..a6f4aebd 100644
--- a/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc-attribute-resolver.xml
+++ b/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc-attribute-resolver.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<AttributeResolver xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:oidcext="org.geant.idpextension.oidc.attribute.encoder"
+ xmlns:oidcext="urn:mace:shibboleth:2.0:resolver:oidc"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- org.geant.idpextension.oidc.attribute.encoder classpath:/schema/idp-oidc-extension-attribute-encoder.xsd">
+ urn:mace:shibboleth:2.0:resolver:oidc classpath:/schema/idp-oidc-extension-attribute-encoder.xsd">
<!--
Some of the examples assume conf/attributes/oidc-claim-rules.xml is loaded
diff --git a/idp-oidc-extension-impl/src/main/resources/schema/idp-oidc-extension-attribute-encoder.xsd b/idp-oidc-extension-impl/src/main/resources/schema/idp-oidc-extension-attribute-encoder.xsd
deleted file mode 100644
index 264fdf0e..00000000
--- a/idp-oidc-extension-impl/src/main/resources/schema/idp-oidc-extension-attribute-encoder.xsd
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:encoder="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:oidcresolver="org.geant.idpextension.oidc.attribute.encoder"
- targetNamespace="org.geant.idpextension.oidc.attribute.encoder" elementFormDefault="qualified">
-
- <import namespace="urn:mace:shibboleth:2.0:resolver"
- schemaLocation="http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd" />
-
- <!-- Encoders that produce OIDC Attributes -->
-
- <complexType name="OIDCString">
- <annotation>
- <documentation>Defines a encoder for a string attribute.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="oidcresolver:BaseAttributeEncoderType">
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="OIDCByte">
- <annotation>
- <documentation>Defines a base64 encoder for a byte attribute.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="oidcresolver:BaseAttributeEncoderType">
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="OIDCScopedString">
- <annotation>
- <documentation>Defines a OIDC string encoder for a scoped string
- attribute.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="oidcresolver:BaseAttributeEncoderType">
- <attribute name="scopeDelimiter" type="string" use="optional">
- <annotation>
- <documentation>
- This is the delimeter used between the attribute
- value and
- scope.
- </documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
-
- <element name="OIDCAttributeEncoder" type="oidcresolver:BaseAttributeEncoderType">
- <annotation>
- <documentation>Defines a encoder (to JSON Object) for an attribute.
- </documentation>
- </annotation>
- </element>
- <complexType name="BaseAttributeEncoderType">
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="asObject" type="string" use="optional">
- <annotation>
- <documentation>
- Wrap encoded values into JSON Object.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="asBoolean" type="string" use="optional">
- <annotation>
- <documentation>
- Encode values as boolean.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="asArray" type="string" use="optional">
- <annotation>
- <documentation>
- Encode values into array.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="asInt" type="string" use="optional">
- <annotation>
- <documentation>
- Convert value to integer if possible.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="stringDelimiter" type="string" use="optional">
- <annotation>
- <documentation>
- Delimeter used when catenating multiple attribute
- values to one.
- </documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
-</schema>
diff --git a/idp-oidc-extension-impl/src/main/resources/schema/idp-oidc-extension-afp.xsd b/idp-oidc-extension-impl/src/main/resources/schema/shibboleth-afp-oidc.xsd
similarity index 96%
rename from idp-oidc-extension-impl/src/main/resources/schema/idp-oidc-extension-afp.xsd
rename to idp-oidc-extension-impl/src/main/resources/schema/shibboleth-afp-oidc.xsd
index 45d21434..7816253e 100644
--- a/idp-oidc-extension-impl/src/main/resources/schema/idp-oidc-extension-afp.xsd
+++ b/idp-oidc-extension-impl/src/main/resources/schema/shibboleth-afp-oidc.xsd
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:afp="urn:mace:shibboleth:2.0:afp"
- targetNamespace="org.geant.idpextension.oidc.attribute.filter"
+ targetNamespace="urn:mace:shibboleth:2.0:afp:oidc"
elementFormDefault="qualified">
<import namespace="urn:mace:shibboleth:2.0:afp"
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCByteEncoderParserTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCByteEncoderParserTest.java
deleted file mode 100644
index b760c3fb..00000000
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCByteEncoderParserTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.plugin.oidc.op.attribute.resolver.spring.enc.impl;
-
-import static org.testng.Assert.*;
-
-import net.shibboleth.idp.attribute.resolver.spring.testing.BaseEncoderDefinitionParserTest;
-import net.shibboleth.idp.attribute.transcoding.AttributeTranscoder;
-import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
-import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
-import net.shibboleth.oidc.attribute.transcoding.OIDCAttributeTranscoder;
-import net.shibboleth.oidc.attribute.transcoding.impl.OIDCByteAttributeTranscoder;
-
-public class OIDCByteEncoderParserTest extends BaseEncoderDefinitionParserTest {
-
- protected void testWithProperties(final boolean activation, final Boolean encodeType) {
-
- final TranscodingRule rule =
- getAttributeTranscoderRule("oidcbyte.xml", activation, encodeType);
-
- assertTrue(rule.get(AttributeTranscoderRegistry.PROP_TRANSCODER, AttributeTranscoder.class) instanceof OIDCByteAttributeTranscoder);
- assertEquals(rule.get(OIDCAttributeTranscoder.PROP_NAME, String.class), "OIDCByte_ATTRIBUTE_NAME");
- assertTrue(rule.get(OIDCAttributeTranscoder.PROP_ASARRAY, Boolean.class));
- assertFalse(rule.get(OIDCAttributeTranscoder.PROP_ASINTEGER, Boolean.class));
- assertEquals(rule.get(OIDCAttributeTranscoder.PROP_STRING_DELIMITER, String.class), "|");
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCScopedStringEncoderParserTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCScopedStringEncoderParserTest.java
deleted file mode 100644
index 82e67b35..00000000
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCScopedStringEncoderParserTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.plugin.oidc.op.attribute.resolver.spring.enc.impl;
-
-import static org.testng.Assert.*;
-
-import net.shibboleth.idp.attribute.resolver.spring.testing.BaseEncoderDefinitionParserTest;
-import net.shibboleth.idp.attribute.transcoding.AttributeTranscoder;
-import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
-import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
-import net.shibboleth.oidc.attribute.transcoding.OIDCAttributeTranscoder;
-import net.shibboleth.oidc.attribute.transcoding.impl.OIDCScopedStringAttributeTranscoder;
-
-public class OIDCScopedStringEncoderParserTest extends BaseEncoderDefinitionParserTest {
-
- protected void testWithProperties(final boolean activation, final Boolean encodeType) {
-
- final TranscodingRule rule =
- getAttributeTranscoderRule("oidcscopedstring.xml", activation, encodeType);
-
- assertTrue(rule.get(AttributeTranscoderRegistry.PROP_TRANSCODER, AttributeTranscoder.class) instanceof OIDCScopedStringAttributeTranscoder);
- assertEquals(rule.get(OIDCAttributeTranscoder.PROP_NAME, String.class), "OIDCScopedString_ATTRIBUTE_NAME");
- assertTrue(rule.get(OIDCAttributeTranscoder.PROP_ASARRAY, Boolean.class));
- assertNull(rule.get(OIDCAttributeTranscoder.PROP_ASINTEGER, Boolean.class));
- assertEquals(rule.get(OIDCAttributeTranscoder.PROP_STRING_DELIMITER, String.class), "|");
- assertEquals(rule.get(OIDCScopedStringAttributeTranscoder.PROP_SCOPE_DELIMITER, String.class), "|");
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCStringEncoderParserTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCStringEncoderParserTest.java
deleted file mode 100644
index 40931f5f..00000000
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/attribute/resolver/spring/enc/impl/OIDCStringEncoderParserTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.plugin.oidc.op.attribute.resolver.spring.enc.impl;
-
-import static org.testng.Assert.*;
-
-import net.shibboleth.idp.attribute.resolver.spring.testing.BaseEncoderDefinitionParserTest;
-import net.shibboleth.idp.attribute.transcoding.AttributeTranscoder;
-import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
-import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
-import net.shibboleth.oidc.attribute.transcoding.OIDCAttributeTranscoder;
-import net.shibboleth.oidc.attribute.transcoding.impl.OIDCStringAttributeTranscoder;
-
-public class OIDCStringEncoderParserTest extends BaseEncoderDefinitionParserTest {
-
- protected void testWithProperties(final boolean activation, final Boolean encodeType) {
-
- final TranscodingRule rule =
- getAttributeTranscoderRule("oidcstring.xml", activation, encodeType);
-
- assertTrue(rule.get(AttributeTranscoderRegistry.PROP_TRANSCODER, AttributeTranscoder.class) instanceof OIDCStringAttributeTranscoder);
- assertEquals(rule.get(OIDCAttributeTranscoder.PROP_NAME, String.class), "OIDCString_ATTRIBUTE_NAME");
- assertTrue(rule.get(OIDCAttributeTranscoder.PROP_ASARRAY, Boolean.class));
- assertTrue(rule.get(OIDCStringAttributeTranscoder.PROP_ASOBJECT, Boolean.class));
- assertTrue(rule.get(OIDCAttributeTranscoder.PROP_ASBOOLEAN, Boolean.class));
- assertFalse(rule.get(OIDCAttributeTranscoder.PROP_ASINTEGER, Boolean.class));
- assertEquals(rule.get(OIDCAttributeTranscoder.PROP_STRING_DELIMITER, String.class), "|");
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/attribute-filter.xml b/idp-oidc-extension-impl/src/test/resources/conf/attribute-filter.xml
index 966e33df..eadf80ad 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/attribute-filter.xml
+++ b/idp-oidc-extension-impl/src/test/resources/conf/attribute-filter.xml
@@ -12,9 +12,9 @@
<AttributeFilterPolicyGroup id="ShibbolethFilterPolicy"
xmlns="urn:mace:shibboleth:2.0:afp"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:oidcext="org.geant.idpextension.oidc.attribute.filter"
+ xmlns:oidcext="urn:mace:shibboleth:2.0:afp:oidc"
xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- org.geant.idpextension.oidc.attribute.filter classpath:/schema/idp-oidc-extension-afp.xsd">
+ urn:mace:shibboleth:2.0:afp:oidc classpath:/schema/idp-oidc-extension-afp.xsd">
<!--
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/attribute-resolver.xml b/idp-oidc-extension-impl/src/test/resources/conf/attribute-resolver.xml
index a9085161..93112bc0 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/attribute-resolver.xml
+++ b/idp-oidc-extension-impl/src/test/resources/conf/attribute-resolver.xml
@@ -16,9 +16,9 @@
<AttributeResolver
xmlns="urn:mace:shibboleth:2.0:resolver"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:oidcext="org.geant.idpextension.oidc.attribute.encoder"
+ xmlns:oidcext="urn:mace:shibboleth:2.0:resolver:oidc"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- org.geant.idpextension.oidc.attribute.encoder classpath:/schema/idp-oidc-extension-attribute-encoder.xsd">
+ urn:mace:shibboleth:2.0:resolver:oidc classpath:/schema/idp-oidc-extension-attribute-encoder.xsd">
<!-- ========================================== -->
diff --git a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
deleted file mode 100644
index 02c898da..00000000
--- a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<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">
-
- <util:map id="shibboleth.CustomScriptObject">
- <entry key="foo" value="bar"/>
- </util:map>
-
- <util:map id="other.CustomScriptObject">
- <entry key="bar" value="foo"/>
- </util:map>
-
- <bean id="shibboleth.Predicate" class="com.google.common.base.Predicates" factory-method="alwaysFalse"/>
-
- <bean id="shibboleth.PropertySourcesPlaceholderConfigurer"
- class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
- p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-
- <!-- Necessary for encoder parsing to function, normally part of registry wiring. -->
-
- <bean id="OIDCByteTranscoder"
- class="net.shibboleth.oidc.attribute.transcoding.impl.OIDCByteAttributeTranscoder" />
-
- <bean id="OIDCStringTranscoder"
- class="net.shibboleth.oidc.attribute.transcoding.impl.OIDCStringAttributeTranscoder" />
-
- <bean id="OIDCScopedStringTranscoder"
- class="net.shibboleth.oidc.attribute.transcoding.impl.OIDCScopedStringAttributeTranscoder" />
-
-</beans>
diff --git a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/oidcbyte.xml b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/oidcbyte.xml
deleted file mode 100644
index 3b21a854..00000000
--- a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/oidcbyte.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<AttributeEncoder
- xsi:type="oidcext:OIDCByte"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:oidcext="org.geant.idpextension.oidc.attribute.encoder"
- name="OIDCByte_ATTRIBUTE_NAME"
- asArray="true"
- asInt="false"
- stringDelimiter="|"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd org.geant.idpextension.oidc.attribute.encoder classpath:/schema/idp-oidc-extension-attribute-encoder.xsd" />
diff --git a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/oidcscopedstring.xml b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/oidcscopedstring.xml
deleted file mode 100644
index 92b4f840..00000000
--- a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/oidcscopedstring.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<AttributeEncoder
- xsi:type="oidcext:OIDCScopedString"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:oidcext="org.geant.idpextension.oidc.attribute.encoder"
- name="OIDCScopedString_ATTRIBUTE_NAME"
- asArray="true"
- stringDelimiter="|"
- scopeDelimiter="|"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd org.geant.idpextension.oidc.attribute.encoder classpath:/schema/idp-oidc-extension-attribute-encoder.xsd" />
diff --git a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/oidcstring.xml b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/oidcstring.xml
deleted file mode 100644
index 90422711..00000000
--- a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/oidcstring.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<AttributeEncoder
- xsi:type="oidcext:OIDCString"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:oidcext="org.geant.idpextension.oidc.attribute.encoder"
- name="OIDCString_ATTRIBUTE_NAME"
- asArray="true"
- asBoolean="true"
- asInt="false"
- asObject="true"
- stringDelimiter="|"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd org.geant.idpextension.oidc.attribute.encoder classpath:/schema/idp-oidc-extension-attribute-encoder.xsd" />
diff --git a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/attribute/filter/matcher/requestedClaims.xml b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/attribute/filter/matcher/requestedClaims.xml
index 061e927d..3ed7a775 100644
--- a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/attribute/filter/matcher/requestedClaims.xml
+++ b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/attribute/filter/matcher/requestedClaims.xml
@@ -1,3 +1,9 @@
-<AttributeRule attributeID="test" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:oidcext="org.geant.idpextension.oidc.attribute.filter" xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd urn:mace:shibboleth:2.0:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd org.geant.idpextension.oidc.attribute.filter classpath:/schema/idp-oidc-extension-afp.xsd">
- <PermitValueRule xsi:type="oidcext:AttributeInOIDCRequestedClaims" onlyIfEssential="true" matchIfRequestedClaimsSilent="true" matchOnlyUserInfo="true" matchOnlyIDToken="false" />
-</AttributeRule>
+<AttributeRule attributeID="test"
+ xmlns="urn:mace:shibboleth:2.0:afp"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:oidcext="urn:mace:shibboleth:2.0:afp:oidc"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
+ urn:mace:shibboleth:2.0:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd
+ urn:mace:shibboleth:2.0:afp:oidc classpath:/schema/idp-oidc-extension-afp.xsd">
+ <PermitValueRule xsi:type="oidcext:AttributeInOIDCRequestedClaims" onlyIfEssential="true" matchIfRequestedClaimsSilent="true" matchOnlyUserInfo="true" matchOnlyIDToken="false" />
+</AttributeRule>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list