From 3a53c4e82644d9311139be469556bf0b05d413e8 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 16 Oct 2015 08:05:42 +0200
Subject: add SAML2 Metadata namespace and schema to validate openSAML signed
 metadata

---
 .../java/at/gv/egovernment/moa/util/Constants.java | 11 +++++++++
 .../resources/schemas/saml-schema-metadata-2.0.xsd | 26 +++++-----------------
 2 files changed, 17 insertions(+), 20 deletions(-)

(limited to 'common/src')

diff --git a/common/src/main/java/at/gv/egovernment/moa/util/Constants.java b/common/src/main/java/at/gv/egovernment/moa/util/Constants.java
index 8d71f2e84..5d12691f8 100644
--- a/common/src/main/java/at/gv/egovernment/moa/util/Constants.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/Constants.java
@@ -381,6 +381,16 @@ public interface Constants {
   public static final String XENC_SCHEMA_LOCATION =
     SCHEMA_ROOT + "xenc-schema.xsd";
 
+  /** Prefix used for the XML Encryption XML namespace */
+  public static final String SAML2_METADATA_PREFIX = "md";
+  
+  /** Prefix used for the XML Encryption XML namespace */
+  public static final String SAML2_METADATA_URI = "urn:oasis:names:tc:SAML:2.0:metadata";
+
+  /** Local location of the XML Encryption XML schema definition. */
+  public static final String SAML2_METADATA_SCHEMA_LOCATION =
+    SCHEMA_ROOT + "saml-schema-metadata-2.0.xsd";
+  
   /**
    * Contains all namespaces and local schema locations for XML schema
    * definitions relevant for MOA. For use in validating XML parsers.
@@ -413,6 +423,7 @@ public interface Constants {
       + (SAML2P_NS_URI + " " + SAML2P_SCHEMA_LOCATION + " ")
       + (STORK_NS_URI + " " + STORK_SCHEMA_LOCATION + " ")
       + (STORKP_NS_URI + " " + STORKP_SCHEMA_LOCATION + " ")
+      + (SAML2_METADATA_URI + " " + SAML2_METADATA_SCHEMA_LOCATION + " ")
       + (XENC_NS_URI + " " + XENC_SCHEMA_LOCATION);
 
   /** URN prefix for bPK and wbPK. */
diff --git a/common/src/main/resources/resources/schemas/saml-schema-metadata-2.0.xsd b/common/src/main/resources/resources/schemas/saml-schema-metadata-2.0.xsd
index 0d158c0ba..625b66dfc 100644
--- a/common/src/main/resources/resources/schemas/saml-schema-metadata-2.0.xsd
+++ b/common/src/main/resources/resources/schemas/saml-schema-metadata-2.0.xsd
@@ -1,23 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema
-    targetNamespace="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
-    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-    xmlns="http://www.w3.org/2001/XMLSchema"
-    elementFormDefault="unqualified"
-    attributeFormDefault="unqualified"
-    blockDefault="substitution"
-    version="2.0">
-    <import namespace="http://www.w3.org/2000/09/xmldsig#"
-        schemaLocation="http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd"/>
-    <import namespace="http://www.w3.org/2001/04/xmlenc#"
-        schemaLocation="http://www.w3.org/TR/2002/REC-xmlenc-core-20021210/xenc-schema.xsd"/>
-    <import namespace="urn:oasis:names:tc:SAML:2.0:assertion"
-        schemaLocation="saml-schema-assertion-2.0.xsd"/>
-    <import namespace="http://www.w3.org/XML/1998/namespace"
-        schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+<schema targetNamespace="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" attributeFormDefault="unqualified" blockDefault="substitution" version="2.0">
+    <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd"/>
+    <import namespace="http://www.w3.org/2001/04/xmlenc#" schemaLocation="http://www.w3.org/TR/2002/REC-xmlenc-core-20021210/xenc-schema.xsd"/>
+    <import namespace="urn:oasis:names:tc:SAML:2.0:assertion" schemaLocation="saml-schema-assertion-2.0.xsd"/>
+    <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
     <annotation>
         <documentation>
             Document identifier: saml-schema-metadata-2.0
@@ -334,4 +320,4 @@
         <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
     <element name="AffiliateMember" type="md:entityIDType"/>
-</schema>
+</schema>
\ No newline at end of file
-- 
cgit v1.2.3