-/*
- * Copyright 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.
*/
/**
using namespace opensaml;
using namespace xmlsignature;
using namespace xmltooling;
+using namespace boost;
using namespace std;
namespace shibsp {
{
public:
KeyInfoAttributeDecoder(const DOMElement* e);
- ~KeyInfoAttributeDecoder() {
- delete m_keyInfoResolver;
+ ~KeyInfoAttributeDecoder() {}
+
+ // deprecated method
+ Attribute* decode(
+ const vector<string>& ids, const XMLObject* xmlObject, const char* assertingParty=nullptr, const char* relyingParty=nullptr
+ ) const {
+ return decode(nullptr, ids, xmlObject, assertingParty, relyingParty);
}
Attribute* decode(
- const vector<string>& ids, const XMLObject* xmlObject, const char* assertingParty=NULL, const char* relyingParty=NULL
+ const GenericRequest*, const vector<string>&, const XMLObject*, const char* assertingParty=nullptr, const char* relyingParty=nullptr
) const;
private:
void extract(const KeyInfo* k, vector<string>& dest) const {
- auto_ptr<Credential> cred (getKeyInfoResolver()->resolve(k, Credential::RESOLVE_KEYS));
- if (cred.get()) {
- const char* alg = m_hashAlg.get();
- if (!alg || !*alg)
- alg = "SHA1";
+ scoped_ptr<Credential> cred(getKeyInfoResolver()->resolve(k, Credential::RESOLVE_KEYS));
+ if (cred) {
dest.push_back(string());
- dest.back() = SecurityHelper::getDEREncoding(*cred.get(), m_hash ? alg : NULL);
+ dest.back() = SecurityHelper::getDEREncoding(*cred, m_hash ? m_keyInfoHashAlg.c_str() : nullptr);
if (dest.back().empty())
dest.pop_back();
}
}
const KeyInfoResolver* getKeyInfoResolver() const {
- return m_keyInfoResolver ? m_keyInfoResolver : XMLToolingConfig::getConfig().getKeyInfoResolver();
+ return m_keyInfoResolver ? m_keyInfoResolver.get() : XMLToolingConfig::getConfig().getKeyInfoResolver();
}
bool m_hash;
- auto_ptr_char m_hashAlg;
- KeyInfoResolver* m_keyInfoResolver;
+ string m_keyInfoHashAlg;
+ scoped_ptr<KeyInfoResolver> m_keyInfoResolver;
};
AttributeDecoder* SHIBSP_DLLLOCAL KeyInfoAttributeDecoderFactory(const DOMElement* const & e)
static const XMLCh _KeyInfoResolver[] = UNICODE_LITERAL_15(K,e,y,I,n,f,o,R,e,s,o,l,v,e,r);
static const XMLCh _hash[] = UNICODE_LITERAL_4(h,a,s,h);
- static const XMLCh _hashAlg[] = UNICODE_LITERAL_7(h,a,s,h,A,l,g);
+ static const XMLCh keyInfoHashAlg[] = UNICODE_LITERAL_14(k,e,y,I,n,f,o,H,a,s,h,A,l,g);
static const XMLCh _type[] = UNICODE_LITERAL_4(t,y,p,e);
};
KeyInfoAttributeDecoder::KeyInfoAttributeDecoder(const DOMElement* e)
- : AttributeDecoder(e), m_hash(false), m_hashAlg(e ? e->getAttributeNS(NULL, _hashAlg) : NULL), m_keyInfoResolver(NULL) {
- const XMLCh* flag = e ? e->getAttributeNS(NULL, _hash) : NULL;
- m_hash = (flag && (*flag == chLatin_t || *flag == chDigit_1));
- e = e ? XMLHelper::getFirstChildElement(e,_KeyInfoResolver) : NULL;
+ : AttributeDecoder(e),
+ m_hash(XMLHelper::getAttrBool(e, false, _hash)),
+ m_keyInfoHashAlg(XMLHelper::getAttrString(e, "SHA1", keyInfoHashAlg)) {
+ e = XMLHelper::getFirstChildElement(e, _KeyInfoResolver);
if (e) {
- auto_ptr_char t(e->getAttributeNS(NULL, _type));
- if (t.get() && *t.get())
- m_keyInfoResolver = XMLToolingConfig::getConfig().KeyInfoResolverManager.newPlugin(t.get(), e);
- else
+ string t(XMLHelper::getAttrString(e, nullptr, _type));
+ if (t.empty())
throw UnknownExtensionException("<KeyInfoResolver> element found with no type attribute");
+ m_keyInfoResolver.reset(XMLToolingConfig::getConfig().KeyInfoResolverManager.newPlugin(t.c_str(), e));
}
}
Attribute* KeyInfoAttributeDecoder::decode(
- const vector<string>& ids, const XMLObject* xmlObject, const char* assertingParty, const char* relyingParty
+ const GenericRequest*, const vector<string>& ids, const XMLObject* xmlObject, const char* assertingParty, const char* relyingParty
) const
{
- Category& log = Category::getInstance(SHIBSP_LOGCAT".AttributeDecoder.KeyInfo");
+ Category& log = Category::getInstance(SHIBSP_LOGCAT ".AttributeDecoder.KeyInfo");
if (!xmlObject || !XMLString::equals(saml1::Attribute::LOCAL_NAME, xmlObject->getElementQName().getLocalPart())) {
log.warn("XMLObject type not recognized by KeyInfoAttributeDecoder, no values returned");
- return NULL;
+ return nullptr;
}
auto_ptr<SimpleAttribute> attr(new SimpleAttribute(ids));
}
else {
log.warn("XMLObject type not recognized by KeyInfoAttributeDecoder, no values returned");
- return NULL;
+ return nullptr;
}
}
- for (; v!=stop; ++v) {
+ for (; v != stop; ++v) {
const KeyInfo* k = dynamic_cast<const KeyInfo*>(*v);
if (k)
extract(k, dest);
else if ((*v)->hasChildren()) {
const list<XMLObject*>& children = (*v)->getOrderedChildren();
- for (list<XMLObject*>::const_iterator vv = children.begin(); vv!=children.end(); ++vv) {
+ for (list<XMLObject*>::const_iterator vv = children.begin(); vv != children.end(); ++vv) {
if (k=dynamic_cast<const KeyInfo*>(*vv))
extract(k, dest);
else
}
}
- return dest.empty() ? NULL : _decode(attr.release());
+ return dest.empty() ? nullptr : _decode(attr.release());
}
projects / shibboleth / cpp-sp.git / blobdiff