X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml2%2Fcore%2Fimpl%2FProtocols20Impl.cpp;h=15c4a17a63de6c523c5224b3489cda4000b5e078;hb=c94a8ec50180f280a81259fa13a23eb3a45e087f;hp=e4b652ec1ca913e90602065eb3a10ebe035c538b;hpb=7dc9b5dddfc5d68129fc6af1da704a46e247432e;p=shibboleth%2Fcpp-opensaml.git diff --git a/saml/saml2/core/impl/Protocols20Impl.cpp b/saml/saml2/core/impl/Protocols20Impl.cpp index e4b652e..15c4a17 100644 --- a/saml/saml2/core/impl/Protocols20Impl.cpp +++ b/saml/saml2/core/impl/Protocols20Impl.cpp @@ -1,36 +1,42 @@ -/* - * 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 +/** + * 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. */ /** * Protocols20Impl.cpp * - * Implementation classes for SAML 2.0 Protocols schema + * Implementation classes for SAML 2.0 Protocols schema. */ #include "internal.h" #include "exceptions.h" -#include "saml/encryption/EncryptedKeyResolver.h" #include "saml2/core/Protocols.h" +#include "signature/ContentReference.h" #include #include -#include +#include #include #include #include +#include +#include #include #include @@ -75,15 +81,17 @@ namespace opensaml { public: virtual ~ExtensionsImpl() {} - ExtensionsImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) + ExtensionsImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { } ExtensionsImpl(const ExtensionsImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { - VectorOf(XMLObject) v=getUnknownXMLObjects(); - for (vector::const_iterator i=src.m_UnknownXMLObjects.begin(); i!=src.m_UnknownXMLObjects.end(); ++i) - v.push_back((*i)->clone()); + for (vector::const_iterator i=src.m_UnknownXMLObjects.begin(); i!=src.m_UnknownXMLObjects.end(); ++i) { + if (*i) { + getUnknownXMLObjects().push_back((*i)->clone()); + } + } } IMPL_XMLOBJECT_CLONE(Extensions); @@ -109,18 +117,20 @@ namespace opensaml { public AbstractXMLObjectUnmarshaller { void init() { - m_Value=NULL; - m_StatusCode=NULL; - m_children.push_back(NULL); + m_Value=nullptr; + m_StatusCode=nullptr; + m_children.push_back(nullptr); m_pos_StatusCode=m_children.begin(); } + public: - virtual ~StatusCodeImpl() {} + virtual ~StatusCodeImpl() { + XMLString::release(&m_Value); + } - StatusCodeImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) - { - init(); + StatusCodeImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) + : AbstractXMLObject(nsURI, localName, prefix, schemaType) { + init(); } StatusCodeImpl(const StatusCodeImpl& src) @@ -137,7 +147,7 @@ namespace opensaml { protected: void marshallAttributes(DOMElement* domElement) const { - MARSHALL_STRING_ATTRIB(Value,VALUE,NULL); + MARSHALL_STRING_ATTRIB(Value,VALUE,nullptr); } void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { @@ -146,7 +156,7 @@ namespace opensaml { } void processAttribute(const DOMAttr* attribute) { - PROC_STRING_ATTRIB(Value,VALUE,NULL); + PROC_STRING_ATTRIB(Value,VALUE,nullptr); AbstractXMLObjectUnmarshaller::processAttribute(attribute); } }; @@ -161,14 +171,17 @@ namespace opensaml { public: virtual ~StatusDetailImpl() {} - StatusDetailImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { } + StatusDetailImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) + : AbstractXMLObject(nsURI, localName, prefix, schemaType) { + } StatusDetailImpl(const StatusDetailImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { - VectorOf(XMLObject) v=getUnknownXMLObjects(); - for (vector::const_iterator i=src.m_UnknownXMLObjects.begin(); i!=src.m_UnknownXMLObjects.end(); ++i) - v.push_back((*i)->clone()); + for (vector::const_iterator i=src.m_UnknownXMLObjects.begin(); i!=src.m_UnknownXMLObjects.end(); ++i) { + if (*i) { + getUnknownXMLObjects().push_back((*i)->clone()); + } + } } IMPL_XMLOBJECT_CLONE(StatusDetail); @@ -188,28 +201,28 @@ namespace opensaml { public AbstractXMLObjectUnmarshaller { void init() { - m_StatusCode=NULL; - m_StatusMessage=NULL; - m_StatusDetail=NULL; - m_children.push_back(NULL); - m_children.push_back(NULL); - m_children.push_back(NULL); + m_StatusCode=nullptr; + m_StatusMessage=nullptr; + m_StatusDetail=nullptr; + m_children.push_back(nullptr); + m_children.push_back(nullptr); + m_children.push_back(nullptr); m_pos_StatusCode=m_children.begin(); m_pos_StatusMessage=m_pos_StatusCode; ++m_pos_StatusMessage; m_pos_StatusDetail=m_pos_StatusMessage; ++m_pos_StatusDetail; } + public: virtual ~StatusImpl() { } - StatusImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) + StatusImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { init(); } - StatusImpl(const StatusImpl& src) - : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { + StatusImpl(const StatusImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { init(); if (src.getStatusCode()) setStatusCode(src.getStatusCode()->cloneStatusCode()); @@ -225,14 +238,12 @@ namespace opensaml { IMPL_TYPED_CHILD(StatusDetail); protected: - void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { PROC_TYPED_CHILD(StatusCode,SAML20P_NS,false); PROC_TYPED_CHILD(StatusMessage,SAML20P_NS,false); PROC_TYPED_CHILD(StatusDetail,SAML20P_NS,false); AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root); } - }; @@ -243,27 +254,29 @@ namespace opensaml { public AbstractXMLObjectUnmarshaller { void init() { - m_ID=NULL; - m_Version=NULL; - m_IssueInstant=NULL; - m_Destination=NULL; - m_Consent=NULL; - m_Issuer=NULL; - m_Signature=NULL; - m_Extensions=NULL; - m_children.push_back(NULL); - m_children.push_back(NULL); - m_children.push_back(NULL); + m_ID=nullptr; + m_Version=nullptr; + m_IssueInstant=nullptr; + m_Destination=nullptr; + m_Consent=nullptr; + m_Issuer=nullptr; + m_Signature=nullptr; + m_Extensions=nullptr; + m_children.push_back(nullptr); + m_children.push_back(nullptr); + m_children.push_back(nullptr); m_pos_Issuer=m_children.begin(); m_pos_Signature=m_pos_Issuer; ++m_pos_Signature; m_pos_Extensions=m_pos_Signature; ++m_pos_Extensions; } + protected: RequestAbstractTypeImpl() { init(); } + public: virtual ~RequestAbstractTypeImpl() { XMLString::release(&m_ID); @@ -273,7 +286,7 @@ namespace opensaml { delete m_IssueInstant; } - RequestAbstractTypeImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) + RequestAbstractTypeImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { init(); } @@ -281,6 +294,9 @@ namespace opensaml { RequestAbstractTypeImpl(const RequestAbstractTypeImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { init(); + } + + void _clone(const RequestAbstractTypeImpl& src) { setID(src.getID()); setVersion(src.getVersion()); setIssueInstant(src.getIssueInstant()); @@ -311,9 +327,13 @@ namespace opensaml { if (m_Signature) m_Signature->setContentReference(new opensaml::ContentReference(*this)); } + + RequestAbstractType* cloneRequestAbstractType() const { + return dynamic_cast(clone()); + } IMPL_STRING_ATTRIB(Version); - IMPL_ID_ATTRIB(ID); + IMPL_ID_ATTRIB_EX(ID,ID,nullptr); IMPL_DATETIME_ATTRIB(IssueInstant,0); IMPL_STRING_ATTRIB(Destination); IMPL_STRING_ATTRIB(Consent); @@ -321,20 +341,25 @@ namespace opensaml { IMPL_TYPED_CHILD(Extensions); protected: + void prepareForMarshalling() const { + if (m_Signature) + declareNonVisibleNamespaces(); + } + void marshallAttributes(DOMElement* domElement) const { if (!m_Version) const_cast(this)->m_Version=XMLString::transcode("2.0"); - MARSHALL_STRING_ATTRIB(Version,VER,NULL); + MARSHALL_STRING_ATTRIB(Version,VER,nullptr); if (!m_ID) const_cast(this)->m_ID=SAMLConfig::getConfig().generateIdentifier(); - MARSHALL_ID_ATTRIB(ID,ID,NULL); + MARSHALL_ID_ATTRIB(ID,ID,nullptr); if (!m_IssueInstant) { - const_cast(this)->m_IssueInstantEpoch=time(NULL); + const_cast(this)->m_IssueInstantEpoch=time(nullptr); const_cast(this)->m_IssueInstant=new DateTime(m_IssueInstantEpoch); } - MARSHALL_DATETIME_ATTRIB(IssueInstant,ISSUEINSTANT,NULL); - MARSHALL_STRING_ATTRIB(Destination,DESTINATION,NULL); - MARSHALL_STRING_ATTRIB(Consent,CONSENT,NULL); + MARSHALL_DATETIME_ATTRIB(IssueInstant,ISSUEINSTANT,nullptr); + MARSHALL_STRING_ATTRIB(Destination,DESTINATION,nullptr); + MARSHALL_STRING_ATTRIB(Consent,CONSENT,nullptr); } void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { @@ -345,11 +370,11 @@ namespace opensaml { } void processAttribute(const DOMAttr* attribute) { - PROC_ID_ATTRIB(ID,ID,NULL); - PROC_STRING_ATTRIB(Version,VER,NULL); - PROC_DATETIME_ATTRIB(IssueInstant,ISSUEINSTANT,NULL); - PROC_STRING_ATTRIB(Destination,DESTINATION,NULL); - PROC_STRING_ATTRIB(Consent,CONSENT,NULL); + PROC_ID_ATTRIB(ID,ID,nullptr); + PROC_STRING_ATTRIB(Version,VER,nullptr); + PROC_DATETIME_ATTRIB(IssueInstant,ISSUEINSTANT,nullptr); + PROC_STRING_ATTRIB(Destination,DESTINATION,nullptr); + PROC_STRING_ATTRIB(Consent,CONSENT,nullptr); AbstractXMLObjectUnmarshaller::processAttribute(attribute); } }; @@ -360,24 +385,22 @@ namespace opensaml { public: virtual ~AssertionIDRequestImpl() { } - AssertionIDRequestImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) + AssertionIDRequestImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { } AssertionIDRequestImpl(const AssertionIDRequestImpl& src) : AbstractXMLObject(src), RequestAbstractTypeImpl(src) { - VectorOf(AssertionIDRef) v=getAssertionIDRefs(); + } + + void _clone(const AssertionIDRequestImpl& src) { + RequestAbstractTypeImpl::_clone(src); for (vector::const_iterator i=src.m_AssertionIDRefs.begin(); i!=src.m_AssertionIDRefs.end(); i++) { if (*i) { - v.push_back((*i)->cloneAssertionIDRef()); + getAssertionIDRefs().push_back((*i)->cloneAssertionIDRef()); } } - } - IMPL_XMLOBJECT_CLONE(AssertionIDRequest); - RequestAbstractType* cloneRequestAbstractType() const { - return cloneAssertionIDRequest(); - } - + IMPL_XMLOBJECT_CLONE_EX(AssertionIDRequest); IMPL_TYPED_FOREIGN_CHILDREN(AssertionIDRef,saml2,m_children.end()); protected: @@ -389,32 +412,40 @@ namespace opensaml { class SAML_DLLLOCAL SubjectQueryImpl : public virtual SubjectQuery, public RequestAbstractTypeImpl { - void init() - { - m_Subject = NULL; - m_children.push_back(NULL); + void init() { + m_Subject = nullptr; + m_children.push_back(nullptr); m_pos_Subject = m_pos_Extensions; ++m_pos_Subject; } + protected: SubjectQueryImpl() { init(); } + public: virtual ~SubjectQueryImpl() { } - SubjectQueryImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) - { + SubjectQueryImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) + : AbstractXMLObject(nsURI, localName, prefix, schemaType) { init(); } SubjectQueryImpl(const SubjectQueryImpl& src) : AbstractXMLObject(src), RequestAbstractTypeImpl(src) { init(); + } + + void _clone(const SubjectQueryImpl& src) { + RequestAbstractTypeImpl::_clone(src); if (src.getSubject()) setSubject(src.getSubject()->cloneSubject()); } + SubjectQuery* cloneSubjectQuery() const { + return dynamic_cast(clone()); + } + IMPL_TYPED_FOREIGN_CHILD(Subject,saml2); protected: @@ -424,7 +455,6 @@ namespace opensaml { } }; - class SAML_DLLLOCAL RequestedAuthnContextImpl : public virtual RequestedAuthnContext, public AbstractComplexElement, public AbstractDOMCachingXMLObject, @@ -432,14 +462,15 @@ namespace opensaml { public AbstractXMLObjectUnmarshaller { void init() { - m_Comparison=NULL; + m_Comparison=nullptr; } + public: virtual ~RequestedAuthnContextImpl() { XMLString::release(&m_Comparison); } - RequestedAuthnContextImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) + RequestedAuthnContextImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { init(); } @@ -472,7 +503,7 @@ namespace opensaml { protected: void marshallAttributes(DOMElement* domElement) const { - MARSHALL_STRING_ATTRIB(Comparison,COMPARISON,NULL); + MARSHALL_STRING_ATTRIB(Comparison,COMPARISON,nullptr); } void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { @@ -482,54 +513,50 @@ namespace opensaml { } void processAttribute(const DOMAttr* attribute) { - PROC_STRING_ATTRIB(Comparison,COMPARISON,NULL); + PROC_STRING_ATTRIB(Comparison,COMPARISON,nullptr); AbstractXMLObjectUnmarshaller::processAttribute(attribute); } }; - class SAML_DLLLOCAL AuthnQueryImpl : public virtual AuthnQuery, public SubjectQueryImpl { void init() { - m_SessionIndex=NULL; - m_RequestedAuthnContext=NULL; - m_children.push_back(NULL); + m_SessionIndex=nullptr; + m_RequestedAuthnContext=nullptr; + m_children.push_back(nullptr); m_pos_RequestedAuthnContext = m_pos_Subject; ++m_pos_RequestedAuthnContext; } + public: virtual ~AuthnQueryImpl() { XMLString::release(&m_SessionIndex); } - AuthnQueryImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) - { + AuthnQueryImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) + : AbstractXMLObject(nsURI, localName, prefix, schemaType) { init(); } AuthnQueryImpl(const AuthnQueryImpl& src) : AbstractXMLObject(src), SubjectQueryImpl(src) { init(); + } + + void _clone(const AuthnQueryImpl& src) { + SubjectQueryImpl::_clone(src); setSessionIndex(src.getSessionIndex()); if (src.getRequestedAuthnContext()) setRequestedAuthnContext(src.getRequestedAuthnContext()->cloneRequestedAuthnContext()); } - IMPL_XMLOBJECT_CLONE(AuthnQuery); - SubjectQuery* cloneSubjectQuery() const { - return cloneAuthnQuery(); - } - RequestAbstractType* cloneRequestAbstractType() const { - return cloneAuthnQuery(); - } - + IMPL_XMLOBJECT_CLONE_EX(AuthnQuery); IMPL_STRING_ATTRIB(SessionIndex); IMPL_TYPED_CHILD(RequestedAuthnContext); protected: void marshallAttributes(DOMElement* domElement) const { - MARSHALL_STRING_ATTRIB(SessionIndex,SESSIONINDEX,NULL); + MARSHALL_STRING_ATTRIB(SessionIndex,SESSIONINDEX,nullptr); SubjectQueryImpl::marshallAttributes(domElement); } @@ -538,7 +565,7 @@ namespace opensaml { SubjectQueryImpl::processChildElement(childXMLObject,root); } void processAttribute(const DOMAttr* attribute) { - PROC_STRING_ATTRIB(SessionIndex,SESSIONINDEX,NULL); + PROC_STRING_ATTRIB(SessionIndex,SESSIONINDEX,nullptr); SubjectQueryImpl::processAttribute(attribute); } }; @@ -548,10 +575,14 @@ namespace opensaml { public: virtual ~AttributeQueryImpl() { } - AttributeQueryImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) + AttributeQueryImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { } AttributeQueryImpl(const AttributeQueryImpl& src) : AbstractXMLObject(src), SubjectQueryImpl(src) { + } + + void _clone(const AttributeQueryImpl& src) { + SubjectQueryImpl::_clone(src); for (list::const_iterator i=src.m_children.begin(); i!=src.m_children.end(); i++) { if (*i) { Attribute* attrib=dynamic_cast(*i); @@ -561,17 +592,9 @@ namespace opensaml { } } } - } - IMPL_XMLOBJECT_CLONE(AttributeQuery); - SubjectQuery* cloneSubjectQuery() const { - return cloneAttributeQuery(); - } - RequestAbstractType* cloneRequestAbstractType() const { - return cloneAttributeQuery(); - } - + IMPL_XMLOBJECT_CLONE_EX(AttributeQuery); IMPL_TYPED_FOREIGN_CHILDREN(Attribute,saml2,m_children.end()); protected: @@ -584,25 +607,29 @@ namespace opensaml { class SAML_DLLLOCAL AuthzDecisionQueryImpl : public virtual AuthzDecisionQuery, public SubjectQueryImpl { void init() { - m_Resource=NULL; - m_Evidence=NULL; - m_children.push_back(NULL); + m_Resource=nullptr; + m_Evidence=nullptr; + m_children.push_back(nullptr); m_pos_Evidence=m_pos_Subject; - ++m_pos_Evidence; - + ++m_pos_Evidence; } + public: virtual ~AuthzDecisionQueryImpl() { XMLString::release(&m_Resource); } - AuthzDecisionQueryImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) + AuthzDecisionQueryImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { init(); } AuthzDecisionQueryImpl(const AuthzDecisionQueryImpl& src) : AbstractXMLObject(src), SubjectQueryImpl(src) { init(); + } + + void _clone(const AuthzDecisionQueryImpl& src) { + SubjectQueryImpl::_clone(src); setResource(src.getResource()); if (src.getEvidence()) setEvidence(src.getEvidence()->cloneEvidence()); @@ -617,21 +644,14 @@ namespace opensaml { } } - IMPL_XMLOBJECT_CLONE(AuthzDecisionQuery); - SubjectQuery* cloneSubjectQuery() const { - return cloneAuthzDecisionQuery(); - } - RequestAbstractType* cloneRequestAbstractType() const { - return cloneAuthzDecisionQuery(); - } - + IMPL_XMLOBJECT_CLONE_EX(AuthzDecisionQuery); IMPL_STRING_ATTRIB(Resource); IMPL_TYPED_FOREIGN_CHILDREN(Action,saml2,m_pos_Evidence); IMPL_TYPED_FOREIGN_CHILD(Evidence,saml2); protected: void marshallAttributes(DOMElement* domElement) const { - MARSHALL_STRING_ATTRIB(Resource,RESOURCE,NULL); + MARSHALL_STRING_ATTRIB(Resource,RESOURCE,nullptr); SubjectQueryImpl::marshallAttributes(domElement); } @@ -641,7 +661,7 @@ namespace opensaml { SubjectQueryImpl::processChildElement(childXMLObject,root); } void processAttribute(const DOMAttr* attribute) { - PROC_STRING_ATTRIB(Resource,RESOURCE,NULL); + PROC_STRING_ATTRIB(Resource,RESOURCE,nullptr); SubjectQueryImpl::processAttribute(attribute); } }; @@ -653,21 +673,20 @@ namespace opensaml { public AbstractXMLObjectUnmarshaller { void init() { - m_Format=NULL; - m_SPNameQualifier=NULL; + m_Format=nullptr; + m_SPNameQualifier=nullptr; m_AllowCreate=XML_BOOL_NULL; } + public: - virtual ~NameIDPolicyImpl() - { + virtual ~NameIDPolicyImpl() { XMLString::release(&m_Format); XMLString::release(&m_SPNameQualifier); } - NameIDPolicyImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) - { - init(); + NameIDPolicyImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) + : AbstractXMLObject(nsURI, localName, prefix, schemaType) { + init(); } NameIDPolicyImpl(const NameIDPolicyImpl& src) @@ -675,7 +694,7 @@ namespace opensaml { init(); setFormat(src.getFormat()); setSPNameQualifier(src.getSPNameQualifier()); - AllowCreate(m_AllowCreate); + AllowCreate(src.m_AllowCreate); } IMPL_XMLOBJECT_CLONE(NameIDPolicy); @@ -685,15 +704,15 @@ namespace opensaml { protected: void marshallAttributes(DOMElement* domElement) const { - MARSHALL_STRING_ATTRIB(Format,FORMAT,NULL); - MARSHALL_STRING_ATTRIB(SPNameQualifier,SPNAMEQUALIFIER,NULL); - MARSHALL_BOOLEAN_ATTRIB(AllowCreate,ALLOWCREATE,NULL); + MARSHALL_STRING_ATTRIB(Format,FORMAT,nullptr); + MARSHALL_STRING_ATTRIB(SPNameQualifier,SPNAMEQUALIFIER,nullptr); + MARSHALL_BOOLEAN_ATTRIB(AllowCreate,ALLOWCREATE,nullptr); } void processAttribute(const DOMAttr* attribute) { - PROC_STRING_ATTRIB(Format,FORMAT,NULL); - PROC_STRING_ATTRIB(SPNameQualifier,SPNAMEQUALIFIER,NULL); - PROC_BOOLEAN_ATTRIB(AllowCreate,ALLOWCREATE,NULL); + PROC_STRING_ATTRIB(Format,FORMAT,nullptr); + PROC_STRING_ATTRIB(SPNameQualifier,SPNAMEQUALIFIER,nullptr); + PROC_BOOLEAN_ATTRIB(AllowCreate,ALLOWCREATE,nullptr); AbstractXMLObjectUnmarshaller::processAttribute(attribute); } }; @@ -705,26 +724,24 @@ namespace opensaml { public AbstractXMLObjectUnmarshaller { void init() { - m_ProviderID=NULL; - m_Name=NULL; - m_Loc=NULL; + m_ProviderID=nullptr; + m_Name=nullptr; + m_Loc=nullptr; } + public: - virtual ~IDPEntryImpl() - { + virtual ~IDPEntryImpl() { XMLString::release(&m_ProviderID); XMLString::release(&m_Name); XMLString::release(&m_Loc); } - IDPEntryImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) - { - init(); + IDPEntryImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) + : AbstractXMLObject(nsURI, localName, prefix, schemaType) { + init(); } - IDPEntryImpl(const IDPEntryImpl& src) - : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src) { + IDPEntryImpl(const IDPEntryImpl& src) : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src) { init(); setProviderID(src.getProviderID()); setName(src.getName()); @@ -738,15 +755,15 @@ namespace opensaml { protected: void marshallAttributes(DOMElement* domElement) const { - MARSHALL_STRING_ATTRIB(ProviderID,PROVIDERID,NULL); - MARSHALL_STRING_ATTRIB(Name,NAME,NULL); - MARSHALL_STRING_ATTRIB(Loc,LOC,NULL); + MARSHALL_STRING_ATTRIB(ProviderID,PROVIDERID,nullptr); + MARSHALL_STRING_ATTRIB(Name,NAME,nullptr); + MARSHALL_STRING_ATTRIB(Loc,LOC,nullptr); } void processAttribute(const DOMAttr* attribute) { - PROC_STRING_ATTRIB(ProviderID,PROVIDERID,NULL); - PROC_STRING_ATTRIB(Name,NAME,NULL); - PROC_STRING_ATTRIB(Loc,LOC,NULL); + PROC_STRING_ATTRIB(ProviderID,PROVIDERID,nullptr); + PROC_STRING_ATTRIB(Name,NAME,nullptr); + PROC_STRING_ATTRIB(Loc,LOC,nullptr); AbstractXMLObjectUnmarshaller::processAttribute(attribute); } }; @@ -758,17 +775,16 @@ namespace opensaml { public AbstractXMLObjectUnmarshaller { void init() { - m_GetComplete=NULL; - m_children.push_back(NULL); + m_GetComplete=nullptr; + m_children.push_back(nullptr); m_pos_GetComplete=m_children.begin(); - } + public: virtual ~IDPListImpl() { } - IDPListImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) - { + IDPListImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) + : AbstractXMLObject(nsURI, localName, prefix, schemaType) { init(); } @@ -777,13 +793,9 @@ namespace opensaml { init(); if (src.getGetComplete()) setGetComplete(src.getGetComplete()->cloneGetComplete()); - for (list::const_iterator i=src.m_children.begin(); i!=src.m_children.end(); i++) { + for (vector::const_iterator i=src.m_IDPEntrys.begin(); i!=src.m_IDPEntrys.end(); ++i) { if (*i) { - IDPEntry* entry=dynamic_cast(*i); - if (entry) { - getIDPEntrys().push_back(entry->cloneIDPEntry()); - continue; - } + getIDPEntrys().push_back((*i)->cloneIDPEntry()); } } } @@ -808,36 +820,31 @@ namespace opensaml { public AbstractXMLObjectUnmarshaller { void init() { - m_ProxyCount=NULL; - m_IDPList=NULL; - m_children.push_back(NULL); + m_ProxyCount=nullptr; + m_IDPList=nullptr; + m_children.push_back(nullptr); m_pos_IDPList=m_children.begin(); - } + public: virtual ~ScopingImpl() { XMLString::release(&m_ProxyCount); } - ScopingImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) - { + ScopingImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) + : AbstractXMLObject(nsURI, localName, prefix, schemaType) { init(); } ScopingImpl(const ScopingImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { init(); - setProxyCount(m_ProxyCount); + setProxyCount(src.m_ProxyCount); if (src.getIDPList()) setIDPList(src.getIDPList()->cloneIDPList()); - for (list::const_iterator i=src.m_children.begin(); i!=src.m_children.end(); i++) { + for (vector::const_iterator i=src.m_RequesterIDs.begin(); i!=src.m_RequesterIDs.end(); ++i) { if (*i) { - RequesterID* reqid =dynamic_cast(*i); - if (reqid) { - getRequesterIDs().push_back(reqid->cloneRequesterID()); - continue; - } + getRequesterIDs().push_back((*i)->cloneRequesterID()); } } } @@ -849,7 +856,7 @@ namespace opensaml { protected: void marshallAttributes(DOMElement* domElement) const { - MARSHALL_INTEGER_ATTRIB(ProxyCount,PROXYCOUNT,NULL); + MARSHALL_INTEGER_ATTRIB(ProxyCount,PROXYCOUNT,nullptr); } void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { @@ -859,7 +866,7 @@ namespace opensaml { } void processAttribute(const DOMAttr* attribute) { - PROC_INTEGER_ATTRIB(ProxyCount,PROXYCOUNT,NULL); + PROC_INTEGER_ATTRIB(ProxyCount,PROXYCOUNT,nullptr); AbstractXMLObjectUnmarshaller::processAttribute(attribute); } }; @@ -869,22 +876,22 @@ namespace opensaml { void init() { m_ForceAuthn=XML_BOOL_NULL; m_IsPassive=XML_BOOL_NULL; - m_ProtocolBinding=NULL; - m_AssertionConsumerServiceIndex=NULL; - m_AssertionConsumerServiceURL=NULL; - m_AttributeConsumingServiceIndex=NULL; - m_ProviderName=NULL; - - m_Subject=NULL; - m_NameIDPolicy=NULL; - m_Conditions=NULL; - m_RequestedAuthnContext=NULL; - m_Scoping=NULL; - m_children.push_back(NULL); - m_children.push_back(NULL); - m_children.push_back(NULL); - m_children.push_back(NULL); - m_children.push_back(NULL); + m_ProtocolBinding=nullptr; + m_AssertionConsumerServiceIndex=nullptr; + m_AssertionConsumerServiceURL=nullptr; + m_AttributeConsumingServiceIndex=nullptr; + m_ProviderName=nullptr; + + m_Subject=nullptr; + m_NameIDPolicy=nullptr; + m_Conditions=nullptr; + m_RequestedAuthnContext=nullptr; + m_Scoping=nullptr; + m_children.push_back(nullptr); + m_children.push_back(nullptr); + m_children.push_back(nullptr); + m_children.push_back(nullptr); + m_children.push_back(nullptr); m_pos_Subject=m_pos_Extensions; ++m_pos_Subject; m_pos_NameIDPolicy=m_pos_Subject; @@ -895,8 +902,8 @@ namespace opensaml { ++m_pos_RequestedAuthnContext; m_pos_Scoping=m_pos_RequestedAuthnContext; ++m_pos_Scoping; - } + public: virtual ~AuthnRequestImpl() { XMLString::release(&m_ProtocolBinding); @@ -906,23 +913,24 @@ namespace opensaml { XMLString::release(&m_AttributeConsumingServiceIndex); } - AuthnRequestImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) - { + AuthnRequestImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) + : AbstractXMLObject(nsURI, localName, prefix, schemaType) { init(); } AuthnRequestImpl(const AuthnRequestImpl& src) : AbstractXMLObject(src), RequestAbstractTypeImpl(src) { init(); + } - ForceAuthn(m_ForceAuthn); - IsPassive(m_IsPassive); + void _clone(const AuthnRequestImpl& src) { + RequestAbstractTypeImpl::_clone(src); + ForceAuthn(src.m_ForceAuthn); + IsPassive(src.m_IsPassive); setProtocolBinding(src.getProtocolBinding()); - setAssertionConsumerServiceIndex(m_AssertionConsumerServiceIndex); + setAssertionConsumerServiceIndex(src.m_AssertionConsumerServiceIndex); setAssertionConsumerServiceURL(src.getAssertionConsumerServiceURL()); - setAttributeConsumingServiceIndex(m_AttributeConsumingServiceIndex); + setAttributeConsumingServiceIndex(src.m_AttributeConsumingServiceIndex); setProviderName(src.getProviderName()); - if (src.getSubject()) setSubject(src.getSubject()->cloneSubject()); if (src.getNameIDPolicy()) @@ -935,10 +943,7 @@ namespace opensaml { setScoping(src.getScoping()->cloneScoping()); } - IMPL_XMLOBJECT_CLONE(AuthnRequest); - RequestAbstractType* cloneRequestAbstractType() const { - return cloneAuthnRequest(); - } + IMPL_XMLOBJECT_CLONE_EX(AuthnRequest); IMPL_BOOLEAN_ATTRIB(ForceAuthn); IMPL_BOOLEAN_ATTRIB(IsPassive); @@ -956,13 +961,13 @@ namespace opensaml { protected: void marshallAttributes(DOMElement* domElement) const { - MARSHALL_BOOLEAN_ATTRIB(ForceAuthn,FORCEAUTHN,NULL); - MARSHALL_BOOLEAN_ATTRIB(IsPassive,ISPASSIVE,NULL); - MARSHALL_STRING_ATTRIB(ProtocolBinding,PROTOCOLBINDING,NULL); - MARSHALL_INTEGER_ATTRIB(AssertionConsumerServiceIndex,ASSERTIONCONSUMERSERVICEINDEX,NULL); - MARSHALL_STRING_ATTRIB(AssertionConsumerServiceURL,ASSERTIONCONSUMERSERVICEURL,NULL); - MARSHALL_INTEGER_ATTRIB(AttributeConsumingServiceIndex,ATTRIBUTECONSUMINGSERVICEINDEX,NULL); - MARSHALL_STRING_ATTRIB(ProviderName,PROVIDERNAME,NULL); + MARSHALL_BOOLEAN_ATTRIB(ForceAuthn,FORCEAUTHN,nullptr); + MARSHALL_BOOLEAN_ATTRIB(IsPassive,ISPASSIVE,nullptr); + MARSHALL_STRING_ATTRIB(ProtocolBinding,PROTOCOLBINDING,nullptr); + MARSHALL_INTEGER_ATTRIB(AssertionConsumerServiceIndex,ASSERTIONCONSUMERSERVICEINDEX,nullptr); + MARSHALL_STRING_ATTRIB(AssertionConsumerServiceURL,ASSERTIONCONSUMERSERVICEURL,nullptr); + MARSHALL_INTEGER_ATTRIB(AttributeConsumingServiceIndex,ATTRIBUTECONSUMINGSERVICEINDEX,nullptr); + MARSHALL_STRING_ATTRIB(ProviderName,PROVIDERNAME,nullptr); RequestAbstractTypeImpl::marshallAttributes(domElement); } @@ -975,13 +980,13 @@ namespace opensaml { RequestAbstractTypeImpl::processChildElement(childXMLObject,root); } void processAttribute(const DOMAttr* attribute) { - PROC_BOOLEAN_ATTRIB(ForceAuthn,FORCEAUTHN,NULL); - PROC_BOOLEAN_ATTRIB(IsPassive,ISPASSIVE,NULL); - PROC_STRING_ATTRIB(ProtocolBinding,PROTOCOLBINDING,NULL); - PROC_INTEGER_ATTRIB(AssertionConsumerServiceIndex,ASSERTIONCONSUMERSERVICEINDEX,NULL); - PROC_STRING_ATTRIB(AssertionConsumerServiceURL,ASSERTIONCONSUMERSERVICEURL,NULL); - PROC_INTEGER_ATTRIB(AttributeConsumingServiceIndex,ATTRIBUTECONSUMINGSERVICEINDEX,NULL); - PROC_STRING_ATTRIB(ProviderName,PROVIDERNAME,NULL); + PROC_BOOLEAN_ATTRIB(ForceAuthn,FORCEAUTHN,nullptr); + PROC_BOOLEAN_ATTRIB(IsPassive,ISPASSIVE,nullptr); + PROC_STRING_ATTRIB(ProtocolBinding,PROTOCOLBINDING,nullptr); + PROC_INTEGER_ATTRIB(AssertionConsumerServiceIndex,ASSERTIONCONSUMERSERVICEINDEX,nullptr); + PROC_STRING_ATTRIB(AssertionConsumerServiceURL,ASSERTIONCONSUMERSERVICEURL,nullptr); + PROC_INTEGER_ATTRIB(AttributeConsumingServiceIndex,ATTRIBUTECONSUMINGSERVICEINDEX,nullptr); + PROC_STRING_ATTRIB(ProviderName,PROVIDERNAME,nullptr); RequestAbstractTypeImpl::processAttribute(attribute); } }; @@ -993,20 +998,20 @@ namespace opensaml { public AbstractXMLObjectUnmarshaller { void init() { - m_ID=NULL; - m_InResponseTo=NULL; - m_Version=NULL; - m_IssueInstant=NULL; - m_Destination=NULL; - m_Consent=NULL; - m_Issuer=NULL; - m_Signature=NULL; - m_Extensions=NULL; - m_Status=NULL; - m_children.push_back(NULL); - m_children.push_back(NULL); - m_children.push_back(NULL); - m_children.push_back(NULL); + m_ID=nullptr; + m_InResponseTo=nullptr; + m_Version=nullptr; + m_IssueInstant=nullptr; + m_Destination=nullptr; + m_Consent=nullptr; + m_Issuer=nullptr; + m_Signature=nullptr; + m_Extensions=nullptr; + m_Status=nullptr; + m_children.push_back(nullptr); + m_children.push_back(nullptr); + m_children.push_back(nullptr); + m_children.push_back(nullptr); m_pos_Issuer=m_children.begin(); m_pos_Signature=m_pos_Issuer; ++m_pos_Signature; @@ -1015,10 +1020,12 @@ namespace opensaml { m_pos_Status=m_pos_Extensions; ++m_pos_Status; } + protected: StatusResponseTypeImpl() { init(); } + public: virtual ~StatusResponseTypeImpl() { XMLString::release(&m_ID); @@ -1029,15 +1036,17 @@ namespace opensaml { delete m_IssueInstant; } - StatusResponseTypeImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) - { + StatusResponseTypeImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) + : AbstractXMLObject(nsURI, localName, prefix, schemaType) { init(); } StatusResponseTypeImpl(const StatusResponseTypeImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { init(); + } + + void _clone(const StatusResponseTypeImpl& src) { setID(src.getID()); setInResponseTo(src.getInResponseTo()); setVersion(src.getVersion()); @@ -1072,8 +1081,12 @@ namespace opensaml { m_Signature->setContentReference(new opensaml::ContentReference(*this)); } + StatusResponseType* cloneStatusResponseType() const { + return dynamic_cast(clone()); + } + IMPL_STRING_ATTRIB(Version); - IMPL_ID_ATTRIB(ID); + IMPL_ID_ATTRIB_EX(ID,ID,nullptr); IMPL_STRING_ATTRIB(InResponseTo); IMPL_DATETIME_ATTRIB(IssueInstant,0); IMPL_STRING_ATTRIB(Destination); @@ -1083,21 +1096,26 @@ namespace opensaml { IMPL_TYPED_CHILD(Status); protected: + void prepareForMarshalling() const { + if (m_Signature) + declareNonVisibleNamespaces(); + } + void marshallAttributes(DOMElement* domElement) const { if (!m_Version) const_cast(this)->m_Version=XMLString::transcode("2.0"); - MARSHALL_STRING_ATTRIB(Version,VER,NULL); + MARSHALL_STRING_ATTRIB(Version,VER,nullptr); if (!m_ID) const_cast(this)->m_ID=SAMLConfig::getConfig().generateIdentifier(); - MARSHALL_ID_ATTRIB(ID,ID,NULL); + MARSHALL_ID_ATTRIB(ID,ID,nullptr); if (!m_IssueInstant) { - const_cast(this)->m_IssueInstantEpoch=time(NULL); + const_cast(this)->m_IssueInstantEpoch=time(nullptr); const_cast(this)->m_IssueInstant=new DateTime(m_IssueInstantEpoch); } - MARSHALL_DATETIME_ATTRIB(IssueInstant,ISSUEINSTANT,NULL); - MARSHALL_STRING_ATTRIB(Destination,DESTINATION,NULL); - MARSHALL_STRING_ATTRIB(Consent,CONSENT,NULL); - MARSHALL_STRING_ATTRIB(InResponseTo,INRESPONSETO,NULL); + MARSHALL_DATETIME_ATTRIB(IssueInstant,ISSUEINSTANT,nullptr); + MARSHALL_STRING_ATTRIB(Destination,DESTINATION,nullptr); + MARSHALL_STRING_ATTRIB(Consent,CONSENT,nullptr); + MARSHALL_STRING_ATTRIB(InResponseTo,INRESPONSETO,nullptr); } void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { @@ -1109,12 +1127,12 @@ namespace opensaml { } void processAttribute(const DOMAttr* attribute) { - PROC_ID_ATTRIB(ID,ID,NULL); - PROC_STRING_ATTRIB(Version,VER,NULL); - PROC_STRING_ATTRIB(InResponseTo,INRESPONSETO,NULL); - PROC_DATETIME_ATTRIB(IssueInstant,ISSUEINSTANT,NULL); - PROC_STRING_ATTRIB(Destination,DESTINATION,NULL); - PROC_STRING_ATTRIB(Consent,CONSENT,NULL); + PROC_ID_ATTRIB(ID,ID,nullptr); + PROC_STRING_ATTRIB(Version,VER,nullptr); + PROC_STRING_ATTRIB(InResponseTo,INRESPONSETO,nullptr); + PROC_DATETIME_ATTRIB(IssueInstant,ISSUEINSTANT,nullptr); + PROC_STRING_ATTRIB(Destination,DESTINATION,nullptr); + PROC_STRING_ATTRIB(Consent,CONSENT,nullptr); AbstractXMLObjectUnmarshaller::processAttribute(attribute); } }; @@ -1124,10 +1142,14 @@ namespace opensaml { public: virtual ~ResponseImpl() { } - ResponseImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) + ResponseImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { } ResponseImpl(const ResponseImpl& src) : AbstractXMLObject(src), StatusResponseTypeImpl(src) { + } + + void _clone(const ResponseImpl& src) { + StatusResponseTypeImpl::_clone(src); for (list::const_iterator i=src.m_children.begin(); i!=src.m_children.end(); i++) { if (*i) { saml2::Assertion* assertion=dynamic_cast(*i); @@ -1142,14 +1164,9 @@ namespace opensaml { } } } - } - IMPL_XMLOBJECT_CLONE(Response); - StatusResponseType* cloneStatusResponseType() const { - return cloneResponse(); - } - + IMPL_XMLOBJECT_CLONE_EX(Response); IMPL_TYPED_FOREIGN_CHILDREN(Assertion,saml2,m_children.end()); IMPL_TYPED_FOREIGN_CHILDREN(EncryptedAssertion,saml2,m_children.end()); @@ -1164,31 +1181,31 @@ namespace opensaml { class SAML_DLLLOCAL ArtifactResolveImpl : public virtual ArtifactResolve, public RequestAbstractTypeImpl { void init() { - m_Artifact=NULL; - m_children.push_back(NULL); + m_Artifact=nullptr; + m_children.push_back(nullptr); m_pos_Artifact=m_pos_Extensions; ++m_pos_Artifact; } + public: virtual ~ArtifactResolveImpl() { } - ArtifactResolveImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) - { + ArtifactResolveImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) + : AbstractXMLObject(nsURI, localName, prefix, schemaType) { init(); } ArtifactResolveImpl(const ArtifactResolveImpl& src) : AbstractXMLObject(src), RequestAbstractTypeImpl(src) { init(); + } + + void _clone(const ArtifactResolveImpl& src) { + RequestAbstractTypeImpl::_clone(src); if(src.getArtifact()) setArtifact(src.getArtifact()->cloneArtifact()); } - IMPL_XMLOBJECT_CLONE(ArtifactResolve); - RequestAbstractType* cloneRequestAbstractType() const { - return cloneArtifactResolve(); - } - + IMPL_XMLOBJECT_CLONE_EX(ArtifactResolve); IMPL_TYPED_CHILD(Artifact); protected: @@ -1201,45 +1218,41 @@ namespace opensaml { class SAML_DLLLOCAL ArtifactResponseImpl : public virtual ArtifactResponse, public StatusResponseTypeImpl { void init() { - m_Payload=NULL; - m_children.push_back(NULL); + m_Payload=nullptr; + m_children.push_back(nullptr); m_pos_Payload=m_pos_Status; ++m_pos_Payload; } + public: virtual ~ArtifactResponseImpl() { } - ArtifactResponseImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) - { + ArtifactResponseImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) + : AbstractXMLObject(nsURI, localName, prefix, schemaType) { init(); } ArtifactResponseImpl(const ArtifactResponseImpl& src) : AbstractXMLObject(src), StatusResponseTypeImpl(src) { init(); - if (src.getPayload()) - setPayload(getPayload()->clone()); + } + void _clone(const ArtifactResponseImpl& src) { + StatusResponseTypeImpl::_clone(src); + if (src.getPayload()) + setPayload(src.getPayload()->clone()); } - IMPL_XMLOBJECT_CLONE(ArtifactResponse); - StatusResponseType* cloneStatusResponseType() const { - return cloneArtifactResponse(); - } - + IMPL_XMLOBJECT_CLONE_EX(ArtifactResponse); IMPL_XMLOBJECT_CHILD(Payload); protected: void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { // These are valid elements for the parent StatusResponseType, so don't process these. // If not one of these, then it must be the payload. - if ( - ! XMLHelper::isNodeNamed(root,SAML20_NS,saml2::Issuer::LOCAL_NAME) && - ! XMLHelper::isNodeNamed(root,XMLSIG_NS,xmlsignature::Signature::LOCAL_NAME) && - ! XMLHelper::isNodeNamed(root,SAML20P_NS,saml2p::Extensions::LOCAL_NAME) && - ! XMLHelper::isNodeNamed(root,SAML20P_NS,saml2p::Status::LOCAL_NAME) - ) - { + if (!XMLHelper::isNodeNamed(root,SAML20_NS,saml2::Issuer::LOCAL_NAME) && + !XMLHelper::isNodeNamed(root,XMLSIG_NS,xmlsignature::Signature::LOCAL_NAME) && + !XMLHelper::isNodeNamed(root,SAML20P_NS,saml2p::Extensions::LOCAL_NAME) && + !XMLHelper::isNodeNamed(root,SAML20P_NS,saml2p::Status::LOCAL_NAME)) { setPayload(childXMLObject); return; } @@ -1255,23 +1268,21 @@ namespace opensaml { public AbstractXMLObjectUnmarshaller { void init() { - m_EncryptedData=NULL; - m_children.push_back(NULL); + m_EncryptedData=nullptr; + m_children.push_back(nullptr); m_pos_EncryptedData=m_children.begin(); } protected: - NewEncryptedIDImpl() - { + NewEncryptedIDImpl() { init(); } public: virtual ~NewEncryptedIDImpl() {} - NewEncryptedIDImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) - { + NewEncryptedIDImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) + : AbstractXMLObject(nsURI, localName, prefix, schemaType) { init(); } @@ -1280,42 +1291,14 @@ namespace opensaml { init(); if (src.getEncryptedData()) setEncryptedData(src.getEncryptedData()->cloneEncryptedData()); - VectorOf(xmlencryption::EncryptedKey) v=getEncryptedKeys(); for (vector::const_iterator i=src.m_EncryptedKeys.begin(); i!=src.m_EncryptedKeys.end(); i++) { if (*i) { - v.push_back((*i)->cloneEncryptedKey()); + getEncryptedKeys().push_back((*i)->cloneEncryptedKey()); } } } - XMLObject* decrypt(const CredentialResolver& credResolver, const XMLCh* recipient, CredentialCriteria* criteria) const - { - if (!m_EncryptedData) - throw DecryptionException("No encrypted data present."); - EncryptedKeyResolver ekr(*this); - Decrypter decrypter(&credResolver, criteria, &ekr); - DOMDocumentFragment* frag = decrypter.decryptData(*m_EncryptedData, recipient); - if (frag->hasChildNodes() && frag->getFirstChild()==frag->getLastChild()) { - DOMNode* plaintext=frag->getFirstChild(); - if (plaintext->getNodeType()==DOMNode::ELEMENT_NODE) { - // Import the tree into a new Document that we can bind to the unmarshalled object. - XercesJanitor newdoc(XMLToolingConfig::getConfig().getParser().newDocument()); - DOMElement* treecopy = static_cast(newdoc->importNode(plaintext, true)); - newdoc->appendChild(treecopy); - auto_ptr ret(XMLObjectBuilder::buildOneFromElement(treecopy, true)); - newdoc.release(); - return ret.release(); - } - } - frag->release(); - throw DecryptionException("Decryption did not result in a single element."); - } - - IMPL_XMLOBJECT_CLONE(NewEncryptedID); - EncryptedElementType* cloneEncryptedElementType() const { - return new NewEncryptedIDImpl(*this); - } - + IMPL_XMLOBJECT_CLONE2(NewEncryptedID,EncryptedElementType); IMPL_TYPED_FOREIGN_CHILD(EncryptedData,xmlencryption); IMPL_TYPED_FOREIGN_CHILDREN(EncryptedKey,xmlencryption,m_children.end()); @@ -1336,7 +1319,7 @@ namespace opensaml { public: virtual ~TerminateImpl() { } - TerminateImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) + TerminateImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { } TerminateImpl(const TerminateImpl& src) @@ -1352,16 +1335,16 @@ namespace opensaml { class SAML_DLLLOCAL ManageNameIDRequestImpl : public virtual ManageNameIDRequest, public RequestAbstractTypeImpl { void init() { - m_NameID=NULL; - m_EncryptedID=NULL; - m_NewID=NULL; - m_NewEncryptedID=NULL; - m_Terminate=NULL; - m_children.push_back(NULL); - m_children.push_back(NULL); - m_children.push_back(NULL); - m_children.push_back(NULL); - m_children.push_back(NULL); + m_NameID=nullptr; + m_EncryptedID=nullptr; + m_NewID=nullptr; + m_NewEncryptedID=nullptr; + m_Terminate=nullptr; + m_children.push_back(nullptr); + m_children.push_back(nullptr); + m_children.push_back(nullptr); + m_children.push_back(nullptr); + m_children.push_back(nullptr); m_pos_NameID=m_pos_Extensions; ++m_pos_NameID; m_pos_EncryptedID=m_pos_NameID; @@ -1372,20 +1355,22 @@ namespace opensaml { ++m_pos_NewEncryptedID; m_pos_Terminate=m_pos_NewEncryptedID; ++m_pos_Terminate; - } + public: virtual ~ManageNameIDRequestImpl() { } - ManageNameIDRequestImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) - { + ManageNameIDRequestImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) + : AbstractXMLObject(nsURI, localName, prefix, schemaType) { init(); } ManageNameIDRequestImpl(const ManageNameIDRequestImpl& src) : AbstractXMLObject(src), RequestAbstractTypeImpl(src) { init(); + } + void _clone(const ManageNameIDRequestImpl& src) { + RequestAbstractTypeImpl::_clone(src); if (src.getNameID()) setNameID(src.getNameID()->cloneNameID()); if (src.getEncryptedID()) @@ -1396,14 +1381,9 @@ namespace opensaml { setNewEncryptedID(src.getNewEncryptedID()->cloneNewEncryptedID()); if (src.getTerminate()) setTerminate(src.getTerminate()->cloneTerminate()); - } - IMPL_XMLOBJECT_CLONE(ManageNameIDRequest); - RequestAbstractType* cloneRequestAbstractType() const { - return cloneManageNameIDRequest(); - } - + IMPL_XMLOBJECT_CLONE_EX(ManageNameIDRequest); IMPL_TYPED_FOREIGN_CHILD(NameID,saml2); IMPL_TYPED_FOREIGN_CHILD(EncryptedID,saml2); IMPL_TYPED_CHILD(NewID); @@ -1426,56 +1406,53 @@ namespace opensaml { public: virtual ~ManageNameIDResponseImpl() { } - ManageNameIDResponseImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) + ManageNameIDResponseImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { } ManageNameIDResponseImpl(const ManageNameIDResponseImpl& src) : AbstractXMLObject(src), StatusResponseTypeImpl(src) { } - IMPL_XMLOBJECT_CLONE(ManageNameIDResponse); - StatusResponseType* cloneStatusResponseType() const { - return cloneManageNameIDResponse(); - } + IMPL_XMLOBJECT_CLONE_EX(ManageNameIDResponse); }; class SAML_DLLLOCAL LogoutRequestImpl : public virtual LogoutRequest, public RequestAbstractTypeImpl { void init() { - m_Reason=NULL; - m_NotOnOrAfter=NULL; - - m_BaseID=NULL; - m_NameID=NULL; - m_EncryptedID=NULL; - m_children.push_back(NULL); - m_children.push_back(NULL); - m_children.push_back(NULL); + m_Reason=nullptr; + m_NotOnOrAfter=nullptr; + m_BaseID=nullptr; + m_NameID=nullptr; + m_EncryptedID=nullptr; + m_children.push_back(nullptr); + m_children.push_back(nullptr); + m_children.push_back(nullptr); m_pos_BaseID=m_pos_Extensions; ++m_pos_BaseID; m_pos_NameID=m_pos_BaseID; ++m_pos_NameID; m_pos_EncryptedID=m_pos_NameID; ++m_pos_EncryptedID; - } + public: virtual ~LogoutRequestImpl() { XMLString::release(&m_Reason); delete m_NotOnOrAfter; } - LogoutRequestImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) - { + LogoutRequestImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) + : AbstractXMLObject(nsURI, localName, prefix, schemaType) { init(); } LogoutRequestImpl(const LogoutRequestImpl& src) : AbstractXMLObject(src), RequestAbstractTypeImpl(src) { init(); + } + void _clone(const LogoutRequestImpl& src) { + RequestAbstractTypeImpl::_clone(src); setReason(src.getReason()); setNotOnOrAfter(src.getNotOnOrAfter()); - if (src.getBaseID()) setBaseID(src.getBaseID()->cloneBaseID()); if (src.getNameID()) @@ -1483,22 +1460,14 @@ namespace opensaml { if (src.getEncryptedID()) setEncryptedID(src.getEncryptedID()->cloneEncryptedID()); - for (list::const_iterator i=src.m_children.begin(); i!=src.m_children.end(); i++) { + for (vector::const_iterator i=src.m_SessionIndexs.begin(); i!=src.m_SessionIndexs.end(); ++i) { if (*i) { - SessionIndex* si = dynamic_cast(*i); - if (si) { - getSessionIndexs().push_back(si->cloneSessionIndex()); - continue; - } + getSessionIndexs().push_back((*i)->cloneSessionIndex()); } } } - IMPL_XMLOBJECT_CLONE(LogoutRequest); - RequestAbstractType* cloneRequestAbstractType() const { - return cloneLogoutRequest(); - } - + IMPL_XMLOBJECT_CLONE_EX(LogoutRequest); IMPL_STRING_ATTRIB(Reason); IMPL_DATETIME_ATTRIB(NotOnOrAfter,SAMLTIME_MAX); IMPL_TYPED_FOREIGN_CHILD(BaseID,saml2); @@ -1508,8 +1477,8 @@ namespace opensaml { protected: void marshallAttributes(DOMElement* domElement) const { - MARSHALL_STRING_ATTRIB(Reason,REASON,NULL); - MARSHALL_DATETIME_ATTRIB(NotOnOrAfter,NOTONORAFTER,NULL); + MARSHALL_STRING_ATTRIB(Reason,REASON,nullptr); + MARSHALL_DATETIME_ATTRIB(NotOnOrAfter,NOTONORAFTER,nullptr); RequestAbstractTypeImpl::marshallAttributes(domElement); } @@ -1521,8 +1490,8 @@ namespace opensaml { RequestAbstractTypeImpl::processChildElement(childXMLObject,root); } void processAttribute(const DOMAttr* attribute) { - PROC_STRING_ATTRIB(Reason,REASON,NULL); - PROC_DATETIME_ATTRIB(NotOnOrAfter,NOTONORAFTER,NULL); + PROC_STRING_ATTRIB(Reason,REASON,nullptr); + PROC_DATETIME_ATTRIB(NotOnOrAfter,NOTONORAFTER,nullptr); RequestAbstractTypeImpl::processAttribute(attribute); } }; @@ -1532,30 +1501,27 @@ namespace opensaml { public: virtual ~LogoutResponseImpl() { } - LogoutResponseImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) + LogoutResponseImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { } LogoutResponseImpl(const LogoutResponseImpl& src) : AbstractXMLObject(src), StatusResponseTypeImpl(src) { } - IMPL_XMLOBJECT_CLONE(LogoutResponse); - StatusResponseType* cloneStatusResponseType() const { - return cloneLogoutResponse(); - } + IMPL_XMLOBJECT_CLONE_EX(LogoutResponse); }; class SAML_DLLLOCAL NameIDMappingRequestImpl : public virtual NameIDMappingRequest, public RequestAbstractTypeImpl { void init() { - m_BaseID=NULL; - m_NameID=NULL; - m_EncryptedID=NULL; - m_NameIDPolicy=NULL; - m_children.push_back(NULL); - m_children.push_back(NULL); - m_children.push_back(NULL); - m_children.push_back(NULL); + m_BaseID=nullptr; + m_NameID=nullptr; + m_EncryptedID=nullptr; + m_NameIDPolicy=nullptr; + m_children.push_back(nullptr); + m_children.push_back(nullptr); + m_children.push_back(nullptr); + m_children.push_back(nullptr); m_pos_BaseID=m_pos_Extensions; ++m_pos_BaseID; m_pos_NameID=m_pos_BaseID; @@ -1564,20 +1530,22 @@ namespace opensaml { ++m_pos_EncryptedID; m_pos_NameIDPolicy=m_pos_EncryptedID; ++m_pos_NameIDPolicy; - } + public: virtual ~NameIDMappingRequestImpl() { } - NameIDMappingRequestImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) - { + NameIDMappingRequestImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) + : AbstractXMLObject(nsURI, localName, prefix, schemaType) { init(); } NameIDMappingRequestImpl(const NameIDMappingRequestImpl& src) : AbstractXMLObject(src), RequestAbstractTypeImpl(src) { init(); + } + void _clone(const NameIDMappingRequestImpl& src) { + RequestAbstractTypeImpl::_clone(src); if (src.getBaseID()) setBaseID(src.getBaseID()->cloneBaseID()); if (src.getNameID()) @@ -1586,14 +1554,9 @@ namespace opensaml { setEncryptedID(src.getEncryptedID()->cloneEncryptedID()); if (src.getNameIDPolicy()) setNameIDPolicy(src.getNameIDPolicy()->cloneNameIDPolicy()); - } - IMPL_XMLOBJECT_CLONE(NameIDMappingRequest); - RequestAbstractType* cloneRequestAbstractType() const { - return cloneNameIDMappingRequest(); - } - + IMPL_XMLOBJECT_CLONE_EX(NameIDMappingRequest); IMPL_TYPED_FOREIGN_CHILD(BaseID,saml2); IMPL_TYPED_FOREIGN_CHILD(NameID,saml2); IMPL_TYPED_FOREIGN_CHILD(EncryptedID,saml2); @@ -1612,39 +1575,37 @@ namespace opensaml { class SAML_DLLLOCAL NameIDMappingResponseImpl : public virtual NameIDMappingResponse, public StatusResponseTypeImpl { void init() { - m_NameID=NULL; - m_EncryptedID=NULL; - m_children.push_back(NULL); - m_children.push_back(NULL); + m_NameID=nullptr; + m_EncryptedID=nullptr; + m_children.push_back(nullptr); + m_children.push_back(nullptr); m_pos_NameID=m_pos_Status; ++m_pos_NameID; m_pos_EncryptedID=m_pos_NameID; ++m_pos_EncryptedID; } + public: virtual ~NameIDMappingResponseImpl() { } - NameIDMappingResponseImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) - { + NameIDMappingResponseImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) + : AbstractXMLObject(nsURI, localName, prefix, schemaType) { init(); } NameIDMappingResponseImpl(const NameIDMappingResponseImpl& src) : AbstractXMLObject(src), StatusResponseTypeImpl(src) { init(); + } + void _clone(const NameIDMappingResponseImpl& src) { + StatusResponseTypeImpl::_clone(src); if (src.getNameID()) - setNameID(getNameID()->cloneNameID()); + setNameID(src.getNameID()->cloneNameID()); if (src.getEncryptedID()) - setEncryptedID(getEncryptedID()->cloneEncryptedID()); - + setEncryptedID(src.getEncryptedID()->cloneEncryptedID()); } - IMPL_XMLOBJECT_CLONE(NameIDMappingResponse); - StatusResponseType* cloneStatusResponseType() const { - return cloneNameIDMappingResponse(); - } - + IMPL_XMLOBJECT_CLONE_EX(NameIDMappingResponse); IMPL_TYPED_FOREIGN_CHILD(NameID,saml2); IMPL_TYPED_FOREIGN_CHILD(EncryptedID,saml2);