[java-idp-oidc] 02/09: JOIDC-5 Added ClientSecretReferenceKey element

Henri Mikkonen henri.mikkonen at iki.fi
Fri Jun 5 13:54:54 UTC 2020


This is an automated email from the git hooks/post-receive script.

hjmikkon pushed a commit to branch dev/JOIDC-5
in repository java-idp-oidc.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=0078cca53ec6ff7aa5d4a4f44808a73465f78632

commit 0078cca53ec6ff7aa5d4a4f44808a73465f78632
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Jun 5 16:07:28 2020 +0300

    JOIDC-5 Added ClientSecretReferenceKey element
    
    https://issues.shibboleth.net/jira/browse/JOIDC-5
---
 .../oidc/xmlobject/ClientSecretReferenceKey.java   | 37 +++++++++++++++++
 .../resources/schema/saml-metadata-ext-oidcmd.xsd  |  1 +
 .../impl/ClientSecretReferenceKeyBuilder.java      | 46 ++++++++++++++++++++++
 .../impl/ClientSecretReferenceKeyImpl.java         | 37 +++++++++++++++++
 .../impl/ClientSecretReferenceKeyMarshaller.java   | 26 ++++++++++++
 .../impl/ClientSecretReferenceKeyUnmarshaller.java | 26 ++++++++++++
 .../resources/saml2-metadata-oidcmd-config.xml     |  6 +++
 7 files changed, 179 insertions(+)

diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ClientSecretReferenceKey.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ClientSecretReferenceKey.java
new file mode 100644
index 00000000..5cdc8f44
--- /dev/null
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/ClientSecretReferenceKey.java
@@ -0,0 +1,37 @@
+/*
+ * 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 'ClientSecretReferenceKey'.
+ */
+public interface ClientSecretReferenceKey extends MetadataValueSAMLObject {
+
+    /** Element name, no namespace. */
+    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "ClientSecretReferenceKey";
+
+    /** 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 62296a78..7d5780b6 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
@@ -74,5 +74,6 @@
     <element name="PostLogoutRedirectUri" type="anyURI" />
     
     <element name="JwksData" type="anyURI" />
+    <element name="ClientSecretReferenceKey" type="anyURI" />
 
 </schema>
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyBuilder.java
new file mode 100644
index 00000000..02ff78ae
--- /dev/null
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyBuilder.java
@@ -0,0 +1,46 @@
+/*
+ * 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.ClientSecretReferenceKey;
+import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
+
+/**
+ * Builder of {@link ClientSecretReferenceKeyImpl}.
+ */
+public class ClientSecretReferenceKeyBuilder extends AbstractSAMLObjectBuilder<ClientSecretReferenceKey> {
+
+    /**
+     * Constructor.
+     */
+    public ClientSecretReferenceKeyBuilder() {
+
+    }
+
+    /** {@inheritDoc} */
+    public ClientSecretReferenceKey buildObject() {
+        return buildObject(Constants.SAML20MDOIDCMD_NS, ClientSecretReferenceKey.DEFAULT_ELEMENT_LOCAL_NAME,
+                Constants.SAML20MDOIDCMD_PREFIX);
+    }
+
+    /** {@inheritDoc} */
+    public ClientSecretReferenceKey buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+        return new ClientSecretReferenceKeyImpl(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/ClientSecretReferenceKeyImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyImpl.java
new file mode 100644
index 00000000..caf4b917
--- /dev/null
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyImpl.java
@@ -0,0 +1,37 @@
+/*
+ * 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.ClientSecretReferenceKey;
+
+/**
+ * Concrete implementation of {@link ClientSecretReferenceKey}.
+ */
+public class ClientSecretReferenceKeyImpl extends AbstractMetadataValueSAMLObject implements ClientSecretReferenceKey {
+
+    /**
+     * 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 ClientSecretReferenceKeyImpl(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/ClientSecretReferenceKeyMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyMarshaller.java
new file mode 100644
index 00000000..3deea707
--- /dev/null
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyMarshaller.java
@@ -0,0 +1,26 @@
+/*
+ * 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.ClientSecretReferenceKey;
+
+/**
+ * A thread safe Marshaller for {@link ClientSecretReferenceKey} objects.
+ */
+public class ClientSecretReferenceKeyMarshaller extends AbstractMetadataValueMarshaller<ClientSecretReferenceKey> {
+
+}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyUnmarshaller.java
new file mode 100644
index 00000000..7958d1e2
--- /dev/null
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/ClientSecretReferenceKeyUnmarshaller.java
@@ -0,0 +1,26 @@
+/*
+ * 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.ClientSecretReferenceKey;
+
+/**
+ * A thread-safe Unmarshaller for {@link ClientSecretReferenceKey} objects.
+ */
+public class ClientSecretReferenceKeyUnmarshaller extends AbstractMetadataValueUnmarshaller<ClientSecretReferenceKey> {
+
+}
\ 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 8fd87d01..d506fd38 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
@@ -10,6 +10,12 @@
             <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ApplicationTypeUnmarshaller"/>
         </ObjectProvider>
 
+        <ObjectProvider qualifiedName="oidcmd:ClientSecretReferenceKey">
+            <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ClientSecretReferenceKeyBuilder"/>
+            <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ClientSecretReferenceKeyMarshaller"/>
+            <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ClientSecretReferenceKeyUnmarshaller"/>
+        </ObjectProvider>
+
         <ObjectProvider qualifiedName="oidcmd:ClientSecret">
             <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ClientSecretBuilder"/>
             <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.ClientSecretMarshaller"/>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list