-/*
- * Copyright 2001-2009 Internet2
+/**
+ * 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.
*
- * 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
+ * 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.
*/
/**
#include <ctime>
#include <limits.h>
+#include <boost/lexical_cast.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
using namespace opensaml::saml1;
ConditionImpl(const ConditionImpl& src) : AbstractXMLObject(src), AnyElementImpl(src) {}
- IMPL_XMLOBJECT_CLONE(Condition);
+ IMPL_XMLOBJECT_CLONE_EX(Condition);
};
class SAML_DLLLOCAL AudienceRestrictionConditionImpl : public virtual AudienceRestrictionCondition,
}
}
- IMPL_XMLOBJECT_CLONE(AudienceRestrictionCondition);
- Condition* cloneCondition() const {
- return cloneAudienceRestrictionCondition();
- }
+ IMPL_XMLOBJECT_CLONE2(AudienceRestrictionCondition,Condition);
IMPL_TYPED_CHILDREN(Audience,m_children.end());
protected:
: AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src) {
}
- IMPL_XMLOBJECT_CLONE(DoNotCacheCondition);
- Condition* cloneCondition() const {
- return cloneDoNotCacheCondition();
- }
+ IMPL_XMLOBJECT_CLONE2(DoNotCacheCondition,Condition);
};
class SAML_DLLLOCAL ConditionsImpl : public virtual Conditions,
public AbstractXMLObjectMarshaller,
public AbstractXMLObjectUnmarshaller
{
+ void init() {
+ m_NotBefore=m_NotOnOrAfter=nullptr;
+ }
+
public:
virtual ~ConditionsImpl() {
delete m_NotBefore;
}
}
- void init() {
- m_NotBefore=m_NotOnOrAfter=NULL;
- }
-
IMPL_XMLOBJECT_CLONE(Conditions);
IMPL_DATETIME_ATTRIB(NotBefore,0);
IMPL_DATETIME_ATTRIB(NotOnOrAfter,SAMLTIME_MAX);
protected:
void marshallAttributes(DOMElement* domElement) const {
- MARSHALL_DATETIME_ATTRIB(NotBefore,NOTBEFORE,NULL);
- MARSHALL_DATETIME_ATTRIB(NotOnOrAfter,NOTONORAFTER,NULL);
+ MARSHALL_DATETIME_ATTRIB(NotBefore,NOTBEFORE,nullptr);
+ MARSHALL_DATETIME_ATTRIB(NotOnOrAfter,NOTONORAFTER,nullptr);
}
void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
}
void processAttribute(const DOMAttr* attribute) {
- PROC_DATETIME_ATTRIB(NotBefore,NOTBEFORE,NULL);
- PROC_DATETIME_ATTRIB(NotOnOrAfter,NOTONORAFTER,NULL);
+ PROC_DATETIME_ATTRIB(NotBefore,NOTBEFORE,nullptr);
+ PROC_DATETIME_ATTRIB(NotOnOrAfter,NOTONORAFTER,nullptr);
}
};
public AbstractXMLObjectMarshaller,
public AbstractXMLObjectUnmarshaller
{
+ void init() {
+ m_Format=m_NameQualifier=nullptr;
+ }
+
public:
virtual ~NameIdentifierImpl() {
XMLString::release(&m_Format);
setNameQualifier(src.getNameQualifier());
}
- void init() {
- m_Format=m_NameQualifier=NULL;
- }
-
IMPL_XMLOBJECT_CLONE(NameIdentifier);
IMPL_STRING_ATTRIB(Format);
IMPL_STRING_ATTRIB(NameQualifier);
protected:
void marshallAttributes(DOMElement* domElement) const {
- MARSHALL_STRING_ATTRIB(Format,FORMAT,NULL);
- MARSHALL_STRING_ATTRIB(NameQualifier,NAMEQUALIFIER,NULL);
+ MARSHALL_STRING_ATTRIB(Format,FORMAT,nullptr);
+ MARSHALL_STRING_ATTRIB(NameQualifier,NAMEQUALIFIER,nullptr);
}
void processAttribute(const DOMAttr* attribute) {
- PROC_STRING_ATTRIB(Format,FORMAT,NULL);
- PROC_STRING_ATTRIB(NameQualifier,NAMEQUALIFIER,NULL);
+ PROC_STRING_ATTRIB(Format,FORMAT,nullptr);
+ PROC_STRING_ATTRIB(NameQualifier,NAMEQUALIFIER,nullptr);
}
};
SubjectConfirmationDataImpl(const SubjectConfirmationDataImpl& src) : AbstractXMLObject(src), AnyElementImpl(src) {
}
- IMPL_XMLOBJECT_CLONE(SubjectConfirmationData);
+ IMPL_XMLOBJECT_CLONE_EX(SubjectConfirmationData);
};
class SAML_DLLLOCAL SubjectConfirmationImpl : public virtual SubjectConfirmation,
public AbstractXMLObjectMarshaller,
public AbstractXMLObjectUnmarshaller
{
+ void init() {
+ m_SubjectConfirmationData=nullptr;
+ m_KeyInfo=nullptr;
+ m_children.push_back(nullptr);
+ m_children.push_back(nullptr);
+ m_pos_SubjectConfirmationData=m_children.begin();
+ m_pos_KeyInfo=m_pos_SubjectConfirmationData;
+ ++m_pos_KeyInfo;
+ }
+
public:
virtual ~SubjectConfirmationImpl() {}
setSubjectConfirmationData(src.getSubjectConfirmationData()->clone());
if (src.getKeyInfo())
setKeyInfo(src.getKeyInfo()->cloneKeyInfo());
- VectorOf(ConfirmationMethod) v=getConfirmationMethods();
for (vector<ConfirmationMethod*>::const_iterator i=src.m_ConfirmationMethods.begin(); i!=src.m_ConfirmationMethods.end(); i++) {
if (*i) {
- v.push_back((*i)->cloneConfirmationMethod());
+ getConfirmationMethods().push_back((*i)->cloneConfirmationMethod());
}
}
}
- void init() {
- m_SubjectConfirmationData=NULL;
- m_KeyInfo=NULL;
- m_children.push_back(NULL);
- m_children.push_back(NULL);
- m_pos_SubjectConfirmationData=m_children.begin();
- m_pos_KeyInfo=m_pos_SubjectConfirmationData;
- ++m_pos_KeyInfo;
- }
-
IMPL_XMLOBJECT_CLONE(SubjectConfirmation);
IMPL_TYPED_CHILDREN(ConfirmationMethod,m_pos_SubjectConfirmationData);
IMPL_XMLOBJECT_CHILD(SubjectConfirmationData);
public AbstractXMLObjectMarshaller,
public AbstractXMLObjectUnmarshaller
{
+ void init() {
+ m_NameIdentifier=nullptr;
+ m_SubjectConfirmation=nullptr;
+ m_children.push_back(nullptr);
+ m_children.push_back(nullptr);
+ m_pos_NameIdentifier=m_children.begin();
+ m_pos_SubjectConfirmation=m_pos_NameIdentifier;
+ ++m_pos_SubjectConfirmation;
+ }
+
public:
virtual ~SubjectImpl() {}
setSubjectConfirmation(src.getSubjectConfirmation()->cloneSubjectConfirmation());
}
- void init() {
- m_NameIdentifier=NULL;
- m_SubjectConfirmation=NULL;
- m_children.push_back(NULL);
- m_children.push_back(NULL);
- m_pos_NameIdentifier=m_children.begin();
- m_pos_SubjectConfirmation=m_pos_NameIdentifier;
- ++m_pos_SubjectConfirmation;
- }
-
IMPL_XMLOBJECT_CLONE(Subject);
IMPL_TYPED_CHILD(NameIdentifier);
IMPL_TYPED_CHILD(SubjectConfirmation);
StatementImpl(const StatementImpl& src) : AbstractXMLObject(src), AnyElementImpl(src) {}
- IMPL_XMLOBJECT_CLONE(Statement);
+ IMPL_XMLOBJECT_CLONE_EX(Statement);
};
class SAML_DLLLOCAL SubjectStatementImpl : public virtual SubjectStatement,
public AbstractXMLObjectUnmarshaller
{
void init() {
- m_Subject=NULL;
- m_children.push_back(NULL);
+ m_Subject=nullptr;
+ m_children.push_back(nullptr);
m_pos_Subject=m_children.begin();
}
+
protected:
SubjectStatementImpl() {
init();
SubjectStatementImpl(const SubjectStatementImpl& src)
: AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) {
init();
+ }
+
+ void _clone(const SubjectStatementImpl& src) {
if (src.getSubject())
setSubject(src.getSubject()->cloneSubject());
}
+ Statement* cloneStatement() const {
+ return dynamic_cast<Statement*>(clone());
+ }
+
+ SubjectStatement* cloneSubjectStatement() const {
+ return dynamic_cast<SubjectStatement*>(clone());
+ }
+
IMPL_TYPED_CHILD(Subject);
protected:
public AbstractXMLObjectMarshaller,
public AbstractXMLObjectUnmarshaller
{
+ void init() {
+ m_IPAddress=m_DNSAddress=nullptr;
+ }
+
public:
virtual ~SubjectLocalityImpl() {
XMLString::release(&m_IPAddress);
setDNSAddress(src.getDNSAddress());
}
- void init() {
- m_IPAddress=m_DNSAddress=NULL;
- }
-
IMPL_XMLOBJECT_CLONE(SubjectLocality);
IMPL_STRING_ATTRIB(IPAddress);
IMPL_STRING_ATTRIB(DNSAddress);
protected:
void marshallAttributes(DOMElement* domElement) const {
- MARSHALL_STRING_ATTRIB(IPAddress,IPADDRESS,NULL);
- MARSHALL_STRING_ATTRIB(DNSAddress,DNSADDRESS,NULL);
+ MARSHALL_STRING_ATTRIB(IPAddress,IPADDRESS,nullptr);
+ MARSHALL_STRING_ATTRIB(DNSAddress,DNSADDRESS,nullptr);
}
void processAttribute(const DOMAttr* attribute) {
- PROC_STRING_ATTRIB(IPAddress,IPADDRESS,NULL);
- PROC_STRING_ATTRIB(DNSAddress,DNSADDRESS,NULL);
+ PROC_STRING_ATTRIB(IPAddress,IPADDRESS,nullptr);
+ PROC_STRING_ATTRIB(DNSAddress,DNSADDRESS,nullptr);
}
};
public AbstractXMLObjectMarshaller,
public AbstractXMLObjectUnmarshaller
{
+ void init() {
+ m_AuthorityKind=nullptr;
+ m_Location=m_Binding=nullptr;
+ }
+
public:
virtual ~AuthorityBindingImpl() {
delete m_AuthorityKind;
setBinding(src.getBinding());
}
- void init() {
- m_AuthorityKind=NULL;
- m_Location=m_Binding=NULL;
- }
-
IMPL_XMLOBJECT_CLONE(AuthorityBinding);
IMPL_XMLOBJECT_ATTRIB(AuthorityKind,xmltooling::QName);
IMPL_STRING_ATTRIB(Location);
protected:
void marshallAttributes(DOMElement* domElement) const {
- MARSHALL_QNAME_ATTRIB(AuthorityKind,AUTHORITYKIND,NULL);
- MARSHALL_STRING_ATTRIB(Location,LOCATION,NULL);
- MARSHALL_STRING_ATTRIB(Binding,BINDING,NULL);
+ MARSHALL_QNAME_ATTRIB(AuthorityKind,AUTHORITYKIND,nullptr);
+ MARSHALL_STRING_ATTRIB(Location,LOCATION,nullptr);
+ MARSHALL_STRING_ATTRIB(Binding,BINDING,nullptr);
}
void processAttribute(const DOMAttr* attribute) {
- PROC_QNAME_ATTRIB(AuthorityKind,AUTHORITYKIND,NULL);
- PROC_STRING_ATTRIB(Location,LOCATION,NULL);
- PROC_STRING_ATTRIB(Binding,BINDING,NULL);
+ PROC_QNAME_ATTRIB(AuthorityKind,AUTHORITYKIND,nullptr);
+ PROC_STRING_ATTRIB(Location,LOCATION,nullptr);
+ PROC_STRING_ATTRIB(Binding,BINDING,nullptr);
}
};
class SAML_DLLLOCAL AuthenticationStatementImpl : public virtual AuthenticationStatement, public SubjectStatementImpl
{
+ void init() {
+ m_AuthenticationMethod=nullptr;
+ m_AuthenticationInstant=nullptr;
+ m_SubjectLocality=nullptr;
+ m_children.push_back(nullptr);
+ m_pos_SubjectLocality=m_pos_Subject;
+ ++m_pos_SubjectLocality;
+ }
+
public:
virtual ~AuthenticationStatementImpl() {
XMLString::release(&m_AuthenticationMethod);
AuthenticationStatementImpl(const AuthenticationStatementImpl& src) : AbstractXMLObject(src), SubjectStatementImpl(src) {
init();
+ }
+
+ void _clone(const AuthenticationStatementImpl& src) {
+ SubjectStatementImpl::_clone(src);
setAuthenticationMethod(src.getAuthenticationMethod());
setAuthenticationInstant(src.getAuthenticationInstant());
if (src.getSubjectLocality())
setSubjectLocality(src.getSubjectLocality()->cloneSubjectLocality());
- VectorOf(AuthorityBinding) v=getAuthorityBindings();
for (vector<AuthorityBinding*>::const_iterator i=src.m_AuthorityBindings.begin(); i!=src.m_AuthorityBindings.end(); i++) {
if (*i) {
- v.push_back((*i)->cloneAuthorityBinding());
+ getAuthorityBindings().push_back((*i)->cloneAuthorityBinding());
}
}
}
- void init() {
- m_AuthenticationMethod=NULL;
- m_AuthenticationInstant=NULL;
- m_SubjectLocality=NULL;
- m_children.push_back(NULL);
- m_pos_SubjectLocality=m_pos_Subject;
- ++m_pos_SubjectLocality;
- }
-
- IMPL_XMLOBJECT_CLONE(AuthenticationStatement);
- SubjectStatement* cloneSubjectStatement() const {
- return cloneAuthenticationStatement();
- }
- Statement* cloneStatement() const {
- return cloneAuthenticationStatement();
- }
+ IMPL_XMLOBJECT_CLONE_EX(AuthenticationStatement);
IMPL_STRING_ATTRIB(AuthenticationMethod);
IMPL_DATETIME_ATTRIB(AuthenticationInstant,0);
IMPL_TYPED_CHILD(SubjectLocality);
protected:
void marshallAttributes(DOMElement* domElement) const {
- MARSHALL_STRING_ATTRIB(AuthenticationMethod,AUTHENTICATIONMETHOD,NULL);
- MARSHALL_DATETIME_ATTRIB(AuthenticationInstant,AUTHENTICATIONINSTANT,NULL);
+ MARSHALL_STRING_ATTRIB(AuthenticationMethod,AUTHENTICATIONMETHOD,nullptr);
+ MARSHALL_DATETIME_ATTRIB(AuthenticationInstant,AUTHENTICATIONINSTANT,nullptr);
SubjectStatementImpl::marshallAttributes(domElement);
}
}
void processAttribute(const DOMAttr* attribute) {
- PROC_STRING_ATTRIB(AuthenticationMethod,AUTHENTICATIONMETHOD,NULL);
- PROC_DATETIME_ATTRIB(AuthenticationInstant,AUTHENTICATIONINSTANT,NULL);
+ PROC_STRING_ATTRIB(AuthenticationMethod,AUTHENTICATIONMETHOD,nullptr);
+ PROC_DATETIME_ATTRIB(AuthenticationInstant,AUTHENTICATIONINSTANT,nullptr);
SubjectStatementImpl::processAttribute(attribute);
}
};
}
ActionImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType)
- : AbstractXMLObject(nsURI, localName, prefix, schemaType), m_Namespace(NULL) {
+ : AbstractXMLObject(nsURI, localName, prefix, schemaType), m_Namespace(nullptr) {
}
- ActionImpl(const ActionImpl& src) : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src) {
+ ActionImpl(const ActionImpl& src)
+ : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src), m_Namespace(nullptr) {
setNamespace(src.getNamespace());
}
protected:
void marshallAttributes(DOMElement* domElement) const {
- MARSHALL_STRING_ATTRIB(Namespace,NAMESPACE,NULL);
+ MARSHALL_STRING_ATTRIB(Namespace,NAMESPACE,nullptr);
}
void processAttribute(const DOMAttr* attribute) {
- PROC_STRING_ATTRIB(Namespace,NAMESPACE,NULL);
+ PROC_STRING_ATTRIB(Namespace,NAMESPACE,nullptr);
}
};
class SAML_DLLLOCAL AuthorizationDecisionStatementImpl
: public virtual AuthorizationDecisionStatement, public SubjectStatementImpl
{
+ void init() {
+ m_Resource=nullptr;
+ m_Decision=nullptr;
+ m_Evidence=nullptr;
+ m_children.push_back(nullptr);
+ m_pos_Evidence=m_pos_Subject;
+ ++m_pos_Evidence;
+ }
+
public:
virtual ~AuthorizationDecisionStatementImpl() {
XMLString::release(&m_Resource);
AuthorizationDecisionStatementImpl(const AuthorizationDecisionStatementImpl& src)
: AbstractXMLObject(src), SubjectStatementImpl(src) {
init();
+ }
+
+ void _clone(const AuthorizationDecisionStatementImpl& src) {
+ SubjectStatementImpl::_clone(src);
setResource(src.getResource());
setDecision(src.getDecision());
if (src.getEvidence())
setEvidence(src.getEvidence()->cloneEvidence());
- VectorOf(Action) v=getActions();
for (vector<Action*>::const_iterator i=src.m_Actions.begin(); i!=src.m_Actions.end(); i++) {
if (*i) {
- v.push_back((*i)->cloneAction());
+ getActions().push_back((*i)->cloneAction());
}
}
}
- void init() {
- m_Resource=NULL;
- m_Decision=NULL;
- m_Evidence=NULL;
- m_children.push_back(NULL);
- m_pos_Evidence=m_pos_Subject;
- ++m_pos_Evidence;
- }
-
- IMPL_XMLOBJECT_CLONE(AuthorizationDecisionStatement);
- SubjectStatement* cloneSubjectStatement() const {
- return cloneAuthorizationDecisionStatement();
- }
- Statement* cloneStatement() const {
- return cloneAuthorizationDecisionStatement();
- }
+ IMPL_XMLOBJECT_CLONE_EX(AuthorizationDecisionStatement);
IMPL_STRING_ATTRIB(Resource);
IMPL_STRING_ATTRIB(Decision);
IMPL_TYPED_CHILD(Evidence);
protected:
void marshallAttributes(DOMElement* domElement) const {
- MARSHALL_STRING_ATTRIB(Resource,RESOURCE,NULL);
- MARSHALL_STRING_ATTRIB(Decision,DECISION,NULL);
+ MARSHALL_STRING_ATTRIB(Resource,RESOURCE,nullptr);
+ MARSHALL_STRING_ATTRIB(Decision,DECISION,nullptr);
SubjectStatementImpl::marshallAttributes(domElement);
}
}
void processAttribute(const DOMAttr* attribute) {
- PROC_STRING_ATTRIB(Resource,RESOURCE,NULL);
- PROC_STRING_ATTRIB(Decision,DECISION,NULL);
+ PROC_STRING_ATTRIB(Resource,RESOURCE,nullptr);
+ PROC_STRING_ATTRIB(Decision,DECISION,nullptr);
SubjectStatementImpl::processAttribute(attribute);
}
};
public AbstractXMLObjectMarshaller,
public AbstractXMLObjectUnmarshaller
{
+ void init() {
+ m_AttributeName=m_AttributeNamespace=nullptr;
+ }
+
public:
virtual ~AttributeDesignatorImpl() {
XMLString::release(&m_AttributeName);
setAttributeNamespace(src.getAttributeNamespace());
}
- void init() {
- m_AttributeName=m_AttributeNamespace=NULL;
- }
-
IMPL_XMLOBJECT_CLONE(AttributeDesignator);
IMPL_STRING_ATTRIB(AttributeName);
IMPL_STRING_ATTRIB(AttributeNamespace);
protected:
void marshallAttributes(DOMElement* domElement) const {
- MARSHALL_STRING_ATTRIB(AttributeName,ATTRIBUTENAME,NULL);
- MARSHALL_STRING_ATTRIB(AttributeNamespace,ATTRIBUTENAMESPACE,NULL);
+ MARSHALL_STRING_ATTRIB(AttributeName,ATTRIBUTENAME,nullptr);
+ MARSHALL_STRING_ATTRIB(AttributeNamespace,ATTRIBUTENAMESPACE,nullptr);
}
void processAttribute(const DOMAttr* attribute) {
- PROC_STRING_ATTRIB(AttributeName,ATTRIBUTENAME,NULL);
- PROC_STRING_ATTRIB(AttributeNamespace,ATTRIBUTENAMESPACE,NULL);
+ PROC_STRING_ATTRIB(AttributeName,ATTRIBUTENAME,nullptr);
+ PROC_STRING_ATTRIB(AttributeNamespace,ATTRIBUTENAMESPACE,nullptr);
}
};
public AbstractXMLObjectMarshaller,
public AbstractXMLObjectUnmarshaller
{
+ void init() {
+ m_AttributeName=m_AttributeNamespace=nullptr;
+ }
public:
virtual ~AttributeImpl() {
XMLString::release(&m_AttributeName);
init();
setAttributeName(src.getAttributeName());
setAttributeNamespace(src.getAttributeNamespace());
- VectorOf(XMLObject) v=getAttributeValues();
for (vector<XMLObject*>::const_iterator i=src.m_AttributeValues.begin(); i!=src.m_AttributeValues.end(); i++) {
if (*i) {
- v.push_back((*i)->clone());
+ getAttributeValues().push_back((*i)->clone());
}
}
}
- void init() {
- m_AttributeName=m_AttributeNamespace=NULL;
- }
-
- IMPL_XMLOBJECT_CLONE(Attribute);
- AttributeDesignator* cloneAttributeDesignator() const {
- return cloneAttribute();
- }
+ IMPL_XMLOBJECT_CLONE2(Attribute,AttributeDesignator);
IMPL_STRING_ATTRIB(AttributeName);
IMPL_STRING_ATTRIB(AttributeNamespace);
IMPL_XMLOBJECT_CHILDREN(AttributeValue,m_children.end());
protected:
void marshallAttributes(DOMElement* domElement) const {
- MARSHALL_STRING_ATTRIB(AttributeName,ATTRIBUTENAME,NULL);
- MARSHALL_STRING_ATTRIB(AttributeNamespace,ATTRIBUTENAMESPACE,NULL);
+ MARSHALL_STRING_ATTRIB(AttributeName,ATTRIBUTENAME,nullptr);
+ MARSHALL_STRING_ATTRIB(AttributeNamespace,ATTRIBUTENAMESPACE,nullptr);
}
void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
}
void processAttribute(const DOMAttr* attribute) {
- PROC_STRING_ATTRIB(AttributeName,ATTRIBUTENAME,NULL);
- PROC_STRING_ATTRIB(AttributeNamespace,ATTRIBUTENAMESPACE,NULL);
+ PROC_STRING_ATTRIB(AttributeName,ATTRIBUTENAME,nullptr);
+ PROC_STRING_ATTRIB(AttributeNamespace,ATTRIBUTENAMESPACE,nullptr);
}
};
AttributeValueImpl(const AttributeValueImpl& src) : AbstractXMLObject(src), AnyElementImpl(src) {}
- IMPL_XMLOBJECT_CLONE(AttributeValue);
+ IMPL_XMLOBJECT_CLONE_EX(AttributeValue);
};
class SAML_DLLLOCAL AttributeStatementImpl : public virtual AttributeStatement, public SubjectStatementImpl
: AbstractXMLObject(nsURI, localName, prefix, schemaType) {
}
- AttributeStatementImpl(const AttributeStatementImpl& src)
- : AbstractXMLObject(src), SubjectStatementImpl(src) {
- VectorOf(Attribute) v=getAttributes();
+ AttributeStatementImpl(const AttributeStatementImpl& src) : AbstractXMLObject(src), SubjectStatementImpl(src) {
+ }
+
+ void _clone(const AttributeStatementImpl& src) {
+ SubjectStatementImpl::_clone(src);
for (vector<Attribute*>::const_iterator i=src.m_Attributes.begin(); i!=src.m_Attributes.end(); i++) {
if (*i) {
- v.push_back((*i)->cloneAttribute());
+ getAttributes().push_back((*i)->cloneAttribute());
}
}
}
- IMPL_XMLOBJECT_CLONE(AttributeStatement);
- SubjectStatement* cloneSubjectStatement() const {
- return cloneAttributeStatement();
- }
- Statement* cloneStatement() const {
- return cloneAttributeStatement();
- }
+ IMPL_XMLOBJECT_CLONE_EX(AttributeStatement);
IMPL_TYPED_CHILDREN(Attribute, m_children.end());
protected:
continue;
}
- getUnknownXMLObjects().push_back((*i)->clone());
+ if (*i) {
+ getUnknownXMLObjects().push_back((*i)->clone());
+ }
}
}
}
public AbstractXMLObjectUnmarshaller
{
void init() {
- m_MinorVersion=NULL;
- m_AssertionID=NULL;
- m_Issuer=NULL;
- m_IssueInstant=NULL;
- m_children.push_back(NULL);
- m_children.push_back(NULL);
- m_children.push_back(NULL);
- m_Conditions=NULL;
- m_Advice=NULL;
- m_Signature=NULL;
+ m_MinorVersion=nullptr;
+ m_AssertionID=nullptr;
+ m_Issuer=nullptr;
+ m_IssueInstant=nullptr;
+ m_children.push_back(nullptr);
+ m_children.push_back(nullptr);
+ m_children.push_back(nullptr);
+ m_Conditions=nullptr;
+ m_Advice=nullptr;
+ m_Signature=nullptr;
m_pos_Conditions=m_children.begin();
m_pos_Advice=m_pos_Conditions;
++m_pos_Advice;
m_pos_Signature=m_pos_Advice;
++m_pos_Signature;
}
+
public:
virtual ~AssertionImpl() {
XMLString::release(&m_MinorVersion);
IMPL_STRING_ATTRIB(AssertionID); // have to special-case getXMLID
const XMLCh* getXMLID() const {
pair<bool,int> v = getMinorVersion();
- return (!v.first || v.second > 0) ? m_AssertionID : NULL;
+ return (!v.first || v.second > 0) ? m_AssertionID : nullptr;
}
const XMLCh* getID() const {
return getAssertionID();
}
+ void releaseDOM() const {
+ if (getDOM())
+ getDOM()->removeAttributeNS(nullptr, ASSERTIONID_ATTRIB_NAME);
+ AbstractDOMCachingXMLObject::releaseDOM();
+ }
IMPL_STRING_ATTRIB(Issuer);
IMPL_DATETIME_ATTRIB(IssueInstant,0);
IMPL_TYPED_CHILD(Conditions);
IMPL_TYPED_CHILDREN(AuthorizationDecisionStatement, m_pos_Signature);
protected:
+ void prepareForMarshalling() const {
+ if (m_Signature)
+ declareNonVisibleNamespaces();
+ }
+
void marshallAttributes(DOMElement* domElement) const {
static const XMLCh MAJORVERSION[] = UNICODE_LITERAL_12(M,a,j,o,r,V,e,r,s,i,o,n);
- domElement->setAttributeNS(NULL,MAJORVERSION,XML_ONE);
+ domElement->setAttributeNS(nullptr,MAJORVERSION,XML_ONE);
if (!m_MinorVersion)
const_cast<AssertionImpl*>(this)->m_MinorVersion=XMLString::replicate(XML_ONE);
- MARSHALL_INTEGER_ATTRIB(MinorVersion,MINORVERSION,NULL);
+ MARSHALL_INTEGER_ATTRIB(MinorVersion,MINORVERSION,nullptr);
if (!m_AssertionID)
const_cast<AssertionImpl*>(this)->m_AssertionID=SAMLConfig::getConfig().generateIdentifier();
- domElement->setAttributeNS(NULL, ASSERTIONID_ATTRIB_NAME, m_AssertionID);
+ domElement->setAttributeNS(nullptr, ASSERTIONID_ATTRIB_NAME, m_AssertionID);
if (*m_MinorVersion!=chDigit_0) {
#ifdef XMLTOOLING_XERCESC_BOOLSETIDATTRIBUTE
- domElement->setIdAttributeNS(NULL, ASSERTIONID_ATTRIB_NAME, true);
+ domElement->setIdAttributeNS(nullptr, ASSERTIONID_ATTRIB_NAME, true);
#else
- domElement->setIdAttributeNS(NULL, ASSERTIONID_ATTRIB_NAME);
+ domElement->setIdAttributeNS(nullptr, ASSERTIONID_ATTRIB_NAME);
#endif
}
- MARSHALL_STRING_ATTRIB(Issuer,ISSUER,NULL);
+ MARSHALL_STRING_ATTRIB(Issuer,ISSUER,nullptr);
if (!m_IssueInstant) {
- const_cast<AssertionImpl*>(this)->m_IssueInstantEpoch=time(NULL);
+ const_cast<AssertionImpl*>(this)->m_IssueInstantEpoch=time(nullptr);
const_cast<AssertionImpl*>(this)->m_IssueInstant=new DateTime(m_IssueInstantEpoch);
}
- MARSHALL_DATETIME_ATTRIB(IssueInstant,ISSUEINSTANT,NULL);
+ MARSHALL_DATETIME_ATTRIB(IssueInstant,ISSUEINSTANT,nullptr);
}
void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
AbstractXMLObjectUnmarshaller::unmarshallAttributes(domElement);
if (m_AssertionID && (!m_MinorVersion || *m_MinorVersion!=chDigit_0)) {
#ifdef XMLTOOLING_XERCESC_BOOLSETIDATTRIBUTE
- const_cast<DOMElement*>(domElement)->setIdAttributeNS(NULL, ASSERTIONID_ATTRIB_NAME, true);
+ const_cast<DOMElement*>(domElement)->setIdAttributeNS(nullptr, ASSERTIONID_ATTRIB_NAME, true);
#else
- const_cast<DOMElement*>(domElement)->setIdAttributeNS(NULL, ASSERTIONID_ATTRIB_NAME);
+ const_cast<DOMElement*>(domElement)->setIdAttributeNS(nullptr, ASSERTIONID_ATTRIB_NAME);
#endif
}
}
void processAttribute(const DOMAttr* attribute) {
static const XMLCh MAJORVERSION[] = UNICODE_LITERAL_12(M,a,j,o,r,V,e,r,s,i,o,n);
- if (XMLHelper::isNodeNamed(attribute,NULL,MAJORVERSION)) {
+ if (XMLHelper::isNodeNamed(attribute,nullptr,MAJORVERSION)) {
if (!XMLString::equals(attribute->getValue(),XML_ONE))
throw UnmarshallingException("Assertion has invalid major version.");
}
- PROC_INTEGER_ATTRIB(MinorVersion,MINORVERSION,NULL);
- PROC_STRING_ATTRIB(AssertionID,ASSERTIONID,NULL);
- PROC_STRING_ATTRIB(Issuer,ISSUER,NULL);
- PROC_DATETIME_ATTRIB(IssueInstant,ISSUEINSTANT,NULL);
+ PROC_INTEGER_ATTRIB(MinorVersion,MINORVERSION,nullptr);
+ PROC_STRING_ATTRIB(AssertionID,ASSERTIONID,nullptr);
+ PROC_STRING_ATTRIB(Issuer,ISSUER,nullptr);
+ PROC_DATETIME_ATTRIB(IssueInstant,ISSUEINSTANT,nullptr);
}
};
projects / shibboleth / cpp-opensaml.git / blobdiff