X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml2%2Fmetadata%2Fimpl%2FMetadataSchemaValidators.cpp;h=f96f7918e9e2bcec3f5215a631992ae41b694d5f;hb=d64c2cd4935da4a316fd6062fe6410839d86a2d6;hp=a204dc0055c777f28bd2484d42b5e087682ca393;hpb=bf2b5d5ecfa3f2e377305c18c731a2b8274a6591;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/saml2/metadata/impl/MetadataSchemaValidators.cpp b/saml/saml2/metadata/impl/MetadataSchemaValidators.cpp
index a204dc0..f96f791 100644
--- a/saml/saml2/metadata/impl/MetadataSchemaValidators.cpp
+++ b/saml/saml2/metadata/impl/MetadataSchemaValidators.cpp
@@ -38,6 +38,9 @@ using samlconstants::SAML20MD_QUERY_EXT_NS;
 using samlconstants::SAML20MD_ALGSUPPORT_NS;
 using samlconstants::SAML20MD_ENTITY_ATTRIBUTE_NS;
 using samlconstants::SAML20MD_UI_NS;
+using samlconstants::SAML1MD_NS;
+using samlconstants::IDP_DISCOVERY_PROTOCOL_NS;
+using samlconstants::SP_REQUEST_INIT_NS;
 
 namespace opensaml {
     namespace saml2md {
@@ -62,16 +65,19 @@ namespace opensaml {
             XMLOBJECTVALIDATOR_REQUIRE(localizedURIType,Lang);
         END_XMLOBJECTVALIDATOR;
 
-        BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,OrganizationName,localizedNameType);
-            localizedNameTypeSchemaValidator::validate(xmlObject);
+        BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,OrganizationName);
+            XMLOBJECTVALIDATOR_REQUIRE(OrganizationName,TextContent);
+            XMLOBJECTVALIDATOR_REQUIRE(OrganizationName,Lang);
         END_XMLOBJECTVALIDATOR;
 
-        BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,OrganizationDisplayName,localizedNameType);
-            localizedNameTypeSchemaValidator::validate(xmlObject);
+        BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,OrganizationDisplayName);
+            XMLOBJECTVALIDATOR_REQUIRE(OrganizationDisplayName,TextContent);
+            XMLOBJECTVALIDATOR_REQUIRE(OrganizationDisplayName,Lang);
         END_XMLOBJECTVALIDATOR;
 
-        BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,OrganizationURL,localizedURIType);
-            localizedURITypeSchemaValidator::validate(xmlObject);
+        BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,OrganizationURL);
+            XMLOBJECTVALIDATOR_REQUIRE(OrganizationURL,TextContent);
+            XMLOBJECTVALIDATOR_REQUIRE(OrganizationURL,Lang);
         END_XMLOBJECTVALIDATOR;
 
         class SAML_DLLLOCAL checkWildcardNS {
@@ -171,12 +177,14 @@ namespace opensaml {
             XMLOBJECTVALIDATOR_NONEMPTY(IDPSSODescriptor,SingleSignOnService);
         END_XMLOBJECTVALIDATOR;
 
-        BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,ServiceName,localizedNameType);
-            localizedNameTypeSchemaValidator::validate(xmlObject);
+        BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,ServiceName);
+            XMLOBJECTVALIDATOR_REQUIRE(ServiceName,TextContent);
+            XMLOBJECTVALIDATOR_REQUIRE(ServiceName,Lang);
         END_XMLOBJECTVALIDATOR;
 
-        BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,ServiceDescription,localizedNameType);
-            localizedNameTypeSchemaValidator::validate(xmlObject);
+        BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,ServiceDescription);
+            XMLOBJECTVALIDATOR_REQUIRE(ServiceDescription,TextContent);
+            XMLOBJECTVALIDATOR_REQUIRE(ServiceDescription,Lang);
         END_XMLOBJECTVALIDATOR;
 
         BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,RequestedAttribute);
@@ -254,6 +262,14 @@ namespace opensaml {
 
         XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,SourceID);
 
+        BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,DiscoveryResponse,IndexedEndpointType);
+            IndexedEndpointTypeSchemaValidator::validate(xmlObject);
+        END_XMLOBJECTVALIDATOR;
+
+        BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,RequestInitiator,EndpointType);
+            EndpointTypeSchemaValidator::validate(xmlObject);
+        END_XMLOBJECTVALIDATOR;
+
         BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,EntityAttributes);
             if (!ptr->hasChildren())
                 throw ValidationException("EntityAttributes must contain at least one child element.");
@@ -267,12 +283,14 @@ namespace opensaml {
             XMLOBJECTVALIDATOR_REQUIRE(SigningMethod,Algorithm);
         END_XMLOBJECTVALIDATOR;
 
-        BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,DisplayName,localizedNameType);
-            localizedNameTypeSchemaValidator::validate(xmlObject);
+        BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,DisplayName);
+            XMLOBJECTVALIDATOR_REQUIRE(DisplayName,TextContent);
+            XMLOBJECTVALIDATOR_REQUIRE(DisplayName,Lang);
         END_XMLOBJECTVALIDATOR;
 
-        BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,Description,localizedNameType);
-            localizedNameTypeSchemaValidator::validate(xmlObject);
+        BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,Description);
+            XMLOBJECTVALIDATOR_REQUIRE(Description,TextContent);
+            XMLOBJECTVALIDATOR_REQUIRE(Description,Lang);
         END_XMLOBJECTVALIDATOR;
 
         BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,Logo);
@@ -281,12 +299,14 @@ namespace opensaml {
             XMLOBJECTVALIDATOR_REQUIRE_INTEGER(Logo,Width);
         END_XMLOBJECTVALIDATOR;
 
-        BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,InformationURL,localizedURIType);
-            localizedURITypeSchemaValidator::validate(xmlObject);
+        BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,InformationURL);
+            XMLOBJECTVALIDATOR_REQUIRE(InformationURL,TextContent);
+            XMLOBJECTVALIDATOR_REQUIRE(InformationURL,Lang);
         END_XMLOBJECTVALIDATOR;
 
-        BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,PrivacyStatementURL,localizedURIType);
-            localizedURITypeSchemaValidator::validate(xmlObject);
+        BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,PrivacyStatementURL);
+            XMLOBJECTVALIDATOR_REQUIRE(PrivacyStatementURL,TextContent);
+            XMLOBJECTVALIDATOR_REQUIRE(PrivacyStatementURL,Lang);
         END_XMLOBJECTVALIDATOR;
 
         XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,IPHint);
@@ -307,10 +327,20 @@ namespace opensaml {
 
 #define REGISTER_ELEMENT_UI(cname) \
     q=xmltooling::QName(SAML20MD_UI_NS,cname::LOCAL_NAME); \
-    XMLObjectBuilder::registerBuilder(q,new cname##Builder());
+    XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
+    SchemaValidators.registerValidator(q,new cname##SchemaValidator())
 
 #define REGISTER_TYPE_UI(cname) \
     q=xmltooling::QName(SAML20MD_UI_NS,cname::TYPE_NAME); \
+    XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
+    SchemaValidators.registerValidator(q,new cname##SchemaValidator())
+
+#define REGISTER_ELEMENT_UI_NOVAL(cname) \
+    q=xmltooling::QName(SAML20MD_UI_NS,cname::LOCAL_NAME); \
+    XMLObjectBuilder::registerBuilder(q,new cname##Builder());
+
+#define REGISTER_TYPE_UI_NOVAL(cname) \
+    q=xmltooling::QName(SAML20MD_UI_NS,cname::TYPE_NAME); \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
 
 void opensaml::saml2md::registerMetadataClasses() {
@@ -377,10 +407,18 @@ void opensaml::saml2md::registerMetadataClasses() {
     q=xmltooling::QName(SAML20MD_NS,xmlencryption::EncryptionMethod::LOCAL_NAME);
     XMLObjectBuilder::registerBuilder(q,new xmlencryption::EncryptionMethodBuilder());
 
-    q=xmltooling::QName(samlconstants::SAML1MD_NS,SourceID::LOCAL_NAME);
+    q=xmltooling::QName(SAML1MD_NS,SourceID::LOCAL_NAME);
     XMLObjectBuilder::registerBuilder(q,new SourceIDBuilder());
     SchemaValidators.registerValidator(q,new SourceIDSchemaValidator());
 
+    q=xmltooling::QName(IDP_DISCOVERY_PROTOCOL_NS,DiscoveryResponse::LOCAL_NAME);
+    XMLObjectBuilder::registerBuilder(q,new DiscoveryResponseBuilder());
+    SchemaValidators.registerValidator(q,new DiscoveryResponseSchemaValidator());
+
+    q=xmltooling::QName(SP_REQUEST_INIT_NS,RequestInitiator::LOCAL_NAME);
+    XMLObjectBuilder::registerBuilder(q,new RequestInitiatorBuilder());
+    SchemaValidators.registerValidator(q,new RequestInitiatorSchemaValidator());
+
     q=xmltooling::QName(SAML20MD_QUERY_EXT_NS,ActionNamespace::LOCAL_NAME);
     XMLObjectBuilder::registerBuilder(q,new ActionNamespaceBuilder());
     SchemaValidators.registerValidator(q,new ActionNamespaceSchemaValidator());
@@ -426,12 +464,12 @@ void opensaml::saml2md::registerMetadataClasses() {
     REGISTER_ELEMENT_UI(Logo);
     REGISTER_ELEMENT_UI(InformationURL);
     REGISTER_ELEMENT_UI(PrivacyStatementURL);
-    REGISTER_ELEMENT_UI(UIInfo);
     REGISTER_ELEMENT_UI(IPHint);
     REGISTER_ELEMENT_UI(DomainHint);
     REGISTER_ELEMENT_UI(GeolocationHint);
-    REGISTER_ELEMENT_UI(DiscoHints);
     REGISTER_TYPE_UI(Logo);
-    REGISTER_TYPE_UI(UIInfo);
-    REGISTER_TYPE_UI(DiscoHints);
+    REGISTER_ELEMENT_UI_NOVAL(UIInfo);
+    REGISTER_ELEMENT_UI_NOVAL(DiscoHints);
+    REGISTER_TYPE_UI_NOVAL(UIInfo);
+    REGISTER_TYPE_UI_NOVAL(DiscoHints);
 }