#include "exceptions.h"
#include "saml2/core/Protocols.h"
+#include <xmltooling/validation/ValidatorSuite.h>
+
using namespace opensaml::saml2p;
using namespace opensaml::saml2;
using namespace opensaml;
using namespace xmltooling;
using namespace std;
+using samlconstants::SAML20P_NS;
namespace opensaml {
namespace saml2p {
XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,RequesterID);
XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,SessionIndex);
XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,StatusMessage);
+
+ XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,RespondTo);
//TODO wildcard NS ##other - spec says must be a "non-SAML defined" namespace,
// not just other than the target namespace
public:
void operator()(const XMLObject* xmlObject) const {
const XMLCh* ns=xmlObject->getElementQName().getNamespaceURI();
- if (XMLString::equals(ns,SAMLConstants::SAML20P_NS) || !ns || !*ns) {
+ if (XMLString::equals(ns,SAML20P_NS) || !ns || !*ns) {
throw ValidationException(
"Object contains an illegal extension child element ($1).",
params(1,xmlObject->getElementQName().toString().c_str())
}
};
- BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,Request);
- XMLOBJECTVALIDATOR_REQUIRE(Request,ID);
- XMLOBJECTVALIDATOR_REQUIRE(Request,Version);
- XMLOBJECTVALIDATOR_REQUIRE(Request,IssueInstant);
- if (!XMLString::equals(SAMLConstants::SAML20_VERSION, ptr->getVersion()))
+ BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,RequestAbstractType);
+ XMLOBJECTVALIDATOR_REQUIRE(RequestAbstractType,ID);
+ XMLOBJECTVALIDATOR_REQUIRE(RequestAbstractType,Version);
+ XMLOBJECTVALIDATOR_REQUIRE(RequestAbstractType,IssueInstant);
+ if (!XMLString::equals(samlconstants::SAML20_VERSION, ptr->getVersion()))
throw ValidationException("Request has wrong SAML Version.");
END_XMLOBJECTVALIDATOR;
- BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,SubjectQuery,Request);
- RequestSchemaValidator::validate(xmlObject);
+ BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,SubjectQuery,RequestAbstractType);
+ RequestAbstractTypeSchemaValidator::validate(xmlObject);
XMLOBJECTVALIDATOR_REQUIRE(SubjectQuery,Subject);
END_XMLOBJECTVALIDATOR;
- BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,StatusResponse);
- XMLOBJECTVALIDATOR_REQUIRE(StatusResponse,ID);
- XMLOBJECTVALIDATOR_REQUIRE(StatusResponse,Version);
- XMLOBJECTVALIDATOR_REQUIRE(StatusResponse,IssueInstant);
- XMLOBJECTVALIDATOR_REQUIRE(StatusResponse,Status);
- if (!XMLString::equals(SAMLConstants::SAML20_VERSION, ptr->getVersion()))
+ BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,StatusResponseType);
+ XMLOBJECTVALIDATOR_REQUIRE(StatusResponseType,ID);
+ XMLOBJECTVALIDATOR_REQUIRE(StatusResponseType,Version);
+ XMLOBJECTVALIDATOR_REQUIRE(StatusResponseType,IssueInstant);
+ XMLOBJECTVALIDATOR_REQUIRE(StatusResponseType,Status);
+ if (!XMLString::equals(samlconstants::SAML20_VERSION, ptr->getVersion()))
throw ValidationException("StatusResponse has wrong SAML Version.");
END_XMLOBJECTVALIDATOR;
{
QName pq = ptr->getParent()->getElementQName();
- if ( XMLString::equals(pq.getNamespaceURI(), SAMLConstants::SAML20P_NS) &&
+ if ( XMLString::equals(pq.getNamespaceURI(), SAML20P_NS) &&
XMLString::equals(pq.getLocalPart(), Status::LOCAL_NAME))
{
const XMLCh* code = ptr->getValue();
XMLOBJECTVALIDATOR_REQUIRE(Status,StatusCode);
END_XMLOBJECTVALIDATOR;
- BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,AssertionIDRequest,Request);
- RequestSchemaValidator::validate(xmlObject);
+ BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,AssertionIDRequest,RequestAbstractType);
+ RequestAbstractTypeSchemaValidator::validate(xmlObject);
XMLOBJECTVALIDATOR_NONEMPTY(AssertionIDRequest,AssertionIDRef);
END_XMLOBJECTVALIDATOR;
throw xmltooling::ValidationException("ProxyCount attribute on Scoping element must be non-negative");
END_XMLOBJECTVALIDATOR;
- BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,AuthnRequest,Request);
- RequestSchemaValidator::validate(xmlObject);
+ BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,AuthnRequest,RequestAbstractType);
+ RequestAbstractTypeSchemaValidator::validate(xmlObject);
if (ptr->getAssertionConsumerServiceIndex().first
&& (ptr->getAssertionConsumerServiceURL()!=NULL || ptr->getProtocolBinding()!=NULL))
throw xmltooling::ValidationException("On AuthnRequest AssertionConsumerServiceIndex is mutually exclusive with both AssertionConsumerServiceURL and ProtocolBinding");
END_XMLOBJECTVALIDATOR;
- BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,Response,StatusResponse);
- StatusResponseSchemaValidator::validate(xmlObject);
+ BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,Response,StatusResponseType);
+ StatusResponseTypeSchemaValidator::validate(xmlObject);
END_XMLOBJECTVALIDATOR;
- BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,ArtifactResolve,Request);
- RequestSchemaValidator::validate(xmlObject);
+ BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,ArtifactResolve,RequestAbstractType);
+ RequestAbstractTypeSchemaValidator::validate(xmlObject);
XMLOBJECTVALIDATOR_REQUIRE(ArtifactResolve,Artifact);
END_XMLOBJECTVALIDATOR;
- BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,ArtifactResponse,StatusResponse);
- StatusResponseSchemaValidator::validate(xmlObject);
+ BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,ArtifactResponse,StatusResponseType);
+ StatusResponseTypeSchemaValidator::validate(xmlObject);
END_XMLOBJECTVALIDATOR;
BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,NewEncryptedID);
XMLOBJECTVALIDATOR_REQUIRE(NewEncryptedID,EncryptedData);
END_XMLOBJECTVALIDATOR;
- BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,ManageNameIDRequest,Request);
- RequestSchemaValidator::validate(xmlObject);
+ BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,ManageNameIDRequest,RequestAbstractType);
+ RequestAbstractTypeSchemaValidator::validate(xmlObject);
XMLOBJECTVALIDATOR_ONLYONEOF(ManageNameIDRequest,NameID,EncryptedID);
XMLOBJECTVALIDATOR_ONLYONEOF3(ManageNameIDRequest,NewID,NewEncryptedID,Terminate);
END_XMLOBJECTVALIDATOR;
- BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,ManageNameIDResponse,StatusResponse);
- StatusResponseSchemaValidator::validate(xmlObject);
+ BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,ManageNameIDResponse,StatusResponseType);
+ StatusResponseTypeSchemaValidator::validate(xmlObject);
END_XMLOBJECTVALIDATOR;
- BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,LogoutRequest,Request);
- RequestSchemaValidator::validate(xmlObject);
+ BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,LogoutRequest,RequestAbstractType);
+ RequestAbstractTypeSchemaValidator::validate(xmlObject);
XMLOBJECTVALIDATOR_ONLYONEOF3(LogoutRequest,BaseID,NameID,EncryptedID);
END_XMLOBJECTVALIDATOR;
- BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,LogoutResponse,StatusResponse);
- StatusResponseSchemaValidator::validate(xmlObject);
+ BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,LogoutResponse,StatusResponseType);
+ StatusResponseTypeSchemaValidator::validate(xmlObject);
END_XMLOBJECTVALIDATOR;
- BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,NameIDMappingRequest,Request);
- RequestSchemaValidator::validate(xmlObject);
+ BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,NameIDMappingRequest,RequestAbstractType);
+ RequestAbstractTypeSchemaValidator::validate(xmlObject);
XMLOBJECTVALIDATOR_ONLYONEOF3(NameIDMappingRequest,BaseID,NameID,EncryptedID);
XMLOBJECTVALIDATOR_REQUIRE(NameIDMappingRequest,NameIDPolicy);
END_XMLOBJECTVALIDATOR;
- BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,NameIDMappingResponse,StatusResponse);
- StatusResponseSchemaValidator::validate(xmlObject);
+ BEGIN_XMLOBJECTVALIDATOR_SUB(SAML_DLLLOCAL,NameIDMappingResponse,StatusResponseType);
+ StatusResponseTypeSchemaValidator::validate(xmlObject);
XMLOBJECTVALIDATOR_ONLYONEOF(NameIDMappingResponse,NameID,EncryptedID);
END_XMLOBJECTVALIDATOR;
};
#define REGISTER_ELEMENT(cname) \
- q=QName(SAMLConstants::SAML20P_NS,cname::LOCAL_NAME); \
+ q=QName(SAML20P_NS,cname::LOCAL_NAME); \
XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
- ProtocolSchemaValidators.registerValidator(q,new cname##SchemaValidator())
+ SchemaValidators.registerValidator(q,new cname##SchemaValidator())
#define REGISTER_TYPE(cname) \
- q=QName(SAMLConstants::SAML20P_NS,cname::TYPE_NAME); \
+ q=QName(SAML20P_NS,cname::TYPE_NAME); \
XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
- ProtocolSchemaValidators.registerValidator(q,new cname##SchemaValidator())
+ SchemaValidators.registerValidator(q,new cname##SchemaValidator())
#define REGISTER_ELEMENT_NOVAL(cname) \
- q=QName(SAMLConstants::SAML20P_NS,cname::LOCAL_NAME); \
+ q=QName(SAML20P_NS,cname::LOCAL_NAME); \
XMLObjectBuilder::registerBuilder(q,new cname##Builder());
#define REGISTER_TYPE_NOVAL(cname) \
- q=QName(SAMLConstants::SAML20P_NS,cname::TYPE_NAME); \
+ q=QName(SAML20P_NS,cname::TYPE_NAME); \
XMLObjectBuilder::registerBuilder(q,new cname##Builder());
-ValidatorSuite opensaml::saml2p::ProtocolSchemaValidators("ProtocolSchemaValidators");
-
void opensaml::saml2p::registerProtocolClasses() {
QName q;
REGISTER_ELEMENT(Artifact);
REGISTER_TYPE(Scoping);
REGISTER_TYPE(Status);
REGISTER_TYPE(StatusCode);
- REGISTER_TYPE(StatusResponse);
REGISTER_TYPE_NOVAL(StatusDetail);
REGISTER_TYPE_NOVAL(Terminate);
+
+ q=QName(samlconstants::SAML20P_THIRDPARTY_EXT_NS,RespondTo::LOCAL_NAME);
+ XMLObjectBuilder::registerBuilder(q,new RespondToBuilder());
+ SchemaValidators.registerValidator(q,new RespondToSchemaValidator());
}