-/*
-* Copyright 2001-2006 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 to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you 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
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
*/
/**
* AssertionsSchemaValidators.cpp
- *
- * Schema-based validators for SAML 1.x Assertions classes
+ *
+ * Schema-based validators for SAML 1.x Assertions classes.
*/
#include "internal.h"
#include "exceptions.h"
#include "saml1/core/Assertions.h"
+#include <xmltooling/validation/Validator.h>
+#include <xmltooling/validation/ValidatorSuite.h>
+
using namespace opensaml::saml1;
using namespace opensaml;
using namespace xmltooling;
using namespace std;
+using samlconstants::SAML1_NS;
namespace opensaml {
namespace saml1 {
-
+
XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,Action);
XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,AssertionIDReference);
XMLOBJECTVALIDATOR_SIMPLE(SAML_DLLLOCAL,Audience);
if (!ptr->hasChildren()) {
XMLOBJECTVALIDATOR_ONEOF(Conditions,NotBefore,NotOnOrAfter);
}
+ else if (ptr->getDoNotCacheConditions().size() > 1) {
+ throw ValidationException("Multiple DoNotCacheCondition elements are not permitted.");
+ }
END_XMLOBJECTVALIDATOR;
BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,SubjectConfirmation);
XMLOBJECTVALIDATOR_REQUIRE(Assertion,Issuer);
XMLOBJECTVALIDATOR_REQUIRE(Assertion,IssueInstant);
if (ptr->getAuthenticationStatements().empty() &&
+ ptr->getAttributeStatements().empty() &&
+ ptr->getAuthorizationDecisionStatements().empty() &&
ptr->getSubjectStatements().empty() &&
ptr->getStatements().empty())
throw ValidationException("Assertion must have at least one statement.");
+ pair<bool,int> minor=ptr->getMinorVersion();
+ if (!minor.first)
+ throw ValidationException("Assertion must have MinorVersion");
+ if (minor.second==0 && ptr->getConditions() && !ptr->getConditions()->getDoNotCacheConditions().empty())
+ throw ValidationException("SAML 1.0 assertions cannot contain DoNotCacheCondition elements.");
END_XMLOBJECTVALIDATOR;
class SAML_DLLLOCAL checkWildcardNS {
public:
void operator()(const XMLObject* xmlObject) const {
const XMLCh* ns=xmlObject->getElementQName().getNamespaceURI();
- if (XMLString::equals(ns,SAMLConstants::SAML1_NS) || !ns || !*ns) {
+ if (XMLString::equals(ns,SAML1_NS) || !ns || !*ns) {
throw ValidationException(
"Object contains an illegal extension child element ($1).",
params(1,xmlObject->getElementQName().toString().c_str())
};
BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,Advice);
- const vector<XMLObject*>& anys=ptr->getOthers();
+ const vector<XMLObject*>& anys=ptr->getUnknownXMLObjects();
for_each(anys.begin(),anys.end(),checkWildcardNS());
END_XMLOBJECTVALIDATOR;
};
#define REGISTER_ELEMENT(cname) \
- q=QName(SAMLConstants::SAML1_NS,cname::LOCAL_NAME); \
+ q=xmltooling::QName(SAML1_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::SAML1_NS,cname::TYPE_NAME); \
+ q=xmltooling::QName(SAML1_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::SAML1_NS,cname::LOCAL_NAME); \
+ q=xmltooling::QName(SAML1_NS,cname::LOCAL_NAME); \
XMLObjectBuilder::registerBuilder(q,new cname##Builder());
-
+
#define REGISTER_TYPE_NOVAL(cname) \
- q=QName(SAMLConstants::SAML1_NS,cname::TYPE_NAME); \
+ q=xmltooling::QName(SAML1_NS,cname::TYPE_NAME); \
XMLObjectBuilder::registerBuilder(q,new cname##Builder());
void opensaml::saml1::registerAssertionClasses() {
- QName q;
+ xmltooling::QName q;
REGISTER_ELEMENT(Action);
REGISTER_ELEMENT(Advice);
REGISTER_ELEMENT(Assertion);
REGISTER_ELEMENT(AuthenticationStatement);
REGISTER_ELEMENT(AuthorityBinding);
REGISTER_ELEMENT(AuthorizationDecisionStatement);
+ REGISTER_ELEMENT_NOVAL(Condition);
REGISTER_ELEMENT(Conditions);
REGISTER_ELEMENT(ConfirmationMethod);
REGISTER_ELEMENT_NOVAL(DoNotCacheCondition);
REGISTER_ELEMENT(Evidence);
REGISTER_ELEMENT(NameIdentifier);
+ REGISTER_ELEMENT_NOVAL(Statement);
REGISTER_ELEMENT(Subject);
REGISTER_ELEMENT(SubjectConfirmation);
REGISTER_ELEMENT_NOVAL(SubjectConfirmationData);
projects / shibboleth / cpp-opensaml.git / blobdiff