From a36161db26478d7a09b5ebc1c920388619d20113 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Sun, 30 Jul 2006 21:23:04 +0000
Subject: [PATCH] Add latest CD extensions.

---
 schemas/Makefile.am                           |  5 +-
 schemas/saml20-catalog.xml.in                 |  3 ++
 schemas/sstc-saml-metadata-ext-query.xsd      | 66 +++++++++++++++++++++++++++
 schemas/sstc-saml-protocol-ext-thirdparty.xsd | 29 ++++++++++++
 schemas/sstc-saml1x-metadata.xsd              | 25 ++++++++++
 5 files changed, 127 insertions(+), 1 deletion(-)
 create mode 100644 schemas/sstc-saml-metadata-ext-query.xsd
 create mode 100644 schemas/sstc-saml-protocol-ext-thirdparty.xsd
 create mode 100644 schemas/sstc-saml1x-metadata.xsd

diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 10eb5e3..d12acdd 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -38,7 +38,10 @@ schemas = soap-envelope.xsd \
 	saml-schema-metadata-2.0.xsd \
 	saml-schema-protocol-2.0.xsd \
 	saml-schema-x500-2.0.xsd \
-	saml-schema-xacml-2.0.xsd
+	saml-schema-xacml-2.0.xsd \
+	sstc-saml1x-metadata.xsd \
+	sstc-saml-metadata-ext-query.xsd \
+	sstc-saml-protocol-ext-thirdparty.xsd
 
 pkgxmldir = $(datadir)/xml/@PACKAGE@
 
diff --git a/schemas/saml20-catalog.xml.in b/schemas/saml20-catalog.xml.in
index 1e2b797..9fb17d7 100644
--- a/schemas/saml20-catalog.xml.in
+++ b/schemas/saml20-catalog.xml.in
@@ -10,4 +10,7 @@
     <uri name="urn:oasis:names:tc:SAML:2.0:profiles:attribute:DCE" uri="@-PKGXMLDIR-@/saml-schema-dce-2.0.xsd"/>
     <uri name="urn:oasis:names:tc:SAML:2.0:profiles:attribute:X500" uri="@-PKGXMLDIR-@/saml-schema-x500-2.0.xsd"/>
     <uri name="urn:oasis:names:tc:SAML:2.0:profiles:attribute:XACML" uri="@-PKGXMLDIR-@/saml-schema-xacml-2.0.xsd"/>
+	<uri name="urn:oasis:names:tc:SAML:profiles:v1metadata" uri="@-PKGXMLDIR-@/sstc-saml1x-metadata.xsd"/>
+	<uri name="urn:oasis:names:tc:SAML:metadata:ext:query" uri="@-PKGXMLDIR-@/sstc-saml-metadata-ext-query.xsd"/>
+	<uri name="urn:oasis:names:tc:SAML:protocol:ext:third-party" uri="@-PKGXMLDIR-@/sstc-saml-protocol-ext-thirdparty.xsd"/>
 </catalog>
diff --git a/schemas/sstc-saml-metadata-ext-query.xsd b/schemas/sstc-saml-metadata-ext-query.xsd
new file mode 100644
index 0000000..75b9fac
--- /dev/null
+++ b/schemas/sstc-saml-metadata-ext-query.xsd
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<schema 
+  targetNamespace="urn:oasis:names:tc:SAML:metadata:ext:query"
+  xmlns="http://www.w3.org/2001/XMLSchema"
+  xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+  xmlns:query="urn:oasis:names:tc:SAML:metadata:ext:query"
+  elementFormDefault="unqualified"
+  attributeFormDefault="unqualified"
+  blockDefault="substitution"
+  version="2.0">
+
+  <annotation>
+    <documentation>
+      Document title: SAML Metadata Extension Schema for Query Requester
+      Document identifier: sstc-saml-metadata-ext-query.xsd
+      Location: http://www.oasis-open.org/committees/documents.php?wg_abbrev=security
+      Revision history:
+      V1.0 (February 2006):
+        Initial version.
+    </documentation>
+  </annotation>
+
+  <import namespace="urn:oasis:names:tc:SAML:2.0:metadata"
+    schemaLocation="saml-schema-metadata-2.0.xsd"/>
+
+  <complexType name="QueryDescriptorType" abstract="true">
+    <complexContent>
+      <extension base="md:RoleDescriptorType">
+        <sequence>
+          <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="WantAssertionsSigned" type="boolean" use="optional"/>
+      </extension>
+    </complexContent>
+  </complexType>
+
+  <complexType name="AuthnQueryDescriptorType">
+    <complexContent>
+      <extension base="query:QueryDescriptorType"/>
+    </complexContent>
+  </complexType>
+
+  <complexType name="AttributeQueryDescriptorType">
+    <complexContent>
+      <extension base="query:QueryDescriptorType">
+        <sequence>
+          <element ref="md:AttributeConsumingService" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+      </extension>
+    </complexContent>
+  </complexType>
+
+  <element name="ActionNamespace" type="anyURI"/>
+    
+  <complexType name="AuthzDecisionQueryDescriptorType">
+    <complexContent>
+      <extension base="query:QueryDescriptorType">
+        <sequence>
+          <element ref="query:ActionNamespace" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+      </extension>
+    </complexContent>
+  </complexType>
+
+</schema>
diff --git a/schemas/sstc-saml-protocol-ext-thirdparty.xsd b/schemas/sstc-saml-protocol-ext-thirdparty.xsd
new file mode 100644
index 0000000..9358620
--- /dev/null
+++ b/schemas/sstc-saml-protocol-ext-thirdparty.xsd
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema 
+  targetNamespace="urn:oasis:names:tc:SAML:protocol:ext:third-party"
+  xmlns="http://www.w3.org/2001/XMLSchema"
+  xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+  elementFormDefault="unqualified"
+  attributeFormDefault="unqualified"
+  blockDefault="substitution"
+  version="2.0">
+
+  <annotation>
+    <documentation>
+      Document title: SAML Protocol Extension Schema for Third-Party Requests
+      Document identifier: sstc-saml-protocol-ext-thirdparty.xsd
+      Location: http://www.oasis-open.org/committees/documents.php?wg_abbrev=security
+      Revision history:
+      V1.0 (February 2006):
+        Initial version.
+    </documentation>
+  </annotation>
+
+  <import namespace="urn:oasis:names:tc:SAML:2.0:assertion"
+    schemaLocation="saml-schema-assertion-2.0.xsd"/>
+
+  <element name="RespondTo" type="saml:NameIDType"/>
+  
+  <attribute name="supportsRespondTo" type="boolean"/>
+
+</schema>
diff --git a/schemas/sstc-saml1x-metadata.xsd b/schemas/sstc-saml1x-metadata.xsd
new file mode 100644
index 0000000..569e25d
--- /dev/null
+++ b/schemas/sstc-saml1x-metadata.xsd
@@ -0,0 +1,25 @@
+<schema
+    targetNamespace="urn:oasis:names:tc:SAML:profiles:v1metadata"
+    xmlns:saml1md="urn:oasis:names:tc:SAML:profiles:v1metadata"
+    xmlns="http://www.w3.org/2001/XMLSchema"
+    elementFormDefault="unqualified"
+    attributeFormDefault="unqualified"
+    blockDefault="substitution"
+    version="2.0">
+    <annotation>
+        <documentation>
+            Document identifier: sstc-saml1x-metadata
+            Location: http://www.oasis-open.org/committees/documents.php?wg_abbrev=security
+            Revision history:
+            V1.0 (July 2006):
+              Initial version.
+        </documentation>
+    </annotation>
+    <element name="SourceID">
+        <simpleType>
+            <restriction base="string">
+                <pattern value="[a-f0-9]{40}"/>
+            </restriction>
+        </simpleType>
+    </element>
+</schema>
-- 
2.1.4