X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2Fsaml2%2Fmetadata%2Fimpl%2FMetadataSchemaValidators.cpp;h=80c72cd3636ceedff4c1c378dd006f86867e3bf2;hp=21dffda003d0032944203245844a223493b03ac4;hb=35620ec8e6367509404ca8913431e1b45fd9616f;hpb=e0626e20a2bb32174f1a0010cc425b0d11a32cc6 diff --git a/saml/saml2/metadata/impl/MetadataSchemaValidators.cpp b/saml/saml2/metadata/impl/MetadataSchemaValidators.cpp index 21dffda..80c72cd 100644 --- a/saml/saml2/metadata/impl/MetadataSchemaValidators.cpp +++ b/saml/saml2/metadata/impl/MetadataSchemaValidators.cpp @@ -1,6 +1,6 @@ /* -* Copyright 2001-2006 Internet2 - * +* Copyright 2001-2007 Internet2 + * * 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 @@ -16,7 +16,7 @@ /** * MetadataSchemaValidators.cpp - * + * * Schema-based validators for SAML 2.0 Metadata classes */ @@ -24,21 +24,27 @@ #include "exceptions.h" #include "saml2/metadata/Metadata.h" +#include + using namespace opensaml::saml2md; using namespace opensaml::saml2; using namespace opensaml; using namespace xmltooling; using namespace std; +using samlconstants::SAML20MD_NS; +using samlconstants::SAML20MD_QUERY_EXT_NS; namespace opensaml { namespace saml2md { - + + XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,ActionNamespace); XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,AffiliateMember); XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,AttributeProfile); XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,Company); XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,EmailAddress); XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,GivenName); XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,NameIDFormat); + XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,SourceID); XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,SurName); XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,TelephoneNumber); @@ -48,10 +54,10 @@ namespace opensaml { END_XMLOBJECTVALIDATOR; BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,localizedURIType); - XMLOBJECTVALIDATOR_REQUIRE(localizedNameType,TextContent); + XMLOBJECTVALIDATOR_REQUIRE(localizedURIType,TextContent); XMLOBJECTVALIDATOR_REQUIRE(localizedURIType,Lang); END_XMLOBJECTVALIDATOR; - + BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,OrganizationName,localizedNameType); localizedNameTypeSchemaValidator::validate(xmlObject); END_XMLOBJECTVALIDATOR; @@ -68,7 +74,7 @@ namespace opensaml { public: void operator()(const XMLObject* xmlObject) const { const XMLCh* ns=xmlObject->getElementQName().getNamespaceURI(); - if (XMLString::equals(ns,SAMLConstants::SAML20MD_NS) || !ns || !*ns) { + if (XMLString::equals(ns,SAML20MD_NS) || !ns || !*ns) { throw ValidationException( "Object contains an illegal extension child element ($1).", params(1,xmlObject->getElementQName().toString().c_str()) @@ -80,10 +86,10 @@ namespace opensaml { BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,Extensions); if (!ptr->hasChildren()) throw ValidationException("Extensions must have at least one child element."); - const list& anys=ptr->getXMLObjects(); + const vector& anys=ptr->getUnknownXMLObjects(); for_each(anys.begin(),anys.end(),checkWildcardNS()); END_XMLOBJECTVALIDATOR; - + BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,Organization); XMLOBJECTVALIDATOR_NONEMPTY(Organization,OrganizationName); XMLOBJECTVALIDATOR_NONEMPTY(Organization,OrganizationDisplayName); @@ -121,13 +127,13 @@ namespace opensaml { BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,EndpointType); XMLOBJECTVALIDATOR_REQUIRE(EndpointType,Binding); XMLOBJECTVALIDATOR_REQUIRE(EndpointType,Location); - const list& anys=ptr->getXMLObjects(); + const vector& anys=ptr->getUnknownXMLObjects(); for_each(anys.begin(),anys.end(),checkWildcardNS()); END_XMLOBJECTVALIDATOR; BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,IndexedEndpointType,EndpointType); EndpointTypeSchemaValidator::validate(xmlObject); - XMLOBJECTVALIDATOR_REQUIRE(IndexedEndpointType,Index); + XMLOBJECTVALIDATOR_REQUIRE_INTEGER(IndexedEndpointType,Index); END_XMLOBJECTVALIDATOR; BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,ArtifactResolutionService,IndexedEndpointType); @@ -172,7 +178,7 @@ namespace opensaml { END_XMLOBJECTVALIDATOR; BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,AttributeConsumingService); - XMLOBJECTVALIDATOR_REQUIRE(AttributeConsumingService,Index); + XMLOBJECTVALIDATOR_REQUIRE_INTEGER(AttributeConsumingService,Index); XMLOBJECTVALIDATOR_NONEMPTY(AttributeConsumingService,ServiceName); XMLOBJECTVALIDATOR_NONEMPTY(AttributeConsumingService,RequestedAttribute); END_XMLOBJECTVALIDATOR; @@ -226,7 +232,7 @@ namespace opensaml { ptr->getAuthnAuthorityDescriptors().empty() && ptr->getAttributeAuthorityDescriptors().empty() && ptr->getPDPDescriptors().empty()) { - + if (!ptr->getAffiliationDescriptor()) throw ValidationException("EntityDescriptor must have at least one child role or affiliation descriptor."); } @@ -237,31 +243,31 @@ namespace opensaml { BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,EntitiesDescriptor); if (ptr->getEntityDescriptors().empty() && ptr->getEntitiesDescriptors().empty()) - throw ValidationException("EntitiesDescriptor must contain at least one child descriptor."); + throw ValidationException("EntitiesDescriptor must contain at least one child descriptor."); END_XMLOBJECTVALIDATOR; }; }; #define REGISTER_ELEMENT(cname) \ - q=QName(SAMLConstants::SAML20MD_NS,cname::LOCAL_NAME); \ + q=xmltooling::QName(SAML20MD_NS,cname::LOCAL_NAME); \ XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \ - Validator::registerValidator(q,new cname##SchemaValidator()) - + SchemaValidators.registerValidator(q,new cname##SchemaValidator()) + #define REGISTER_TYPE(cname) \ - q=QName(SAMLConstants::SAML20MD_NS,cname::TYPE_NAME); \ + q=xmltooling::QName(SAML20MD_NS,cname::TYPE_NAME); \ XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \ - Validator::registerValidator(q,new cname##SchemaValidator()) + SchemaValidators.registerValidator(q,new cname##SchemaValidator()) #define REGISTER_ELEMENT_NOVAL(cname) \ - q=QName(SAMLConstants::SAML20MD_NS,cname::LOCAL_NAME); \ + q=xmltooling::QName(SAML20MD_NS,cname::LOCAL_NAME); \ XMLObjectBuilder::registerBuilder(q,new cname##Builder()); - + #define REGISTER_TYPE_NOVAL(cname) \ - q=QName(SAMLConstants::SAML20MD_NS,cname::TYPE_NAME); \ + q=xmltooling::QName(SAML20MD_NS,cname::TYPE_NAME); \ XMLObjectBuilder::registerBuilder(q,new cname##Builder()); void opensaml::saml2md::registerMetadataClasses() { - QName q; + xmltooling::QName q; REGISTER_ELEMENT(AdditionalMetadataLocation); REGISTER_ELEMENT(AffiliateMember); REGISTER_ELEMENT(AffiliationDescriptor); @@ -293,6 +299,7 @@ void opensaml::saml2md::registerMetadataClasses() { REGISTER_ELEMENT(OrganizationURL); REGISTER_ELEMENT(PDPDescriptor); REGISTER_ELEMENT(RequestedAttribute); + REGISTER_ELEMENT(RoleDescriptor); REGISTER_ELEMENT(ServiceDescription); REGISTER_ELEMENT(ServiceName); REGISTER_ELEMENT(SingleLogoutService); @@ -319,4 +326,27 @@ void opensaml::saml2md::registerMetadataClasses() { REGISTER_TYPE(PDPDescriptor); REGISTER_TYPE(RequestedAttribute); REGISTER_TYPE(SPSSODescriptor); + + q=xmltooling::QName(SAML20MD_NS,xmlencryption::EncryptionMethod::LOCAL_NAME); + XMLObjectBuilder::registerBuilder(q,new xmlencryption::EncryptionMethodBuilder()); + + q=xmltooling::QName(samlconstants::SAML1MD_NS,SourceID::LOCAL_NAME); + XMLObjectBuilder::registerBuilder(q,new SourceIDBuilder()); + SchemaValidators.registerValidator(q,new SourceIDSchemaValidator()); + + q=xmltooling::QName(SAML20MD_QUERY_EXT_NS,ActionNamespace::LOCAL_NAME); + XMLObjectBuilder::registerBuilder(q,new ActionNamespaceBuilder()); + SchemaValidators.registerValidator(q,new ActionNamespaceSchemaValidator()); + + q=xmltooling::QName(SAML20MD_QUERY_EXT_NS,AuthnQueryDescriptorType::TYPE_NAME); + XMLObjectBuilder::registerBuilder(q,new AuthnQueryDescriptorTypeBuilder()); + SchemaValidators.registerValidator(q,new RoleDescriptorSchemaValidator()); + + q=xmltooling::QName(SAML20MD_QUERY_EXT_NS,AttributeQueryDescriptorType::TYPE_NAME); + XMLObjectBuilder::registerBuilder(q,new AttributeQueryDescriptorTypeBuilder()); + SchemaValidators.registerValidator(q,new RoleDescriptorSchemaValidator()); + + q=xmltooling::QName(SAML20MD_QUERY_EXT_NS,AuthzDecisionQueryDescriptorType::TYPE_NAME); + XMLObjectBuilder::registerBuilder(q,new AuthzDecisionQueryDescriptorTypeBuilder()); + SchemaValidators.registerValidator(q,new RoleDescriptorSchemaValidator()); }