projects
/
shibboleth
/
cpp-opensaml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a misnamed class reference.
[shibboleth/cpp-opensaml.git]
/
saml
/
saml2
/
metadata
/
impl
/
MetadataSchemaValidators.cpp
diff --git
a/saml/saml2/metadata/impl/MetadataSchemaValidators.cpp
b/saml/saml2/metadata/impl/MetadataSchemaValidators.cpp
index
36e1a29
..
80c72cd
100644
(file)
--- a/
saml/saml2/metadata/impl/MetadataSchemaValidators.cpp
+++ b/
saml/saml2/metadata/impl/MetadataSchemaValidators.cpp
@@
-1,6
+1,6
@@
/*
/*
-* Copyright 2001-200
6
Internet2
- *
+* Copyright 2001-200
7
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
* 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
/**
* MetadataSchemaValidators.cpp
- *
+ *
* Schema-based validators for SAML 2.0 Metadata classes
*/
* Schema-based validators for SAML 2.0 Metadata classes
*/
@@
-24,15
+24,19
@@
#include "exceptions.h"
#include "saml2/metadata/Metadata.h"
#include "exceptions.h"
#include "saml2/metadata/Metadata.h"
+#include <xmltooling/validation/ValidatorSuite.h>
+
using namespace opensaml::saml2md;
using namespace opensaml::saml2;
using namespace opensaml;
using namespace xmltooling;
using namespace std;
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 {
namespace opensaml {
namespace saml2md {
-
+
XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,ActionNamespace);
XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,AffiliateMember);
XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,AttributeProfile);
XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,ActionNamespace);
XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,AffiliateMember);
XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,AttributeProfile);
@@
-50,10
+54,10
@@
namespace opensaml {
END_XMLOBJECTVALIDATOR;
BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,localizedURIType);
END_XMLOBJECTVALIDATOR;
BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,localizedURIType);
- XMLOBJECTVALIDATOR_REQUIRE(localized
Name
Type,TextContent);
+ XMLOBJECTVALIDATOR_REQUIRE(localized
URI
Type,TextContent);
XMLOBJECTVALIDATOR_REQUIRE(localizedURIType,Lang);
END_XMLOBJECTVALIDATOR;
XMLOBJECTVALIDATOR_REQUIRE(localizedURIType,Lang);
END_XMLOBJECTVALIDATOR;
-
+
BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,OrganizationName,localizedNameType);
localizedNameTypeSchemaValidator::validate(xmlObject);
END_XMLOBJECTVALIDATOR;
BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,OrganizationName,localizedNameType);
localizedNameTypeSchemaValidator::validate(xmlObject);
END_XMLOBJECTVALIDATOR;
@@
-70,7
+74,7
@@
namespace opensaml {
public:
void operator()(const XMLObject* xmlObject) const {
const XMLCh* ns=xmlObject->getElementQName().getNamespaceURI();
public:
void operator()(const XMLObject* xmlObject) const {
const XMLCh* ns=xmlObject->getElementQName().getNamespaceURI();
- if (XMLString::equals(ns,SAML
Constants::SAML
20MD_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())
throw ValidationException(
"Object contains an illegal extension child element ($1).",
params(1,xmlObject->getElementQName().toString().c_str())
@@
-82,10
+86,10
@@
namespace opensaml {
BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,Extensions);
if (!ptr->hasChildren())
throw ValidationException("Extensions must have at least one child element.");
BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,Extensions);
if (!ptr->hasChildren())
throw ValidationException("Extensions must have at least one child element.");
- const
list<XMLObject*>& anys=ptr->get
XMLObjects();
+ const
vector<XMLObject*>& anys=ptr->getUnknown
XMLObjects();
for_each(anys.begin(),anys.end(),checkWildcardNS());
END_XMLOBJECTVALIDATOR;
for_each(anys.begin(),anys.end(),checkWildcardNS());
END_XMLOBJECTVALIDATOR;
-
+
BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,Organization);
XMLOBJECTVALIDATOR_NONEMPTY(Organization,OrganizationName);
XMLOBJECTVALIDATOR_NONEMPTY(Organization,OrganizationDisplayName);
BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,Organization);
XMLOBJECTVALIDATOR_NONEMPTY(Organization,OrganizationName);
XMLOBJECTVALIDATOR_NONEMPTY(Organization,OrganizationDisplayName);
@@
-123,7
+127,7
@@
namespace opensaml {
BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,EndpointType);
XMLOBJECTVALIDATOR_REQUIRE(EndpointType,Binding);
XMLOBJECTVALIDATOR_REQUIRE(EndpointType,Location);
BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,EndpointType);
XMLOBJECTVALIDATOR_REQUIRE(EndpointType,Binding);
XMLOBJECTVALIDATOR_REQUIRE(EndpointType,Location);
- const
list<XMLObject*>& anys=ptr->get
XMLObjects();
+ const
vector<XMLObject*>& anys=ptr->getUnknown
XMLObjects();
for_each(anys.begin(),anys.end(),checkWildcardNS());
END_XMLOBJECTVALIDATOR;
for_each(anys.begin(),anys.end(),checkWildcardNS());
END_XMLOBJECTVALIDATOR;
@@
-228,7
+232,7
@@
namespace opensaml {
ptr->getAuthnAuthorityDescriptors().empty() &&
ptr->getAttributeAuthorityDescriptors().empty() &&
ptr->getPDPDescriptors().empty()) {
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.");
}
if (!ptr->getAffiliationDescriptor())
throw ValidationException("EntityDescriptor must have at least one child role or affiliation descriptor.");
}
@@
-239,31
+243,31
@@
namespace opensaml {
BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,EntitiesDescriptor);
if (ptr->getEntityDescriptors().empty() && ptr->getEntitiesDescriptors().empty())
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) \
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()); \
SchemaValidators.registerValidator(q,new cname##SchemaValidator())
XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
SchemaValidators.registerValidator(q,new cname##SchemaValidator())
-
+
#define REGISTER_TYPE(cname) \
#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()); \
SchemaValidators.registerValidator(q,new cname##SchemaValidator())
#define REGISTER_ELEMENT_NOVAL(cname) \
XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
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());
XMLObjectBuilder::registerBuilder(q,new cname##Builder());
-
+
#define REGISTER_TYPE_NOVAL(cname) \
#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() {
XMLObjectBuilder::registerBuilder(q,new cname##Builder());
void opensaml::saml2md::registerMetadataClasses() {
- QName q;
+
xmltooling::
QName q;
REGISTER_ELEMENT(AdditionalMetadataLocation);
REGISTER_ELEMENT(AffiliateMember);
REGISTER_ELEMENT(AffiliationDescriptor);
REGISTER_ELEMENT(AdditionalMetadataLocation);
REGISTER_ELEMENT(AffiliateMember);
REGISTER_ELEMENT(AffiliationDescriptor);
@@
-295,6
+299,7
@@
void opensaml::saml2md::registerMetadataClasses() {
REGISTER_ELEMENT(OrganizationURL);
REGISTER_ELEMENT(PDPDescriptor);
REGISTER_ELEMENT(RequestedAttribute);
REGISTER_ELEMENT(OrganizationURL);
REGISTER_ELEMENT(PDPDescriptor);
REGISTER_ELEMENT(RequestedAttribute);
+ REGISTER_ELEMENT(RoleDescriptor);
REGISTER_ELEMENT(ServiceDescription);
REGISTER_ELEMENT(ServiceName);
REGISTER_ELEMENT(SingleLogoutService);
REGISTER_ELEMENT(ServiceDescription);
REGISTER_ELEMENT(ServiceName);
REGISTER_ELEMENT(SingleLogoutService);
@@
-322,23
+327,26
@@
void opensaml::saml2md::registerMetadataClasses() {
REGISTER_TYPE(RequestedAttribute);
REGISTER_TYPE(SPSSODescriptor);
REGISTER_TYPE(RequestedAttribute);
REGISTER_TYPE(SPSSODescriptor);
- q=QName(SAMLConstants::SAML1MD_NS,SourceID::LOCAL_NAME);
+ 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());
XMLObjectBuilder::registerBuilder(q,new SourceIDBuilder());
SchemaValidators.registerValidator(q,new SourceIDSchemaValidator());
- q=
QName(SAMLConstants::
SAML20MD_QUERY_EXT_NS,ActionNamespace::LOCAL_NAME);
+ q=
xmltooling::QName(
SAML20MD_QUERY_EXT_NS,ActionNamespace::LOCAL_NAME);
XMLObjectBuilder::registerBuilder(q,new ActionNamespaceBuilder());
SchemaValidators.registerValidator(q,new ActionNamespaceSchemaValidator());
XMLObjectBuilder::registerBuilder(q,new ActionNamespaceBuilder());
SchemaValidators.registerValidator(q,new ActionNamespaceSchemaValidator());
- q=
QName(SAMLConstants::
SAML20MD_QUERY_EXT_NS,AuthnQueryDescriptorType::TYPE_NAME);
+ q=
xmltooling::QName(
SAML20MD_QUERY_EXT_NS,AuthnQueryDescriptorType::TYPE_NAME);
XMLObjectBuilder::registerBuilder(q,new AuthnQueryDescriptorTypeBuilder());
SchemaValidators.registerValidator(q,new RoleDescriptorSchemaValidator());
XMLObjectBuilder::registerBuilder(q,new AuthnQueryDescriptorTypeBuilder());
SchemaValidators.registerValidator(q,new RoleDescriptorSchemaValidator());
- q=
QName(SAMLConstants::
SAML20MD_QUERY_EXT_NS,AttributeQueryDescriptorType::TYPE_NAME);
+ q=
xmltooling::QName(
SAML20MD_QUERY_EXT_NS,AttributeQueryDescriptorType::TYPE_NAME);
XMLObjectBuilder::registerBuilder(q,new AttributeQueryDescriptorTypeBuilder());
SchemaValidators.registerValidator(q,new RoleDescriptorSchemaValidator());
XMLObjectBuilder::registerBuilder(q,new AttributeQueryDescriptorTypeBuilder());
SchemaValidators.registerValidator(q,new RoleDescriptorSchemaValidator());
- q=
QName(SAMLConstants::
SAML20MD_QUERY_EXT_NS,AuthzDecisionQueryDescriptorType::TYPE_NAME);
+ q=
xmltooling::QName(
SAML20MD_QUERY_EXT_NS,AuthzDecisionQueryDescriptorType::TYPE_NAME);
XMLObjectBuilder::registerBuilder(q,new AuthzDecisionQueryDescriptorTypeBuilder());
SchemaValidators.registerValidator(q,new RoleDescriptorSchemaValidator());
}
XMLObjectBuilder::registerBuilder(q,new AuthzDecisionQueryDescriptorTypeBuilder());
SchemaValidators.registerValidator(q,new RoleDescriptorSchemaValidator());
}