https://issues.shibboleth.net/jira/browse/SSPCPP-126

[shibboleth/cpp-opensaml.git] / saml / saml1 / core / impl / AssertionsSchemaValidators.cpp

diff --git a/saml/saml1/core/impl/AssertionsSchemaValidators.cpp b/saml/saml1/core/impl/AssertionsSchemaValidators.cpp
index 61475c3..58f2f4d 100644 (file)
--- a/saml/saml1/core/impl/AssertionsSchemaValidators.cpp
+++ b/saml/saml1/core/impl/AssertionsSchemaValidators.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 @@
 
 /**
  * AssertionsSchemaValidators.cpp
- * 
+ *
  * Schema-based validators for SAML 1.x Assertions classes
  */
 
@@ -24,14 +24,17 @@
 #include "exceptions.h"
 #include "saml1/core/Assertions.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);
@@ -113,7 +116,10 @@ namespace opensaml {
                 ptr->getSubjectStatements().empty() &&
                 ptr->getStatements().empty())
                 throw ValidationException("Assertion must have at least one statement.");
-            if (ptr->getMinorVersion()==0 && ptr->getConditions() && !ptr->getConditions()->getDoNotCacheConditions().empty())
+            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;
 
@@ -121,7 +127,7 @@ namespace opensaml {
         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())
@@ -131,7 +137,7 @@ namespace opensaml {
         };
 
         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;
 
@@ -139,25 +145,23 @@ namespace opensaml {
 };
 
 #define REGISTER_ELEMENT(cname) \
-    q=QName(SAMLConstants::SAML1_NS,cname::LOCAL_NAME); \
+    q=QName(SAML1_NS,cname::LOCAL_NAME); \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
-    AssertionSchemaValidators.registerValidator(q,new cname##SchemaValidator())
-    
+    SchemaValidators.registerValidator(q,new cname##SchemaValidator())
+
 #define REGISTER_TYPE(cname) \
-    q=QName(SAMLConstants::SAML1_NS,cname::TYPE_NAME); \
+    q=QName(SAML1_NS,cname::TYPE_NAME); \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
-    AssertionSchemaValidators.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=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=QName(SAML1_NS,cname::TYPE_NAME); \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
 
-ValidatorSuite opensaml::saml1::AssertionSchemaValidators("AssertionSchemaValidators");
-
 void opensaml::saml1::registerAssertionClasses() {
     QName q;
     REGISTER_ELEMENT(Action);
@@ -173,11 +177,13 @@ void opensaml::saml1::registerAssertionClasses() {
     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);