[java-idp-oidc] 31/44: JOIDC-5 Removed SubjectType from the metadata extension.
Henri Mikkonen
henri.mikkonen at iki.fi
Thu Oct 22 13:08:43 UTC 2020
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=08500e718138e0a17c95533283ababad64ea8646
commit 08500e718138e0a17c95533283ababad64ea8646
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Jul 3 14:42:23 2020 +0300
JOIDC-5 Removed SubjectType from the metadata extension.
https://issues.shibboleth.net/jira/browse/JOIDC-5
Subject type is set via SPSSODescriptor/NameIDFormat
---
.../idp/saml/oidc/xmlobject/OAuthRPExtensions.java | 4 --
.../idp/saml/oidc/xmlobject/SubjectType.java | 37 -----------------
.../resources/schema/saml-metadata-ext-oidcmd.xsd | 2 -
.../oidc/xmlobject/impl/OAuthRPExtensionsImpl.java | 16 --------
.../impl/OAuthRPExtensionsUnmarshaller.java | 3 --
.../oidc/xmlobject/impl/SubjectTypeBuilder.java | 46 ----------------------
.../saml/oidc/xmlobject/impl/SubjectTypeImpl.java | 36 -----------------
.../oidc/xmlobject/impl/SubjectTypeMarshaller.java | 26 ------------
.../xmlobject/impl/SubjectTypeUnmarshaller.java | 26 ------------
.../resources/saml2-metadata-oidcmd-config.xml | 6 ---
10 files changed, 202 deletions(-)
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/OAuthRPExtensions.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/OAuthRPExtensions.java
index fc86b6b9..6733faca 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/OAuthRPExtensions.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/OAuthRPExtensions.java
@@ -74,10 +74,6 @@ public interface OAuthRPExtensions extends SAMLObject {
public void setSectorIdentifierUri(final SectorIdentifierUri uri);
- public SubjectType getSubjectType();
-
- public void setSubjectType(final SubjectType type);
-
public IdTokenSignedResponseAlg getIdTokenSignedResponseAlg();
public void setIdTokenSignedResponseAlg(final IdTokenSignedResponseAlg algorithm);
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/SubjectType.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/SubjectType.java
deleted file mode 100644
index 763ef12c..00000000
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/SubjectType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed 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.saml.oidc.xmlobject;
-
-import javax.xml.namespace.QName;
-
-/**
- * SAML2 OIDC metadata extension 'SubjectType'.
- */
-public interface SubjectType extends MetadataValueSAMLObject {
-
- /** Element name, no namespace. */
- public static final String DEFAULT_ELEMENT_LOCAL_NAME = "SubjectType";
-
- /** Default element name. */
- public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
- /** QName of the XSI type. */
- public static final QName TYPE_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
- SAML20MDOIDCMD_PREFIX);
-
-}
diff --git a/idp-oidc-extension-api/src/main/resources/schema/saml-metadata-ext-oidcmd.xsd b/idp-oidc-extension-api/src/main/resources/schema/saml-metadata-ext-oidcmd.xsd
index 03c6bb0b..1751f091 100644
--- a/idp-oidc-extension-api/src/main/resources/schema/saml-metadata-ext-oidcmd.xsd
+++ b/idp-oidc-extension-api/src/main/resources/schema/saml-metadata-ext-oidcmd.xsd
@@ -21,7 +21,6 @@
<element ref="oidcmd:SoftwareId" minOccurs="0" maxOccurs="1" />
<element ref="oidcmd:SoftwareVersion" minOccurs="0" maxOccurs="1" />
<element ref="oidcmd:SectorIdentifierUri" minOccurs="0" maxOccurs="1" />
- <element ref="oidcmd:SubjectType" minOccurs="0" maxOccurs="1" />
<element ref="oidcmd:IdTokenSignedResponseAlg" minOccurs="0" maxOccurs="1" />
<element ref="oidcmd:IdTokenEncryptedResponseAlg" minOccurs="0" maxOccurs="1" />
<element ref="oidcmd:IdTokenEncryptedResponseEnc" minOccurs="0" maxOccurs="1" />
@@ -55,7 +54,6 @@
<element name="SoftwareId" type="anyURI" />
<element name="SoftwareVersion" type="anyURI" />
<element name="SectorIdentifierUri" type="anyURI" />
- <element name="SubjectType" type="anyURI" />
<element name="IdTokenSignedResponseAlg" type="anyURI" />
<element name="IdTokenEncryptionResponseAlg" type="anyURI" />
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsImpl.java
index 3379e64b..bd725905 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsImpl.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsImpl.java
@@ -45,7 +45,6 @@ import net.shibboleth.idp.saml.oidc.xmlobject.Scope;
import net.shibboleth.idp.saml.oidc.xmlobject.SectorIdentifierUri;
import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareId;
import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareVersion;
-import net.shibboleth.idp.saml.oidc.xmlobject.SubjectType;
import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthMethod;
import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthSigningAlg;
import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptionResponseAlg;
@@ -86,9 +85,6 @@ public class OAuthRPExtensionsImpl extends RoleDescriptorImpl implements OAuthRP
/** Sector identifier URI for this entity. */
private SectorIdentifierUri sectorIdentifierUri;
- /** Subject type for this entity. */
- private SubjectType subjectType;
-
/** ID token signed response algorithm for this entity. */
private IdTokenSignedResponseAlg idTokenSignedResponseAlg;
@@ -267,18 +263,6 @@ public class OAuthRPExtensionsImpl extends RoleDescriptorImpl implements OAuthRP
sectorIdentifierUri = uri;
}
- /** {@inheritDoc} */
- @Override
- public SubjectType getSubjectType() {
- return subjectType;
- }
-
- /** {@inheritDoc} */
- @Override
- public void setSubjectType(SubjectType type) {
- subjectType = type;
- }
-
/** {@inheritDoc} */
@Override
public IdTokenSignedResponseAlg getIdTokenSignedResponseAlg() {
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsUnmarshaller.java
index 05e0b9e7..d4e46c03 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsUnmarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsUnmarshaller.java
@@ -43,7 +43,6 @@ import net.shibboleth.idp.saml.oidc.xmlobject.Scope;
import net.shibboleth.idp.saml.oidc.xmlobject.SectorIdentifierUri;
import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareId;
import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareVersion;
-import net.shibboleth.idp.saml.oidc.xmlobject.SubjectType;
import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthMethod;
import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthSigningAlg;
import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptionResponseAlg;
@@ -80,8 +79,6 @@ public class OAuthRPExtensionsUnmarshaller extends AbstractSAMLObjectUnmarshalle
descriptor.setSoftwareVersion((SoftwareVersion) childSAMLObject);
} else if (childSAMLObject instanceof SectorIdentifierUri) {
descriptor.setSectorIdentifierUri((SectorIdentifierUri) childSAMLObject);
- } else if (childSAMLObject instanceof SubjectType) {
- descriptor.setSubjectType((SubjectType) childSAMLObject);
} else if (childSAMLObject instanceof IdTokenSignedResponseAlg) {
descriptor.setIdTokenSignedResponseAlg((IdTokenSignedResponseAlg) childSAMLObject);
} else if (childSAMLObject instanceof IdTokenEncryptionResponseAlg) {
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SubjectTypeBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SubjectTypeBuilder.java
deleted file mode 100644
index 5b2a9f7a..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SubjectTypeBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed 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.saml.oidc.xmlobject.impl;
-
-import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.SubjectType;
-import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
-
-/**
- * Builder of {@link SubjectTypeImpl}.
- */
-public class SubjectTypeBuilder extends AbstractSAMLObjectBuilder<SubjectType> {
-
- /**
- * Constructor.
- */
- public SubjectTypeBuilder() {
-
- }
-
- /** {@inheritDoc} */
- public SubjectType buildObject() {
- return buildObject(Constants.SAML20MDOIDCMD_NS, SubjectType.DEFAULT_ELEMENT_LOCAL_NAME,
- Constants.SAML20MDOIDCMD_PREFIX);
- }
-
- /** {@inheritDoc} */
- public SubjectType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
- return new SubjectTypeImpl(namespaceURI, localName, namespacePrefix);
- }
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SubjectTypeImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SubjectTypeImpl.java
deleted file mode 100644
index 2d562fe6..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SubjectTypeImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed 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.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.SubjectType;
-
-/**
- * Concrete implementation of {@link SubjectType}.
- */
-public class SubjectTypeImpl extends AbstractMetadataValueSAMLObject implements SubjectType {
-
- /**
- * Constructor.
- *
- * @param namespaceURI the namespace the element is in
- * @param elementLocalName the local name of the XML element this Object represents
- * @param namespacePrefix the prefix for the given namespace
- */
- protected SubjectTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
- super(namespaceURI, elementLocalName, namespacePrefix);
- }
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SubjectTypeMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SubjectTypeMarshaller.java
deleted file mode 100644
index 50bf6130..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SubjectTypeMarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed 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.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.SubjectType;
-
-/**
- * A thread safe Marshaller for {@link SubjectType} objects.
- */
-public class SubjectTypeMarshaller extends AbstractMetadataValueMarshaller<SubjectType> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SubjectTypeUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SubjectTypeUnmarshaller.java
deleted file mode 100644
index f146e19a..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/SubjectTypeUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed 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.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.SubjectType;
-
-/**
- * A thread-safe Unmarshaller for {@link SubjectType} objects.
- */
-public class SubjectTypeUnmarshaller extends AbstractMetadataValueUnmarshaller<SubjectType> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/resources/saml2-metadata-oidcmd-config.xml b/idp-oidc-extension-impl/src/main/resources/saml2-metadata-oidcmd-config.xml
index ee36f9c4..45e97a5d 100644
--- a/idp-oidc-extension-impl/src/main/resources/saml2-metadata-oidcmd-config.xml
+++ b/idp-oidc-extension-impl/src/main/resources/saml2-metadata-oidcmd-config.xml
@@ -142,12 +142,6 @@
<UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.SoftwareVersionUnmarshaller"/>
</ObjectProvider>
- <ObjectProvider qualifiedName="oidcmd:SubjectType">
- <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.SubjectTypeBuilder"/>
- <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.SubjectTypeMarshaller"/>
- <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.SubjectTypeUnmarshaller"/>
- </ObjectProvider>
-
<ObjectProvider qualifiedName="oidcmd:TokenEndpointAuthMethod">
<BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.TokenEndpointAuthMethodBuilder"/>
<MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.TokenEndpointAuthMethodMarshaller"/>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list