From ecc9f2def78a53386e33f330147b80f3316a4b35 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Sat, 24 Dec 2011 04:34:35 +0000 Subject: [PATCH] Clone macros --- saml/saml1/core/impl/AssertionsImpl.cpp | 278 +++++---------- saml/saml1/core/impl/ProtocolsImpl.cpp | 150 +++----- saml/saml2/core/impl/Assertions20Impl.cpp | 14 +- saml/saml2/core/impl/Protocols20Impl.cpp | 565 ++++++++++++------------------ saml/saml2/metadata/impl/MetadataImpl.cpp | 31 +- 5 files changed, 383 insertions(+), 655 deletions(-) diff --git a/saml/saml1/core/impl/AssertionsImpl.cpp b/saml/saml1/core/impl/AssertionsImpl.cpp index 8cd128b..035cf3c 100644 --- a/saml/saml1/core/impl/AssertionsImpl.cpp +++ b/saml/saml1/core/impl/AssertionsImpl.cpp @@ -42,10 +42,12 @@ #include #include #include +#include +#include +#include #include using namespace opensaml::saml1; -using namespace xmlsignature; using namespace xmltooling; using namespace std; using xmlconstants::XMLSIG_NS; @@ -70,8 +72,7 @@ namespace opensaml { virtual ~ConditionImpl() {} ConditionImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { - } + : AbstractXMLObject(nsURI, localName, prefix, schemaType) {} ConditionImpl(const ConditionImpl& src) : AbstractXMLObject(src), AnyElementImpl(src) {} @@ -88,17 +89,11 @@ namespace opensaml { virtual ~AudienceRestrictionConditionImpl() {} AudienceRestrictionConditionImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { - } + : AbstractXMLObject(nsURI, localName, prefix, schemaType) {} AudienceRestrictionConditionImpl(const AudienceRestrictionConditionImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { - VectorOf(Audience) v=getAudiences(); - for (vector::const_iterator i=src.m_Audiences.begin(); i!=src.m_Audiences.end(); i++) { - if (*i) { - v.push_back((*i)->cloneAudience()); - } - } + IMPL_CLONE_TYPED_CHILDREN(Audience); } IMPL_XMLOBJECT_CLONE2(AudienceRestrictionCondition,Condition); @@ -121,12 +116,10 @@ namespace opensaml { virtual ~DoNotCacheConditionImpl() {} DoNotCacheConditionImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { - } + : AbstractXMLObject(nsURI, localName, prefix, schemaType) {} DoNotCacheConditionImpl(const DoNotCacheConditionImpl& src) - : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src) { - } + : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src) {} IMPL_XMLOBJECT_CLONE2(DoNotCacheCondition,Condition); }; @@ -155,30 +148,13 @@ namespace opensaml { ConditionsImpl(const ConditionsImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { init(); - setNotBefore(src.getNotBefore()); - setNotOnOrAfter(src.getNotOnOrAfter()); - - for (list::const_iterator i=src.m_children.begin(); i!=src.m_children.end(); i++) { - if (*i) { - AudienceRestrictionCondition* arc=dynamic_cast(*i); - if (arc) { - getAudienceRestrictionConditions().push_back(arc->cloneAudienceRestrictionCondition()); - continue; - } - - DoNotCacheCondition* dncc=dynamic_cast(*i); - if (dncc) { - getDoNotCacheConditions().push_back(dncc->cloneDoNotCacheCondition()); - continue; - } - - Condition* c=dynamic_cast(*i); - if (c) { - getConditions().push_back(c->cloneCondition()); - continue; - } - } - } + IMPL_CLONE_ATTRIB(NotBefore); + IMPL_CLONE_ATTRIB(NotOnOrAfter); + IMPL_CLONE_CHILDBAG_BEGIN; + IMPL_CLONE_TYPED_CHILD_IN_BAG(AudienceRestrictionCondition); + IMPL_CLONE_TYPED_CHILD_IN_BAG(DoNotCacheCondition); + IMPL_CLONE_TYPED_CHILD_IN_BAG(Condition); + IMPL_CLONE_CHILDBAG_END; } IMPL_XMLOBJECT_CLONE(Conditions); @@ -231,8 +207,8 @@ namespace opensaml { NameIdentifierImpl(const NameIdentifierImpl& src) : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src) { init(); - setFormat(src.getFormat()); - setNameQualifier(src.getNameQualifier()); + IMPL_CLONE_ATTRIB(Format); + IMPL_CLONE_ATTRIB(NameQualifier); } IMPL_XMLOBJECT_CLONE(NameIdentifier); @@ -257,11 +233,9 @@ namespace opensaml { virtual ~SubjectConfirmationDataImpl() {} SubjectConfirmationDataImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { - } + : AbstractXMLObject(nsURI, localName, prefix, schemaType) {} - SubjectConfirmationDataImpl(const SubjectConfirmationDataImpl& src) : AbstractXMLObject(src), AnyElementImpl(src) { - } + SubjectConfirmationDataImpl(const SubjectConfirmationDataImpl& src) : AbstractXMLObject(src), AnyElementImpl(src) {} IMPL_XMLOBJECT_CLONE_EX(SubjectConfirmationData); }; @@ -293,26 +267,20 @@ namespace opensaml { SubjectConfirmationImpl(const SubjectConfirmationImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { init(); - if (src.getSubjectConfirmationData()) - setSubjectConfirmationData(src.getSubjectConfirmationData()->clone()); - if (src.getKeyInfo()) - setKeyInfo(src.getKeyInfo()->cloneKeyInfo()); - for (vector::const_iterator i=src.m_ConfirmationMethods.begin(); i!=src.m_ConfirmationMethods.end(); i++) { - if (*i) { - getConfirmationMethods().push_back((*i)->cloneConfirmationMethod()); - } - } + IMPL_CLONE_TYPED_CHILDREN(ConfirmationMethod); + IMPL_CLONE_XMLOBJECT_CHILD(SubjectConfirmationData); + IMPL_CLONE_TYPED_CHILD(KeyInfo); } IMPL_XMLOBJECT_CLONE(SubjectConfirmation); IMPL_TYPED_CHILDREN(ConfirmationMethod,m_pos_SubjectConfirmationData); IMPL_XMLOBJECT_CHILD(SubjectConfirmationData); - IMPL_TYPED_CHILD(KeyInfo); + IMPL_TYPED_FOREIGN_CHILD(KeyInfo,xmlsignature); protected: void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { PROC_TYPED_CHILDREN(ConfirmationMethod,SAML1_NS,false); - PROC_TYPED_CHILD(KeyInfo,XMLSIG_NS,false); + PROC_TYPED_FOREIGN_CHILD(KeyInfo,xmlsignature,XMLSIG_NS,false); // Anything else we'll assume is the data. if (getSubjectConfirmationData()) @@ -348,10 +316,8 @@ namespace opensaml { SubjectImpl(const SubjectImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { init(); - if (src.getNameIdentifier()) - setNameIdentifier(src.getNameIdentifier()->cloneNameIdentifier()); - if (src.getSubjectConfirmation()) - setSubjectConfirmation(src.getSubjectConfirmation()->cloneSubjectConfirmation()); + IMPL_CLONE_TYPED_CHILD(NameIdentifier); + IMPL_CLONE_TYPED_CHILD(SubjectConfirmation); } IMPL_XMLOBJECT_CLONE(Subject); @@ -372,8 +338,7 @@ namespace opensaml { virtual ~StatementImpl() {} StatementImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { - } + : AbstractXMLObject(nsURI, localName, prefix, schemaType) {} StatementImpl(const StatementImpl& src) : AbstractXMLObject(src), AnyElementImpl(src) {} @@ -410,8 +375,7 @@ namespace opensaml { } void _clone(const SubjectStatementImpl& src) { - if (src.getSubject()) - setSubject(src.getSubject()->cloneSubject()); + IMPL_CLONE_TYPED_CHILD(Subject); } Statement* cloneStatement() const { @@ -455,8 +419,8 @@ namespace opensaml { SubjectLocalityImpl(const SubjectLocalityImpl& src) : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src) { init(); - setIPAddress(src.getIPAddress()); - setDNSAddress(src.getDNSAddress()); + IMPL_CLONE_ATTRIB(IPAddress); + IMPL_CLONE_ATTRIB(DNSAddress); } IMPL_XMLOBJECT_CLONE(SubjectLocality); @@ -501,9 +465,9 @@ namespace opensaml { AuthorityBindingImpl(const AuthorityBindingImpl& src) : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src) { init(); - setAuthorityKind(src.getAuthorityKind()); - setLocation(src.getLocation()); - setBinding(src.getBinding()); + IMPL_CLONE_ATTRIB(AuthorityKind); + IMPL_CLONE_ATTRIB(Location); + IMPL_CLONE_ATTRIB(Binding); } IMPL_XMLOBJECT_CLONE(AuthorityBinding); @@ -553,15 +517,10 @@ namespace opensaml { void _clone(const AuthenticationStatementImpl& src) { SubjectStatementImpl::_clone(src); - setAuthenticationMethod(src.getAuthenticationMethod()); - setAuthenticationInstant(src.getAuthenticationInstant()); - if (src.getSubjectLocality()) - setSubjectLocality(src.getSubjectLocality()->cloneSubjectLocality()); - for (vector::const_iterator i=src.m_AuthorityBindings.begin(); i!=src.m_AuthorityBindings.end(); i++) { - if (*i) { - getAuthorityBindings().push_back((*i)->cloneAuthorityBinding()); - } - } + IMPL_CLONE_ATTRIB(AuthenticationMethod); + IMPL_CLONE_ATTRIB(AuthenticationInstant); + IMPL_CLONE_TYPED_CHILD(SubjectLocality); + IMPL_CLONE_TYPED_CHILDREN(AuthorityBinding); } IMPL_XMLOBJECT_CLONE_EX(AuthenticationStatement); @@ -602,12 +561,11 @@ namespace opensaml { } ActionImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType), m_Namespace(nullptr) { - } + : AbstractXMLObject(nsURI, localName, prefix, schemaType), m_Namespace(nullptr) {} ActionImpl(const ActionImpl& src) : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src), m_Namespace(nullptr) { - setNamespace(src.getNamespace()); + IMPL_CLONE_ATTRIB(Namespace); } IMPL_XMLOBJECT_CLONE(Action); @@ -633,26 +591,14 @@ namespace opensaml { virtual ~EvidenceImpl() {} EvidenceImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { - } + : AbstractXMLObject(nsURI, localName, prefix, schemaType) {} EvidenceImpl(const EvidenceImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { - for (list::const_iterator i=src.m_children.begin(); i!=src.m_children.end(); i++) { - if (*i) { - AssertionIDReference* ref=dynamic_cast(*i); - if (ref) { - getAssertionIDReferences().push_back(ref->cloneAssertionIDReference()); - continue; - } - - Assertion* assertion=dynamic_cast(*i); - if (assertion) { - getAssertions().push_back(assertion->cloneAssertion()); - continue; - } - } - } + IMPL_CLONE_CHILDBAG_BEGIN; + IMPL_CLONE_TYPED_CHILD_IN_BAG(AssertionIDReference); + IMPL_CLONE_TYPED_CHILD_IN_BAG(Assertion); + IMPL_CLONE_CHILDBAG_END; } IMPL_XMLOBJECT_CLONE(Evidence); @@ -697,22 +643,17 @@ namespace opensaml { void _clone(const AuthorizationDecisionStatementImpl& src) { SubjectStatementImpl::_clone(src); - setResource(src.getResource()); - setDecision(src.getDecision()); - if (src.getEvidence()) - setEvidence(src.getEvidence()->cloneEvidence()); - for (vector::const_iterator i=src.m_Actions.begin(); i!=src.m_Actions.end(); i++) { - if (*i) { - getActions().push_back((*i)->cloneAction()); - } - } + IMPL_CLONE_ATTRIB(Resource); + IMPL_CLONE_ATTRIB(Decision); + IMPL_CLONE_TYPED_CHILDREN(Action); + IMPL_CLONE_TYPED_CHILD(Evidence); } IMPL_XMLOBJECT_CLONE_EX(AuthorizationDecisionStatement); IMPL_STRING_ATTRIB(Resource); IMPL_STRING_ATTRIB(Decision); - IMPL_TYPED_CHILD(Evidence); IMPL_TYPED_CHILDREN(Action, m_pos_Evidence); + IMPL_TYPED_CHILD(Evidence); protected: void marshallAttributes(DOMElement* domElement) const { @@ -758,8 +699,8 @@ namespace opensaml { AttributeDesignatorImpl(const AttributeDesignatorImpl& src) : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src) { init(); - setAttributeName(src.getAttributeName()); - setAttributeNamespace(src.getAttributeNamespace()); + IMPL_CLONE_ATTRIB(AttributeName); + IMPL_CLONE_ATTRIB(AttributeNamespace); } IMPL_XMLOBJECT_CLONE(AttributeDesignator); @@ -801,13 +742,9 @@ namespace opensaml { AttributeImpl(const AttributeImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { init(); - setAttributeName(src.getAttributeName()); - setAttributeNamespace(src.getAttributeNamespace()); - for (vector::const_iterator i=src.m_AttributeValues.begin(); i!=src.m_AttributeValues.end(); i++) { - if (*i) { - getAttributeValues().push_back((*i)->clone()); - } - } + IMPL_CLONE_ATTRIB(AttributeName); + IMPL_CLONE_ATTRIB(AttributeNamespace); + IMPL_CLONE_XMLOBJECT_CHILDREN(AttributeValue); } IMPL_XMLOBJECT_CLONE2(Attribute,AttributeDesignator); @@ -837,8 +774,7 @@ namespace opensaml { virtual ~AttributeValueImpl() {} AttributeValueImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { - } + : AbstractXMLObject(nsURI, localName, prefix, schemaType) {} AttributeValueImpl(const AttributeValueImpl& src) : AbstractXMLObject(src), AnyElementImpl(src) {} @@ -851,19 +787,13 @@ namespace opensaml { virtual ~AttributeStatementImpl() {} AttributeStatementImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { - } + : AbstractXMLObject(nsURI, localName, prefix, schemaType) {} - AttributeStatementImpl(const AttributeStatementImpl& src) : AbstractXMLObject(src), SubjectStatementImpl(src) { - } + AttributeStatementImpl(const AttributeStatementImpl& src) : AbstractXMLObject(src), SubjectStatementImpl(src) {} void _clone(const AttributeStatementImpl& src) { SubjectStatementImpl::_clone(src); - for (vector::const_iterator i=src.m_Attributes.begin(); i!=src.m_Attributes.end(); i++) { - if (*i) { - getAttributes().push_back((*i)->cloneAttribute()); - } - } + IMPL_CLONE_TYPED_CHILDREN(Attribute); } IMPL_XMLOBJECT_CLONE_EX(AttributeStatement); @@ -886,30 +816,15 @@ namespace opensaml { virtual ~AdviceImpl() {} AdviceImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { - } + : AbstractXMLObject(nsURI, localName, prefix, schemaType) {} AdviceImpl(const AdviceImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { - for (list::const_iterator i=src.m_children.begin(); i!=src.m_children.end(); i++) { - if (*i) { - AssertionIDReference* ref=dynamic_cast(*i); - if (ref) { - getAssertionIDReferences().push_back(ref->cloneAssertionIDReference()); - continue; - } - - Assertion* assertion=dynamic_cast(*i); - if (assertion) { - getAssertions().push_back(assertion->cloneAssertion()); - continue; - } - - if (*i) { - getUnknownXMLObjects().push_back((*i)->clone()); - } - } - } + IMPL_CLONE_CHILDBAG_BEGIN; + IMPL_CLONE_TYPED_CHILD_IN_BAG(AssertionIDReference); + IMPL_CLONE_TYPED_CHILD_IN_BAG(Assertion); + IMPL_CLONE_XMLOBJECT_CHILD_IN_BAG(UnknownXMLObject); + IMPL_CLONE_CHILDBAG_END; } IMPL_XMLOBJECT_CLONE(Advice); @@ -973,62 +888,33 @@ namespace opensaml { AssertionImpl(const AssertionImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { init(); - setMinorVersion(src.m_MinorVersion); - setAssertionID(src.getAssertionID()); - setIssuer(src.getIssuer()); - setIssueInstant(src.getIssueInstant()); - if (src.getConditions()) - setConditions(src.getConditions()->cloneConditions()); - if (src.getAdvice()) - setAdvice(src.getAdvice()->cloneAdvice()); - if (src.getSignature()) - setSignature(src.getSignature()->cloneSignature()); - for (list::const_iterator i=src.m_children.begin(); i!=src.m_children.end(); i++) { - if (*i) { - AuthenticationStatement* authst=dynamic_cast(*i); - if (authst) { - getAuthenticationStatements().push_back(authst->cloneAuthenticationStatement()); - continue; - } - - AttributeStatement* attst=dynamic_cast(*i); - if (attst) { - getAttributeStatements().push_back(attst->cloneAttributeStatement()); - continue; - } - - AuthorizationDecisionStatement* authzst=dynamic_cast(*i); - if (authzst) { - getAuthorizationDecisionStatements().push_back(authzst->cloneAuthorizationDecisionStatement()); - continue; - } - - SubjectStatement* subst=dynamic_cast(*i); - if (subst) { - getSubjectStatements().push_back(subst->cloneSubjectStatement()); - continue; - } - - Statement* st=dynamic_cast(*i); - if (st) { - getStatements().push_back(st->cloneStatement()); - continue; - } - } - } + IMPL_CLONE_INTEGER_ATTRIB(MinorVersion); + IMPL_CLONE_ATTRIB(AssertionID); + IMPL_CLONE_ATTRIB(Issuer); + IMPL_CLONE_ATTRIB(IssueInstant); + IMPL_CLONE_TYPED_CHILD(Conditions); + IMPL_CLONE_TYPED_CHILD(Advice); + IMPL_CLONE_TYPED_CHILD(Signature); + IMPL_CLONE_CHILDBAG_BEGIN; + IMPL_CLONE_TYPED_CHILD_IN_BAG(AuthenticationStatement); + IMPL_CLONE_TYPED_CHILD_IN_BAG(AttributeStatement); + IMPL_CLONE_TYPED_CHILD_IN_BAG(AuthorizationDecisionStatement); + IMPL_CLONE_TYPED_CHILD_IN_BAG(SubjectStatement); + IMPL_CLONE_TYPED_CHILD_IN_BAG(Statement); + IMPL_CLONE_CHILDBAG_END; } //IMPL_TYPED_CHILD(Signature); // Need customized setter. protected: - Signature* m_Signature; + xmlsignature::Signature* m_Signature; list::iterator m_pos_Signature; public: - Signature* getSignature() const { + xmlsignature::Signature* getSignature() const { return m_Signature; } - void setSignature(Signature* sig) { + void setSignature(xmlsignature::Signature* sig) { prepareForAssignment(m_Signature,sig); *m_pos_Signature=m_Signature=sig; // Sync content reference back up. @@ -1094,7 +980,7 @@ namespace opensaml { void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { PROC_TYPED_CHILD(Conditions,SAML1_NS,false); PROC_TYPED_CHILD(Advice,SAML1_NS,false); - PROC_TYPED_CHILD(Signature,XMLSIG_NS,false); + PROC_TYPED_FOREIGN_CHILD(Signature,xmlsignature,XMLSIG_NS,false); PROC_TYPED_CHILDREN(AuthenticationStatement,SAML1_NS,false); PROC_TYPED_CHILDREN(AttributeStatement,SAML1_NS,false); PROC_TYPED_CHILDREN(AuthorizationDecisionStatement,SAML1_NS,false); diff --git a/saml/saml1/core/impl/ProtocolsImpl.cpp b/saml/saml1/core/impl/ProtocolsImpl.cpp index b9aa3a7..a28a905 100644 --- a/saml/saml1/core/impl/ProtocolsImpl.cpp +++ b/saml/saml1/core/impl/ProtocolsImpl.cpp @@ -41,11 +41,12 @@ #include #include +#include +#include +#include #include using namespace opensaml::saml1p; -using namespace opensaml::saml1; -using namespace xmlsignature; using namespace xmltooling; using namespace std; using xmlconstants::XMLSIG_NS; @@ -78,12 +79,11 @@ namespace opensaml { } RespondWithImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType), m_qname(nullptr) { - } + : AbstractXMLObject(nsURI, localName, prefix, schemaType), m_qname(nullptr) {} RespondWithImpl(const RespondWithImpl& src) : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src), m_qname(nullptr) { - setQName(src.getQName()); + IMPL_CLONE_ATTRIB(QName); // not really an attribute, but it gets the job done } xmltooling::QName* getQName() const { @@ -113,8 +113,7 @@ namespace opensaml { virtual ~QueryImpl() {} QueryImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { - } + : AbstractXMLObject(nsURI, localName, prefix, schemaType) {} QueryImpl(const QueryImpl& src) : AbstractXMLObject(src), AnyElementImpl(src) {} @@ -152,8 +151,7 @@ namespace opensaml { } void _clone(const SubjectQueryImpl& src) { - if (src.getSubject()) - setSubject(src.getSubject()->cloneSubject()); + IMPL_CLONE_TYPED_CHILD(Subject); } SubjectQuery* cloneSubjectQuery() const { @@ -164,11 +162,11 @@ namespace opensaml { return dynamic_cast(clone()); } - IMPL_TYPED_CHILD(Subject); + IMPL_TYPED_FOREIGN_CHILD(Subject,saml1); protected: void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { - PROC_TYPED_CHILD(Subject,SAML1_NS,true); + PROC_TYPED_FOREIGN_CHILD(Subject,saml1,SAML1_NS,true); AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root); } }; @@ -195,7 +193,7 @@ namespace opensaml { void _clone(const AuthenticationQueryImpl& src) { SubjectQueryImpl::_clone(src); - setAuthenticationMethod(src.getAuthenticationMethod()); + IMPL_CLONE_ATTRIB(AuthenticationMethod); } IMPL_XMLOBJECT_CLONE_EX(AuthenticationQuery); @@ -235,17 +233,13 @@ namespace opensaml { void _clone(const AttributeQueryImpl& src) { SubjectQueryImpl::_clone(src); - setResource(src.getResource()); - for (vector::const_iterator i=src.m_AttributeDesignators.begin(); i!=src.m_AttributeDesignators.end(); i++) { - if (*i) { - getAttributeDesignators().push_back((*i)->cloneAttributeDesignator()); - } - } + IMPL_CLONE_ATTRIB(Resource); + IMPL_CLONE_TYPED_FOREIGN_CHILDREN(AttributeDesignator,saml1); } IMPL_XMLOBJECT_CLONE_EX(AttributeQuery); IMPL_STRING_ATTRIB(Resource); - IMPL_TYPED_CHILDREN(AttributeDesignator,m_children.end()); + IMPL_TYPED_FOREIGN_CHILDREN(AttributeDesignator,saml1,m_children.end()); protected: void marshallAttributes(DOMElement* domElement) const { @@ -254,7 +248,7 @@ namespace opensaml { } void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { - PROC_TYPED_CHILDREN(AttributeDesignator,SAML1_NS,true); + PROC_TYPED_FOREIGN_CHILDREN(AttributeDesignator,saml1,SAML1_NS,true); SubjectQueryImpl::processChildElement(childXMLObject,root); } @@ -290,20 +284,15 @@ namespace opensaml { void _clone(const AuthorizationDecisionQueryImpl& src) { SubjectQueryImpl::_clone(src); - setResource(src.getResource()); - if (src.getEvidence()) - setEvidence(src.getEvidence()->cloneEvidence()); - for (vector::const_iterator i=src.m_Actions.begin(); i!=src.m_Actions.end(); i++) { - if (*i) { - getActions().push_back((*i)->cloneAction()); - } - } + IMPL_CLONE_ATTRIB(Resource); + IMPL_CLONE_TYPED_FOREIGN_CHILDREN(Action,saml1); + IMPL_CLONE_TYPED_CHILD(Evidence); } IMPL_XMLOBJECT_CLONE_EX(AuthorizationDecisionQuery); IMPL_STRING_ATTRIB(Resource); - IMPL_TYPED_CHILD(Evidence); - IMPL_TYPED_CHILDREN(Action, m_pos_Evidence); + IMPL_TYPED_FOREIGN_CHILDREN(Action,saml1,m_pos_Evidence); + IMPL_TYPED_FOREIGN_CHILD(Evidence,saml1); protected: void marshallAttributes(DOMElement* domElement) const { @@ -312,8 +301,8 @@ namespace opensaml { } void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { - PROC_TYPED_CHILD(Evidence,SAML1_NS,false); - PROC_TYPED_CHILDREN(Action,SAML1_NS,false); + PROC_TYPED_FOREIGN_CHILD(Evidence,saml1,SAML1_NS,false); + PROC_TYPED_FOREIGN_CHILDREN(Action,saml1,SAML1_NS,false); SubjectQueryImpl::processChildElement(childXMLObject,root); } @@ -364,27 +353,22 @@ namespace opensaml { protected: void _clone(const RequestAbstractTypeImpl& src) { - setMinorVersion(src.m_MinorVersion); - setRequestID(src.getRequestID()); - setIssueInstant(src.getIssueInstant()); - if (src.getSignature()) - setSignature(src.getSignature()->cloneSignature()); - for (vector::const_iterator i=src.m_RespondWiths.begin(); i!=src.m_RespondWiths.end(); i++) { - if (*i) { - getRespondWiths().push_back((*i)->cloneRespondWith()); - } - } + IMPL_CLONE_INTEGER_ATTRIB(MinorVersion); + IMPL_CLONE_ATTRIB(RequestID); + IMPL_CLONE_ATTRIB(IssueInstant); + IMPL_CLONE_TYPED_CHILD(Signature); + IMPL_CLONE_TYPED_CHILDREN(RespondWith); } - Signature* m_Signature; + xmlsignature::Signature* m_Signature; list::iterator m_pos_Signature; public: - Signature* getSignature() const { + xmlsignature::Signature* getSignature() const { return m_Signature; } - void setSignature(Signature* sig) { + void setSignature(xmlsignature::Signature* sig) { prepareForAssignment(m_Signature,sig); *m_pos_Signature=m_Signature=sig; // Sync content reference back up. @@ -444,7 +428,7 @@ namespace opensaml { void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { PROC_TYPED_CHILDREN(RespondWith,SAML1P_NS,false); - PROC_TYPED_CHILD(Signature,XMLSIG_NS,false); + PROC_TYPED_FOREIGN_CHILD(Signature,xmlsignature,XMLSIG_NS,false); AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root); } @@ -495,18 +479,9 @@ namespace opensaml { void _clone(const RequestImpl& src) { RequestAbstractTypeImpl::_clone(src); - if (src.getQuery()) - setQuery(src.getQuery()->cloneQuery()); - for (vector::const_iterator i=src.m_AssertionIDReferences.begin(); i!=src.m_AssertionIDReferences.end(); i++) { - if (*i) { - getAssertionIDReferences().push_back((*i)->cloneAssertionIDReference()); - } - } - for (vector::const_iterator i=src.m_AssertionArtifacts.begin(); i!=src.m_AssertionArtifacts.end(); i++) { - if (*i) { - getAssertionArtifacts().push_back((*i)->cloneAssertionArtifact()); - } - } + IMPL_CLONE_TYPED_CHILD(Query); + IMPL_CLONE_TYPED_FOREIGN_CHILDREN(AssertionIDReference,saml1); + IMPL_CLONE_TYPED_CHILDREN(AssertionArtifact); } IMPL_XMLOBJECT_CLONE_EX(Request); @@ -538,13 +513,13 @@ namespace opensaml { setQuery(q); } - IMPL_TYPED_CHILDREN(AssertionIDReference, m_children.end()); - IMPL_TYPED_CHILDREN(AssertionArtifact, m_children.end()); + IMPL_TYPED_FOREIGN_CHILDREN(AssertionIDReference,saml1,m_children.end()); + IMPL_TYPED_CHILDREN(AssertionArtifact,m_children.end()); protected: void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { PROC_TYPED_CHILD(Query,SAML1P_NS,true); - PROC_TYPED_CHILDREN(AssertionIDReference,SAML1_NS,false); + PROC_TYPED_FOREIGN_CHILDREN(AssertionIDReference,saml1,SAML1_NS,false); PROC_TYPED_CHILDREN(AssertionArtifact,SAML1P_NS,false); RequestAbstractTypeImpl::processChildElement(childXMLObject,root); } @@ -576,9 +551,8 @@ namespace opensaml { StatusCodeImpl(const StatusCodeImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { init(); - setValue(src.getValue()); - if (src.getStatusCode()) - setStatusCode(src.getStatusCode()->cloneStatusCode()); + IMPL_CLONE_ATTRIB(Value); + IMPL_CLONE_TYPED_CHILD(StatusCode); } IMPL_XMLOBJECT_CLONE(StatusCode); @@ -610,16 +584,11 @@ namespace opensaml { virtual ~StatusDetailImpl() {} StatusDetailImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { - } + : AbstractXMLObject(nsURI, localName, prefix, schemaType) {} StatusDetailImpl(const StatusDetailImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { - for (vector::const_iterator i=src.m_UnknownXMLObjects.begin(); i!=src.m_UnknownXMLObjects.end(); ++i) { - if (*i) { - getUnknownXMLObjects().push_back((*i)->clone()); - } - } + IMPL_CLONE_XMLOBJECT_CHILDREN(UnknownXMLObject); } IMPL_XMLOBJECT_CLONE(StatusDetail); @@ -662,12 +631,9 @@ namespace opensaml { StatusImpl(const StatusImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { init(); - if (src.getStatusCode()) - setStatusCode(src.getStatusCode()->cloneStatusCode()); - if (src.getStatusMessage()) - setStatusMessage(src.getStatusMessage()->cloneStatusMessage()); - if (src.getStatusDetail()) - setStatusDetail(src.getStatusDetail()->cloneStatusDetail()); + IMPL_CLONE_TYPED_CHILD(StatusCode); + IMPL_CLONE_TYPED_CHILD(StatusMessage); + IMPL_CLONE_TYPED_CHILD(StatusDetail); } IMPL_XMLOBJECT_CLONE(Status); @@ -729,23 +695,22 @@ namespace opensaml { // Need customized setter. protected: void _clone(const ResponseAbstractTypeImpl& src) { - setMinorVersion(src.m_MinorVersion); - setResponseID(src.getResponseID()); - setInResponseTo(src.getInResponseTo()); - setIssueInstant(src.getIssueInstant()); - setRecipient(src.getRecipient()); - if (src.getSignature()) - setSignature(src.getSignature()->cloneSignature()); + IMPL_CLONE_INTEGER_ATTRIB(MinorVersion); + IMPL_CLONE_ATTRIB(ResponseID); + IMPL_CLONE_ATTRIB(InResponseTo); + IMPL_CLONE_ATTRIB(IssueInstant); + IMPL_CLONE_ATTRIB(Recipient); + IMPL_CLONE_TYPED_CHILD(Signature); } - Signature* m_Signature; + xmlsignature::Signature* m_Signature; list::iterator m_pos_Signature; public: - Signature* getSignature() const { + xmlsignature::Signature* getSignature() const { return m_Signature; } - void setSignature(Signature* sig) { + void setSignature(xmlsignature::Signature* sig) { prepareForAssignment(m_Signature,sig); *m_pos_Signature=m_Signature=sig; // Sync content reference back up. @@ -807,7 +772,7 @@ namespace opensaml { } void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { - PROC_TYPED_CHILD(Signature,XMLSIG_NS,false); + PROC_TYPED_FOREIGN_CHILD(Signature,xmlsignature,XMLSIG_NS,false); AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root); } @@ -860,13 +825,8 @@ namespace opensaml { void _clone(const ResponseImpl& src) { ResponseAbstractTypeImpl::_clone(src); - if (src.getStatus()) - setStatus(src.getStatus()->cloneStatus()); - for (vector::const_iterator i=src.m_Assertions.begin(); i!=src.m_Assertions.end(); i++) { - if (*i) { - getAssertions().push_back((*i)->cloneAssertion()); - } - } + IMPL_CLONE_TYPED_CHILD(Status); + IMPL_CLONE_TYPED_FOREIGN_CHILDREN(Assertion,saml1); } IMPL_XMLOBJECT_CLONE_EX(Response); diff --git a/saml/saml2/core/impl/Assertions20Impl.cpp b/saml/saml2/core/impl/Assertions20Impl.cpp index d9ef1fd..efdb49f 100644 --- a/saml/saml2/core/impl/Assertions20Impl.cpp +++ b/saml/saml2/core/impl/Assertions20Impl.cpp @@ -47,8 +47,6 @@ #include using namespace opensaml::saml2; -using namespace xmlencryption; -using namespace xmlsignature; using namespace xmltooling; using namespace std; using xmlconstants::XSI_NS; @@ -633,7 +631,7 @@ namespace opensaml { } IMPL_XMLOBJECT_CLONE_EX(KeyInfoConfirmationDataType); - IMPL_TYPED_CHILDREN(KeyInfo,m_children.end()); + IMPL_TYPED_FOREIGN_CHILDREN(KeyInfo,xmlsignature,m_children.end()); public: void setAttribute(const xmltooling::QName& qualifiedName, const XMLCh* value, bool ID=false) { @@ -669,7 +667,7 @@ namespace opensaml { } void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { - PROC_TYPED_CHILDREN(KeyInfo,XMLSIG_NS,false); + PROC_TYPED_FOREIGN_CHILDREN(KeyInfo,xmlsignature,XMLSIG_NS,false); AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root); } @@ -1385,14 +1383,14 @@ namespace opensaml { //IMPL_TYPED_CHILD(Signature); // Need customized setter. protected: - Signature* m_Signature; + xmlsignature::Signature* m_Signature; list::iterator m_pos_Signature; public: - Signature* getSignature() const { + xmlsignature::Signature* getSignature() const { return m_Signature; } - void setSignature(Signature* sig) { + void setSignature(xmlsignature::Signature* sig) { prepareForAssignment(m_Signature,sig); *m_pos_Signature=m_Signature=sig; // Sync content reference back up. @@ -1435,7 +1433,7 @@ namespace opensaml { void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { PROC_TYPED_CHILD(Issuer,SAML20_NS,false); - PROC_TYPED_CHILD(Signature,XMLSIG_NS,false); + PROC_TYPED_FOREIGN_CHILD(Signature,xmlsignature,XMLSIG_NS,false); PROC_TYPED_CHILD(Subject,SAML20_NS,false); PROC_TYPED_CHILD(Conditions,SAML20_NS,false); PROC_TYPED_CHILD(Advice,SAML20_NS,false); diff --git a/saml/saml2/core/impl/Protocols20Impl.cpp b/saml/saml2/core/impl/Protocols20Impl.cpp index 15c4a17..6ce1c3a 100644 --- a/saml/saml2/core/impl/Protocols20Impl.cpp +++ b/saml/saml2/core/impl/Protocols20Impl.cpp @@ -40,12 +40,12 @@ #include #include +#include +#include +#include #include using namespace opensaml::saml2p; -using namespace opensaml::saml2; -using namespace xmlsignature; -using namespace xmlencryption; using namespace xmltooling; using namespace std; using xmlconstants::XMLSIG_NS; @@ -82,16 +82,11 @@ namespace opensaml { virtual ~ExtensionsImpl() {} ExtensionsImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { - } + : AbstractXMLObject(nsURI, localName, prefix, schemaType) {} ExtensionsImpl(const ExtensionsImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { - for (vector::const_iterator i=src.m_UnknownXMLObjects.begin(); i!=src.m_UnknownXMLObjects.end(); ++i) { - if (*i) { - getUnknownXMLObjects().push_back((*i)->clone()); - } - } + IMPL_CLONE_XMLOBJECT_CHILDREN(UnknownXMLObject); } IMPL_XMLOBJECT_CLONE(Extensions); @@ -123,74 +118,67 @@ namespace opensaml { m_pos_StatusCode=m_children.begin(); } - public: - virtual ~StatusCodeImpl() { - XMLString::release(&m_Value); - } + public: + virtual ~StatusCodeImpl() { + XMLString::release(&m_Value); + } - StatusCodeImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::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) - : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { - init(); - setValue(src.getValue()); - if (src.getStatusCode()) - setStatusCode(src.getStatusCode()->cloneStatusCode()); - } + StatusCodeImpl(const StatusCodeImpl& src) + : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { + init(); + IMPL_CLONE_ATTRIB(Value); + IMPL_CLONE_TYPED_CHILD(StatusCode); + } - IMPL_XMLOBJECT_CLONE(StatusCode); - IMPL_STRING_ATTRIB(Value); - IMPL_TYPED_CHILD(StatusCode); + IMPL_XMLOBJECT_CLONE(StatusCode); + IMPL_STRING_ATTRIB(Value); + IMPL_TYPED_CHILD(StatusCode); - protected: - void marshallAttributes(DOMElement* domElement) const { - MARSHALL_STRING_ATTRIB(Value,VALUE,nullptr); - } + protected: + void marshallAttributes(DOMElement* domElement) const { + MARSHALL_STRING_ATTRIB(Value,VALUE,nullptr); + } - void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { - PROC_TYPED_CHILD(StatusCode,SAML20P_NS,false); - AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root); - } + void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { + PROC_TYPED_CHILD(StatusCode,SAML20P_NS,false); + AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root); + } - void processAttribute(const DOMAttr* attribute) { - PROC_STRING_ATTRIB(Value,VALUE,nullptr); - AbstractXMLObjectUnmarshaller::processAttribute(attribute); - } + void processAttribute(const DOMAttr* attribute) { + PROC_STRING_ATTRIB(Value,VALUE,nullptr); + AbstractXMLObjectUnmarshaller::processAttribute(attribute); + } }; - //TODO need unit tests for non-SAML namespace children class SAML_DLLLOCAL StatusDetailImpl : public virtual StatusDetail, public AbstractComplexElement, public AbstractDOMCachingXMLObject, public AbstractXMLObjectMarshaller, public AbstractXMLObjectUnmarshaller { - public: - virtual ~StatusDetailImpl() {} + public: + virtual ~StatusDetailImpl() {} - StatusDetailImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::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) { - for (vector::const_iterator i=src.m_UnknownXMLObjects.begin(); i!=src.m_UnknownXMLObjects.end(); ++i) { - if (*i) { - getUnknownXMLObjects().push_back((*i)->clone()); - } - } - } + StatusDetailImpl(const StatusDetailImpl& src) + : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { + IMPL_CLONE_XMLOBJECT_CHILDREN(UnknownXMLObject); + } - IMPL_XMLOBJECT_CLONE(StatusDetail); - IMPL_XMLOBJECT_CHILDREN(UnknownXMLObject,m_children.end()); + IMPL_XMLOBJECT_CLONE(StatusDetail); + IMPL_XMLOBJECT_CHILDREN(UnknownXMLObject,m_children.end()); - protected: - void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { - getUnknownXMLObjects().push_back(childXMLObject); - } + protected: + void processChildElement(XMLObject* childXMLObject, const DOMElement* root) { + getUnknownXMLObjects().push_back(childXMLObject); + } }; @@ -215,7 +203,7 @@ namespace opensaml { } public: - virtual ~StatusImpl() { } + virtual ~StatusImpl() {} StatusImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { @@ -224,12 +212,9 @@ namespace opensaml { StatusImpl(const StatusImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { init(); - if (src.getStatusCode()) - setStatusCode(src.getStatusCode()->cloneStatusCode()); - if (src.getStatusMessage()) - setStatusMessage(src.getStatusMessage()->cloneStatusMessage()); - if (src.getStatusDetail()) - setStatusDetail(src.getStatusDetail()->cloneStatusDetail()); + IMPL_CLONE_TYPED_CHILD(StatusCode); + IMPL_CLONE_TYPED_CHILD(StatusMessage); + IMPL_CLONE_TYPED_CHILD(StatusDetail); } IMPL_XMLOBJECT_CLONE(Status); @@ -297,30 +282,27 @@ namespace opensaml { } void _clone(const RequestAbstractTypeImpl& src) { - setID(src.getID()); - setVersion(src.getVersion()); - setIssueInstant(src.getIssueInstant()); - setDestination(src.getDestination()); - setConsent(src.getConsent()); - if (src.getIssuer()) - setIssuer(src.getIssuer()->cloneIssuer()); - if (src.getSignature()) - setSignature(src.getSignature()->cloneSignature()); - if (src.getExtensions()) - setExtensions(src.getExtensions()->cloneExtensions()); + IMPL_CLONE_ATTRIB(ID); + IMPL_CLONE_ATTRIB(Version); + IMPL_CLONE_ATTRIB(IssueInstant); + IMPL_CLONE_ATTRIB(Destination); + IMPL_CLONE_ATTRIB(Consent); + IMPL_CLONE_TYPED_CHILD(Issuer); + IMPL_CLONE_TYPED_CHILD(Signature); + IMPL_CLONE_TYPED_CHILD(Extensions); } //IMPL_TYPED_CHILD(Signature); // Need customized setter. protected: - Signature* m_Signature; + xmlsignature::Signature* m_Signature; list::iterator m_pos_Signature; public: - Signature* getSignature() const { + xmlsignature::Signature* getSignature() const { return m_Signature; } - void setSignature(Signature* sig) { + void setSignature(xmlsignature::Signature* sig) { prepareForAssignment(m_Signature,sig); *m_pos_Signature=m_Signature=sig; // Sync content reference back up. @@ -383,21 +365,16 @@ namespace opensaml { class SAML_DLLLOCAL AssertionIDRequestImpl : public virtual AssertionIDRequest, public RequestAbstractTypeImpl { public: - virtual ~AssertionIDRequestImpl() { } + virtual ~AssertionIDRequestImpl() {} AssertionIDRequestImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { } + : AbstractXMLObject(nsURI, localName, prefix, schemaType) {} - AssertionIDRequestImpl(const AssertionIDRequestImpl& src) : AbstractXMLObject(src), RequestAbstractTypeImpl(src) { - } + AssertionIDRequestImpl(const AssertionIDRequestImpl& src) : AbstractXMLObject(src), RequestAbstractTypeImpl(src) {} 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) { - getAssertionIDRefs().push_back((*i)->cloneAssertionIDRef()); - } - } + IMPL_CLONE_TYPED_FOREIGN_CHILDREN(AssertionIDRef,saml2); } IMPL_XMLOBJECT_CLONE_EX(AssertionIDRequest); @@ -425,7 +402,7 @@ namespace opensaml { } public: - virtual ~SubjectQueryImpl() { } + virtual ~SubjectQueryImpl() {} SubjectQueryImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { @@ -438,8 +415,7 @@ namespace opensaml { void _clone(const SubjectQueryImpl& src) { RequestAbstractTypeImpl::_clone(src); - if (src.getSubject()) - setSubject(src.getSubject()->cloneSubject()); + IMPL_CLONE_TYPED_CHILD(Subject); } SubjectQuery* cloneSubjectQuery() const { @@ -478,22 +454,11 @@ namespace opensaml { RequestedAuthnContextImpl(const RequestedAuthnContextImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { init(); - setComparison(src.getComparison()); - for (list::const_iterator i=src.m_children.begin(); i!=src.m_children.end(); i++) { - if (*i) { - AuthnContextClassRef* classref=dynamic_cast(*i); - if (classref) { - getAuthnContextClassRefs().push_back(classref->cloneAuthnContextClassRef()); - continue; - } - - AuthnContextDeclRef* declref=dynamic_cast(*i); - if (declref) { - getAuthnContextDeclRefs().push_back(declref->cloneAuthnContextDeclRef()); - continue; - } - } - } + IMPL_CLONE_ATTRIB(Comparison); + IMPL_CLONE_CHILDBAG_BEGIN; + IMPL_CLONE_TYPED_FOREIGN_CHILD_IN_BAG(AuthnContextClassRef,saml2); + IMPL_CLONE_TYPED_FOREIGN_CHILD_IN_BAG(AuthnContextDeclRef,saml2); + IMPL_CLONE_CHILDBAG_END; } IMPL_XMLOBJECT_CLONE(RequestedAuthnContext); @@ -545,9 +510,8 @@ namespace opensaml { void _clone(const AuthnQueryImpl& src) { SubjectQueryImpl::_clone(src); - setSessionIndex(src.getSessionIndex()); - if (src.getRequestedAuthnContext()) - setRequestedAuthnContext(src.getRequestedAuthnContext()->cloneRequestedAuthnContext()); + IMPL_CLONE_ATTRIB(SessionIndex); + IMPL_CLONE_TYPED_CHILD(RequestedAuthnContext); } IMPL_XMLOBJECT_CLONE_EX(AuthnQuery); @@ -573,25 +537,16 @@ namespace opensaml { class SAML_DLLLOCAL AttributeQueryImpl : public virtual AttributeQuery, public SubjectQueryImpl { public: - virtual ~AttributeQueryImpl() { } + virtual ~AttributeQueryImpl() {} AttributeQueryImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { } + : AbstractXMLObject(nsURI, localName, prefix, schemaType) {} - AttributeQueryImpl(const AttributeQueryImpl& src) : AbstractXMLObject(src), SubjectQueryImpl(src) { - } + 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); - if (attrib) { - getAttributes().push_back(attrib->cloneAttribute()); - continue; - } - } - } + IMPL_CLONE_TYPED_FOREIGN_CHILDREN(Attribute,saml2); } IMPL_XMLOBJECT_CLONE_EX(AttributeQuery); @@ -630,18 +585,9 @@ namespace opensaml { void _clone(const AuthzDecisionQueryImpl& src) { SubjectQueryImpl::_clone(src); - setResource(src.getResource()); - if (src.getEvidence()) - setEvidence(src.getEvidence()->cloneEvidence()); - for (list::const_iterator i=src.m_children.begin(); i!=src.m_children.end(); i++) { - if (*i) { - Action* action=dynamic_cast(*i); - if (action) { - getActions().push_back(action->cloneAction()); - continue; - } - } - } + IMPL_CLONE_ATTRIB(Resource); + IMPL_CLONE_TYPED_CHILD(Evidence); + IMPL_CLONE_TYPED_FOREIGN_CHILDREN(Action,saml2); } IMPL_XMLOBJECT_CLONE_EX(AuthzDecisionQuery); @@ -678,43 +624,43 @@ namespace opensaml { m_AllowCreate=XML_BOOL_NULL; } - public: - virtual ~NameIDPolicyImpl() { - XMLString::release(&m_Format); - XMLString::release(&m_SPNameQualifier); - } + public: + virtual ~NameIDPolicyImpl() { + XMLString::release(&m_Format); + XMLString::release(&m_SPNameQualifier); + } - NameIDPolicyImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::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) - : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src) { - init(); - setFormat(src.getFormat()); - setSPNameQualifier(src.getSPNameQualifier()); - AllowCreate(src.m_AllowCreate); - } + NameIDPolicyImpl(const NameIDPolicyImpl& src) + : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src) { + init(); + IMPL_CLONE_ATTRIB(Format); + IMPL_CLONE_ATTRIB(SPNameQualifier); + IMPL_CLONE_BOOLEAN_ATTRIB(AllowCreate); + } - IMPL_XMLOBJECT_CLONE(NameIDPolicy); - IMPL_STRING_ATTRIB(Format); - IMPL_STRING_ATTRIB(SPNameQualifier); - IMPL_BOOLEAN_ATTRIB(AllowCreate); + IMPL_XMLOBJECT_CLONE(NameIDPolicy); + IMPL_STRING_ATTRIB(Format); + IMPL_STRING_ATTRIB(SPNameQualifier); + IMPL_BOOLEAN_ATTRIB(AllowCreate); - protected: - void marshallAttributes(DOMElement* domElement) const { - MARSHALL_STRING_ATTRIB(Format,FORMAT,nullptr); - MARSHALL_STRING_ATTRIB(SPNameQualifier,SPNAMEQUALIFIER,nullptr); - MARSHALL_BOOLEAN_ATTRIB(AllowCreate,ALLOWCREATE,nullptr); - } + protected: + void marshallAttributes(DOMElement* domElement) const { + 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,nullptr); - PROC_STRING_ATTRIB(SPNameQualifier,SPNAMEQUALIFIER,nullptr); - PROC_BOOLEAN_ATTRIB(AllowCreate,ALLOWCREATE,nullptr); - AbstractXMLObjectUnmarshaller::processAttribute(attribute); - } + void processAttribute(const DOMAttr* attribute) { + PROC_STRING_ATTRIB(Format,FORMAT,nullptr); + PROC_STRING_ATTRIB(SPNameQualifier,SPNAMEQUALIFIER,nullptr); + PROC_BOOLEAN_ATTRIB(AllowCreate,ALLOWCREATE,nullptr); + AbstractXMLObjectUnmarshaller::processAttribute(attribute); + } }; class SAML_DLLLOCAL IDPEntryImpl : public virtual IDPEntry, @@ -729,43 +675,43 @@ namespace opensaml { m_Loc=nullptr; } - public: - virtual ~IDPEntryImpl() { - XMLString::release(&m_ProviderID); - XMLString::release(&m_Name); - XMLString::release(&m_Loc); - } + public: + 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 xmltooling::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) { - init(); - setProviderID(src.getProviderID()); - setName(src.getName()); - setLoc(src.getLoc()); - } + IDPEntryImpl(const IDPEntryImpl& src) : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src) { + init(); + IMPL_CLONE_ATTRIB(ProviderID); + IMPL_CLONE_ATTRIB(Name); + IMPL_CLONE_ATTRIB(Loc); + } - IMPL_XMLOBJECT_CLONE(IDPEntry); - IMPL_STRING_ATTRIB(ProviderID); - IMPL_STRING_ATTRIB(Name); - IMPL_STRING_ATTRIB(Loc); + IMPL_XMLOBJECT_CLONE(IDPEntry); + IMPL_STRING_ATTRIB(ProviderID); + IMPL_STRING_ATTRIB(Name); + IMPL_STRING_ATTRIB(Loc); - protected: - void marshallAttributes(DOMElement* domElement) const { - MARSHALL_STRING_ATTRIB(ProviderID,PROVIDERID,nullptr); - MARSHALL_STRING_ATTRIB(Name,NAME,nullptr); - MARSHALL_STRING_ATTRIB(Loc,LOC,nullptr); - } + protected: + void marshallAttributes(DOMElement* domElement) const { + 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,nullptr); - PROC_STRING_ATTRIB(Name,NAME,nullptr); - PROC_STRING_ATTRIB(Loc,LOC,nullptr); - AbstractXMLObjectUnmarshaller::processAttribute(attribute); - } + void processAttribute(const DOMAttr* attribute) { + PROC_STRING_ATTRIB(ProviderID,PROVIDERID,nullptr); + PROC_STRING_ATTRIB(Name,NAME,nullptr); + PROC_STRING_ATTRIB(Loc,LOC,nullptr); + AbstractXMLObjectUnmarshaller::processAttribute(attribute); + } }; class SAML_DLLLOCAL IDPListImpl : public virtual IDPList, @@ -781,7 +727,7 @@ namespace opensaml { } public: - virtual ~IDPListImpl() { } + virtual ~IDPListImpl() {} IDPListImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { @@ -791,13 +737,8 @@ namespace opensaml { IDPListImpl(const IDPListImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { init(); - if (src.getGetComplete()) - setGetComplete(src.getGetComplete()->cloneGetComplete()); - for (vector::const_iterator i=src.m_IDPEntrys.begin(); i!=src.m_IDPEntrys.end(); ++i) { - if (*i) { - getIDPEntrys().push_back((*i)->cloneIDPEntry()); - } - } + IMPL_CLONE_TYPED_CHILD(GetComplete); + IMPL_CLONE_TYPED_CHILDREN(IDPEntry); } IMPL_XMLOBJECT_CLONE(IDPList); @@ -839,14 +780,9 @@ namespace opensaml { ScopingImpl(const ScopingImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { init(); - setProxyCount(src.m_ProxyCount); - if (src.getIDPList()) - setIDPList(src.getIDPList()->cloneIDPList()); - for (vector::const_iterator i=src.m_RequesterIDs.begin(); i!=src.m_RequesterIDs.end(); ++i) { - if (*i) { - getRequesterIDs().push_back((*i)->cloneRequesterID()); - } - } + IMPL_CLONE_INTEGER_ATTRIB(ProxyCount); + IMPL_CLONE_TYPED_CHILD(IDPList); + IMPL_CLONE_TYPED_CHILDREN(RequesterID); } IMPL_XMLOBJECT_CLONE(Scoping); @@ -924,23 +860,18 @@ namespace opensaml { void _clone(const AuthnRequestImpl& src) { RequestAbstractTypeImpl::_clone(src); - ForceAuthn(src.m_ForceAuthn); - IsPassive(src.m_IsPassive); - setProtocolBinding(src.getProtocolBinding()); - setAssertionConsumerServiceIndex(src.m_AssertionConsumerServiceIndex); - setAssertionConsumerServiceURL(src.getAssertionConsumerServiceURL()); - setAttributeConsumingServiceIndex(src.m_AttributeConsumingServiceIndex); - setProviderName(src.getProviderName()); - if (src.getSubject()) - setSubject(src.getSubject()->cloneSubject()); - if (src.getNameIDPolicy()) - setNameIDPolicy(src.getNameIDPolicy()->cloneNameIDPolicy()); - if (src.getConditions()) - setConditions(src.getConditions()->cloneConditions()); - if (src.getRequestedAuthnContext()) - setRequestedAuthnContext(src.getRequestedAuthnContext()->cloneRequestedAuthnContext()); - if (src.getScoping()) - setScoping(src.getScoping()->cloneScoping()); + IMPL_CLONE_BOOLEAN_ATTRIB(ForceAuthn); + IMPL_CLONE_BOOLEAN_ATTRIB(IsPassive); + IMPL_CLONE_ATTRIB(ProtocolBinding); + IMPL_CLONE_INTEGER_ATTRIB(AssertionConsumerServiceIndex); + IMPL_CLONE_ATTRIB(AssertionConsumerServiceURL); + IMPL_CLONE_INTEGER_ATTRIB(AttributeConsumingServiceIndex); + IMPL_CLONE_ATTRIB(ProviderName); + IMPL_CLONE_TYPED_CHILD(Subject); + IMPL_CLONE_TYPED_CHILD(NameIDPolicy); + IMPL_CLONE_TYPED_CHILD(Conditions); + IMPL_CLONE_TYPED_CHILD(RequestedAuthnContext); + IMPL_CLONE_TYPED_CHILD(Scoping); } IMPL_XMLOBJECT_CLONE_EX(AuthnRequest); @@ -1047,33 +978,29 @@ namespace opensaml { } void _clone(const StatusResponseTypeImpl& src) { - setID(src.getID()); - setInResponseTo(src.getInResponseTo()); - setVersion(src.getVersion()); - setIssueInstant(src.getIssueInstant()); - setDestination(src.getDestination()); - setConsent(src.getConsent()); - if (src.getIssuer()) - setIssuer(src.getIssuer()->cloneIssuer()); - if (src.getSignature()) - setSignature(src.getSignature()->cloneSignature()); - if (src.getExtensions()) - setExtensions(src.getExtensions()->cloneExtensions()); - if (src.getStatus()) - setStatus(src.getStatus()->cloneStatus()); + IMPL_CLONE_ATTRIB(ID); + IMPL_CLONE_ATTRIB(InResponseTo); + IMPL_CLONE_ATTRIB(Version); + IMPL_CLONE_ATTRIB(IssueInstant); + IMPL_CLONE_ATTRIB(Destination); + IMPL_CLONE_ATTRIB(Consent); + IMPL_CLONE_TYPED_CHILD(Issuer); + IMPL_CLONE_TYPED_CHILD(Signature); + IMPL_CLONE_TYPED_CHILD(Extensions); + IMPL_CLONE_TYPED_CHILD(Status); } //IMPL_TYPED_CHILD(Signature); // Need customized setter. protected: - Signature* m_Signature; + xmlsignature::Signature* m_Signature; list::iterator m_pos_Signature; public: - Signature* getSignature() const { + xmlsignature::Signature* getSignature() const { return m_Signature; } - void setSignature(Signature* sig) { + void setSignature(xmlsignature::Signature* sig) { prepareForAssignment(m_Signature,sig); *m_pos_Signature=m_Signature=sig; // Sync content reference back up. @@ -1140,30 +1067,19 @@ namespace opensaml { class SAML_DLLLOCAL ResponseImpl : public virtual Response, public StatusResponseTypeImpl { public: - virtual ~ResponseImpl() { } + virtual ~ResponseImpl() {} ResponseImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { } + : AbstractXMLObject(nsURI, localName, prefix, schemaType) {} - ResponseImpl(const ResponseImpl& src) : AbstractXMLObject(src), StatusResponseTypeImpl(src) { - } + 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); - if (assertion) { - getAssertions().push_back(assertion->cloneAssertion()); - continue; - } - EncryptedAssertion* encAssertion=dynamic_cast(*i); - if (encAssertion) { - getEncryptedAssertions().push_back(encAssertion->cloneEncryptedAssertion()); - continue; - } - } - } + IMPL_CLONE_CHILDBAG_BEGIN; + IMPL_CLONE_TYPED_FOREIGN_CHILD_IN_BAG(Assertion,saml2); + IMPL_CLONE_TYPED_FOREIGN_CHILD_IN_BAG(EncryptedAssertion,saml2); + IMPL_CLONE_CHILDBAG_END; } IMPL_XMLOBJECT_CLONE_EX(Response); @@ -1188,7 +1104,7 @@ namespace opensaml { } public: - virtual ~ArtifactResolveImpl() { } + virtual ~ArtifactResolveImpl() {} ArtifactResolveImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { @@ -1201,8 +1117,7 @@ namespace opensaml { void _clone(const ArtifactResolveImpl& src) { RequestAbstractTypeImpl::_clone(src); - if(src.getArtifact()) - setArtifact(src.getArtifact()->cloneArtifact()); + IMPL_CLONE_TYPED_CHILD(Artifact); } IMPL_XMLOBJECT_CLONE_EX(ArtifactResolve); @@ -1225,7 +1140,7 @@ namespace opensaml { } public: - virtual ~ArtifactResponseImpl() { } + virtual ~ArtifactResponseImpl() {} ArtifactResponseImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { @@ -1238,8 +1153,7 @@ namespace opensaml { void _clone(const ArtifactResponseImpl& src) { StatusResponseTypeImpl::_clone(src); - if (src.getPayload()) - setPayload(src.getPayload()->clone()); + IMPL_CLONE_XMLOBJECT_CHILD(Payload); } IMPL_XMLOBJECT_CLONE_EX(ArtifactResponse); @@ -1289,13 +1203,8 @@ namespace opensaml { NewEncryptedIDImpl(const NewEncryptedIDImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { init(); - if (src.getEncryptedData()) - setEncryptedData(src.getEncryptedData()->cloneEncryptedData()); - for (vector::const_iterator i=src.m_EncryptedKeys.begin(); i!=src.m_EncryptedKeys.end(); i++) { - if (*i) { - getEncryptedKeys().push_back((*i)->cloneEncryptedKey()); - } - } + IMPL_CLONE_TYPED_CHILD(EncryptedData); + IMPL_CLONE_TYPED_FOREIGN_CHILDREN(EncryptedKey,xmlencryption); } IMPL_XMLOBJECT_CLONE2(NewEncryptedID,EncryptedElementType); @@ -1316,20 +1225,19 @@ namespace opensaml { public AbstractXMLObjectMarshaller, public AbstractXMLObjectUnmarshaller { - public: - virtual ~TerminateImpl() { } + public: + virtual ~TerminateImpl() {} - TerminateImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { } + TerminateImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) + : AbstractXMLObject(nsURI, localName, prefix, schemaType) {} - TerminateImpl(const TerminateImpl& src) - : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src) { - } + TerminateImpl(const TerminateImpl& src) + : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src) {} - IMPL_XMLOBJECT_CLONE(Terminate); + IMPL_XMLOBJECT_CLONE(Terminate); - protected: - // has no attributes or children + protected: + // has no attributes or children }; class SAML_DLLLOCAL ManageNameIDRequestImpl : public virtual ManageNameIDRequest, public RequestAbstractTypeImpl @@ -1358,7 +1266,7 @@ namespace opensaml { } public: - virtual ~ManageNameIDRequestImpl() { } + virtual ~ManageNameIDRequestImpl() {} ManageNameIDRequestImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { @@ -1371,16 +1279,11 @@ namespace opensaml { void _clone(const ManageNameIDRequestImpl& src) { RequestAbstractTypeImpl::_clone(src); - if (src.getNameID()) - setNameID(src.getNameID()->cloneNameID()); - if (src.getEncryptedID()) - setEncryptedID(src.getEncryptedID()->cloneEncryptedID()); - if (src.getNewID()) - setNewID(src.getNewID()->cloneNewID()); - if (src.getNewEncryptedID()) - setNewEncryptedID(src.getNewEncryptedID()->cloneNewEncryptedID()); - if (src.getTerminate()) - setTerminate(src.getTerminate()->cloneTerminate()); + IMPL_CLONE_TYPED_CHILD(NameID); + IMPL_CLONE_TYPED_CHILD(EncryptedID); + IMPL_CLONE_TYPED_CHILD(NewID); + IMPL_CLONE_TYPED_CHILD(NewEncryptedID); + IMPL_CLONE_TYPED_CHILD(Terminate); } IMPL_XMLOBJECT_CLONE_EX(ManageNameIDRequest); @@ -1404,13 +1307,12 @@ namespace opensaml { class SAML_DLLLOCAL ManageNameIDResponseImpl : public virtual ManageNameIDResponse, public StatusResponseTypeImpl { public: - virtual ~ManageNameIDResponseImpl() { } + virtual ~ManageNameIDResponseImpl() {} ManageNameIDResponseImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { } + : AbstractXMLObject(nsURI, localName, prefix, schemaType) {} - ManageNameIDResponseImpl(const ManageNameIDResponseImpl& src) : AbstractXMLObject(src), StatusResponseTypeImpl(src) { - } + ManageNameIDResponseImpl(const ManageNameIDResponseImpl& src) : AbstractXMLObject(src), StatusResponseTypeImpl(src) {} IMPL_XMLOBJECT_CLONE_EX(ManageNameIDResponse); }; @@ -1451,20 +1353,12 @@ namespace opensaml { void _clone(const LogoutRequestImpl& src) { RequestAbstractTypeImpl::_clone(src); - setReason(src.getReason()); - setNotOnOrAfter(src.getNotOnOrAfter()); - if (src.getBaseID()) - setBaseID(src.getBaseID()->cloneBaseID()); - if (src.getNameID()) - setNameID(src.getNameID()->cloneNameID()); - if (src.getEncryptedID()) - setEncryptedID(src.getEncryptedID()->cloneEncryptedID()); - - for (vector::const_iterator i=src.m_SessionIndexs.begin(); i!=src.m_SessionIndexs.end(); ++i) { - if (*i) { - getSessionIndexs().push_back((*i)->cloneSessionIndex()); - } - } + IMPL_CLONE_ATTRIB(Reason); + IMPL_CLONE_ATTRIB(NotOnOrAfter); + IMPL_CLONE_TYPED_CHILD(BaseID); + IMPL_CLONE_TYPED_CHILD(NameID); + IMPL_CLONE_TYPED_CHILD(EncryptedID); + IMPL_CLONE_TYPED_CHILDREN(SessionIndex); } IMPL_XMLOBJECT_CLONE_EX(LogoutRequest); @@ -1499,13 +1393,12 @@ namespace opensaml { class SAML_DLLLOCAL LogoutResponseImpl : public virtual LogoutResponse, public StatusResponseTypeImpl { public: - virtual ~LogoutResponseImpl() { } + virtual ~LogoutResponseImpl() {} LogoutResponseImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) - : AbstractXMLObject(nsURI, localName, prefix, schemaType) { } + : AbstractXMLObject(nsURI, localName, prefix, schemaType) {} - LogoutResponseImpl(const LogoutResponseImpl& src) : AbstractXMLObject(src), StatusResponseTypeImpl(src) { - } + LogoutResponseImpl(const LogoutResponseImpl& src) : AbstractXMLObject(src), StatusResponseTypeImpl(src) {} IMPL_XMLOBJECT_CLONE_EX(LogoutResponse); }; @@ -1533,7 +1426,7 @@ namespace opensaml { } public: - virtual ~NameIDMappingRequestImpl() { } + virtual ~NameIDMappingRequestImpl() {} NameIDMappingRequestImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { @@ -1546,14 +1439,10 @@ namespace opensaml { void _clone(const NameIDMappingRequestImpl& src) { RequestAbstractTypeImpl::_clone(src); - if (src.getBaseID()) - setBaseID(src.getBaseID()->cloneBaseID()); - if (src.getNameID()) - setNameID(src.getNameID()->cloneNameID()); - if (src.getEncryptedID()) - setEncryptedID(src.getEncryptedID()->cloneEncryptedID()); - if (src.getNameIDPolicy()) - setNameIDPolicy(src.getNameIDPolicy()->cloneNameIDPolicy()); + IMPL_CLONE_TYPED_CHILD(BaseID); + IMPL_CLONE_TYPED_CHILD(NameID); + IMPL_CLONE_TYPED_CHILD(EncryptedID); + IMPL_CLONE_TYPED_CHILD(NameIDPolicy); } IMPL_XMLOBJECT_CLONE_EX(NameIDMappingRequest); @@ -1586,7 +1475,7 @@ namespace opensaml { } public: - virtual ~NameIDMappingResponseImpl() { } + virtual ~NameIDMappingResponseImpl() {} NameIDMappingResponseImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) : AbstractXMLObject(nsURI, localName, prefix, schemaType) { @@ -1599,10 +1488,8 @@ namespace opensaml { void _clone(const NameIDMappingResponseImpl& src) { StatusResponseTypeImpl::_clone(src); - if (src.getNameID()) - setNameID(src.getNameID()->cloneNameID()); - if (src.getEncryptedID()) - setEncryptedID(src.getEncryptedID()->cloneEncryptedID()); + IMPL_CLONE_TYPED_CHILD(NameID); + IMPL_CLONE_TYPED_CHILD(EncryptedID); } IMPL_XMLOBJECT_CLONE_EX(NameIDMappingResponse); diff --git a/saml/saml2/metadata/impl/MetadataImpl.cpp b/saml/saml2/metadata/impl/MetadataImpl.cpp index c58369d..89f39e8 100644 --- a/saml/saml2/metadata/impl/MetadataImpl.cpp +++ b/saml/saml2/metadata/impl/MetadataImpl.cpp @@ -52,9 +52,6 @@ using namespace samlconstants; using namespace opensaml::saml2md; -using namespace opensaml::saml2; -using namespace xmlencryption; -using namespace xmlsignature; using namespace xmltooling; using namespace std; using xmlconstants::XMLSIG_NS; @@ -907,14 +904,14 @@ namespace opensaml { //IMPL_TYPED_CHILD(Signature); // Need customized setter. protected: - Signature* m_Signature; + xmlsignature::Signature* m_Signature; list::iterator m_pos_Signature; public: - Signature* getSignature() const { + xmlsignature::Signature* getSignature() const { return m_Signature; } - void setSignature(Signature* sig) { + void setSignature(xmlsignature::Signature* sig) { prepareForAssignment(m_Signature,sig); *m_pos_Signature=m_Signature=sig; // Sync content reference back up. @@ -1567,7 +1564,7 @@ namespace opensaml { IMPL_CLONE_TYPED_CHILDREN(AssertionIDRequestService); IMPL_CLONE_TYPED_CHILDREN(NameIDFormat); IMPL_CLONE_TYPED_CHILDREN(AttributeProfile); - IMPL_CLONE_TYPED_CHILDREN(Attribute); + IMPL_CLONE_TYPED_FOREIGN_CHILDREN(Attribute,saml2); } IMPL_XMLOBJECT_CLONE_EX(AttributeAuthorityDescriptor); @@ -1773,14 +1770,14 @@ namespace opensaml { //IMPL_TYPED_CHILD(Signature); // Need customized setter. protected: - Signature* m_Signature; + xmlsignature::Signature* m_Signature; list::iterator m_pos_Signature; public: - Signature* getSignature() const { + xmlsignature::Signature* getSignature() const { return m_Signature; } - void setSignature(Signature* sig) { + void setSignature(xmlsignature::Signature* sig) { prepareForAssignment(m_Signature,sig); *m_pos_Signature=m_Signature=sig; // Sync content reference back up. @@ -1926,14 +1923,14 @@ namespace opensaml { //IMPL_TYPED_CHILD(Signature); // Need customized setter. protected: - Signature* m_Signature; + xmlsignature::Signature* m_Signature; list::iterator m_pos_Signature; public: - Signature* getSignature() const { + xmlsignature::Signature* getSignature() const { return m_Signature; } - void setSignature(Signature* sig) { + void setSignature(xmlsignature::Signature* sig) { prepareForAssignment(m_Signature,sig); *m_pos_Signature=m_Signature=sig; // Sync content reference back up. @@ -2098,14 +2095,14 @@ namespace opensaml { //IMPL_TYPED_CHILD(Signature); // Need customized setter. protected: - Signature* m_Signature; + xmlsignature::Signature* m_Signature; list::iterator m_pos_Signature; public: - Signature* getSignature() const { + xmlsignature::Signature* getSignature() const { return m_Signature; } - void setSignature(Signature* sig) { + void setSignature(xmlsignature::Signature* sig) { prepareForAssignment(m_Signature,sig); *m_pos_Signature=m_Signature=sig; // Sync content reference back up. @@ -2192,7 +2189,7 @@ namespace opensaml { EntityAttributesImpl(const EntityAttributesImpl& src) : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) { IMPL_CLONE_CHILDBAG_BEGIN; - IMPL_CLONE_TYPED_CHILD_IN_BAG(Attribute); + IMPL_CLONE_TYPED_FOREIGN_CHILD_IN_BAG(Attribute,saml2); IMPL_CLONE_TYPED_FOREIGN_CHILD_IN_BAG(Assertion,saml2); IMPL_CLONE_CHILDBAG_END; } -- 2.1.4