ReplayCache, some decoder work, and merged schema validators into one suite.

[shibboleth/cpp-opensaml.git] / saml / saml2 / core / Assertions.h

diff --git a/saml/saml2/core/Assertions.h b/saml/saml2/core/Assertions.h
index 0272bd7..a21444d 100644 (file)
--- a/saml/saml2/core/Assertions.h
+++ b/saml/saml2/core/Assertions.h
@@ -34,7 +34,6 @@
 #include <xmltooling/signature/KeyResolver.h>
 #include <xmltooling/signature/Signature.h>
 #include <xmltooling/util/DateTime.h>
-#include <xmltooling/validation/ValidatingXMLObject.h>
 #include <xmltooling/validation/ValidatorSuite.h>
 
 #define DECL_SAML2OBJECTBUILDER(cname) \
@@ -50,6 +49,7 @@ namespace opensaml {
         
         // Forward references
         class SAML_API Assertion;
+        class SAML_API EncryptedAssertion;
         
         DECL_XMLOBJECT_SIMPLE(SAML_API,AssertionIDRef,AssertionID,SAML 2.0 AssertionIDRef element);
         DECL_XMLOBJECT_SIMPLE(SAML_API,AssertionURIRef,AssertionURI,SAML 2.0 AssertionURIRef element);
@@ -94,6 +94,22 @@ namespace opensaml {
             DECL_XMLOBJECT_CONTENT(Name);
             /** NameIDType local name */
             static const XMLCh TYPE_NAME[];
+            /** Unspecified name format ID */\r
+            static const XMLCh UNSPECIFIED[];\r
+            /** Email address name format ID */\r
+            static const XMLCh EMAIL[];\r
+            /** X.509 subject name format ID */\r
+            static const XMLCh X509_SUBJECT[];\r
+            /** Windows domain qualified name format ID */\r
+            static const XMLCh WIN_DOMAIN_QUALIFIED[];\r
+            /** Kerberos principal name format ID */\r
+            static const XMLCh KERBEROS[];\r
+            /** Entity identifier name format ID */\r
+            static const XMLCh ENTITY[];\r
+            /** Persistent identifier name format ID */\r
+            static const XMLCh PERSISTENT[];\r
+            /** Transient identifier name format ID */\r
+            static const XMLCh TRANSIENT[];\r
         END_XMLOBJECT;
 
         BEGIN_XMLOBJECT(SAML_API,NameID,NameIDType,SAML 2.0 NameID element);
@@ -163,6 +179,12 @@ namespace opensaml {
             DECL_TYPED_CHILD(KeyInfoConfirmationDataType);
             /** SubjectConfirmationType local name */
             static const XMLCh TYPE_NAME[];
+            /** Bearer confirmation method */
+            static const XMLCh BEARER[];\r
+            /** Holder of key confirmation method */\r
+            static const XMLCh HOLDER_KEY[];\r
+            /** Sender vouches confirmation method */\r
+            static const XMLCh SENDER_VOUCHES[];\r
         END_XMLOBJECT;
 
         BEGIN_XMLOBJECT(SAML_API,Subject,xmltooling::XMLObject,SAML 2.0 Subject element);
@@ -211,13 +233,21 @@ namespace opensaml {
             DECL_XMLOBJECT_CONTENT(Action);
             /** ActionType local name */
             static const XMLCh TYPE_NAME[];
+            /** Read/Write/Execute/Delete/Control Action Namespace */
+            static const XMLCh RWEDC_NEG_ACTION_NAMESPACE[];\r
+            /** Read/Write/Execute/Delete/Control with Negation Action Namespace */
+            static const XMLCh RWEDC_ACTION_NAMESPACE[];\r
+            /** Get/Head/Put/Post Action Namespace */
+            static const XMLCh GHPP_ACTION_NAMESPACE[];\r
+            /** UNIX File Permissions Action Namespace */
+            static const XMLCh UNIX_ACTION_NAMESPACE[];\r
         END_XMLOBJECT;
 
         BEGIN_XMLOBJECT(SAML_API,Evidence,xmltooling::XMLObject,SAML 2.0 Evidence element);
             DECL_TYPED_CHILDREN(AssertionIDRef);
             DECL_TYPED_CHILDREN(AssertionURIRef);
             DECL_TYPED_CHILDREN(Assertion);
-            //DECL_TYPED_CHILDREN(EncryptedAssertion);
+            DECL_TYPED_CHILDREN(EncryptedAssertion);
             /** EvidenceType local name */
             static const XMLCh TYPE_NAME[];
         END_XMLOBJECT;
@@ -247,6 +277,12 @@ namespace opensaml {
             DECL_XMLOBJECT_CHILDREN(AttributeValue);
             /** AttributeType local name */
             static const XMLCh TYPE_NAME[];
+            /** Unspecified attribute name format ID */\r
+            static const XMLCh UNSPECIFIED[];\r
+            /** URI reference attribute name format ID */\r
+            static const XMLCh URI_REFERENCE[];\r
+            /** Basic attribute name format ID */\r
+            static const XMLCh BASIC[];\r
         END_XMLOBJECT;
 
         BEGIN_XMLOBJECT(SAML_API,EncryptedAttribute,EncryptedElementType,SAML 2.0 EncryptedAttribute element);
@@ -384,11 +420,6 @@ namespace opensaml {
          * Registers builders and validators for SAML 2.0 Assertion classes into the runtime.
          */
         void SAML_API registerAssertionClasses();
-
-        /**
-         * Validator suite for SAML 2.0 Assertion schema validation.
-         */
-        extern SAML_API xmltooling::ValidatorSuite AssertionSchemaValidators;
     };
 };