-/*
- * The Shibboleth License, Version 1.
- * Copyright (c) 2002
- * University Corporation for Advanced Internet Development, Inc.
- * All rights reserved
+/*
+ * Copyright 2001-2005 Internet2
*
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution, if any, must include
- * the following acknowledgment: "This product includes software developed by
- * the University Corporation for Advanced Internet Development
- * <http://www.ucaid.edu>Internet2 Project. Alternately, this acknowledegement
- * may appear in the software itself, if and wherever such third-party
- * acknowledgments normally appear.
- *
- * Neither the name of Shibboleth nor the names of its contributors, nor
- * Internet2, nor the University Corporation for Advanced Internet Development,
- * Inc., nor UCAID may be used to endorse or promote products derived from this
- * software without specific prior written permission. For written permission,
- * please contact shibboleth@shibboleth.org
- *
- * Products derived from this software may not be called Shibboleth, Internet2,
- * UCAID, or the University Corporation for Advanced Internet Development, nor
- * may Shibboleth appear in their name, without prior written permission of the
- * University Corporation for Advanced Internet Development.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND WITH ALL FAULTS. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE, AND NON-INFRINGEMENT ARE DISCLAIMED AND THE ENTIRE RISK
- * OF SATISFACTORY QUALITY, PERFORMANCE, ACCURACY, AND EFFORT IS WITH LICENSEE.
- * IN NO EVENT SHALL THE COPYRIGHT OWNER, CONTRIBUTORS OR THE UNIVERSITY
- * CORPORATION FOR ADVANCED INTERNET DEVELOPMENT, INC. BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 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
+ *
+ * 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.
*/
/* XMLCredentials.cpp - a credentials implementation that uses an XML file
const ICredResolver* lookup(const char* id) const;
protected:
- virtual ReloadableXMLFileImpl* newImplementation(const char* pathname) const;
- virtual ReloadableXMLFileImpl* newImplementation(const DOMElement* e) const;
+ virtual ReloadableXMLFileImpl* newImplementation(const char* pathname, bool first=true) const;
+ virtual ReloadableXMLFileImpl* newImplementation(const DOMElement* e, bool first=true) const;
};
}
-extern "C" ICredentials* XMLCredentialsFactory(const DOMElement* e)
+IPlugIn* XMLCredentialsFactory(const DOMElement* e)
{
- XMLCredentials* creds=new XMLCredentials(e);
- try {
- creds->getImplementation();
- }
- catch (...) {
- delete creds;
- throw;
- }
- return creds;
+ auto_ptr<XMLCredentials> creds(new XMLCredentials(e));
+ creds->getImplementation();
+ return creds.release();
}
-ReloadableXMLFileImpl* XMLCredentials::newImplementation(const char* pathname) const
+ReloadableXMLFileImpl* XMLCredentials::newImplementation(const char* pathname, bool first) const
{
return new XMLCredentialsImpl(pathname);
}
-ReloadableXMLFileImpl* XMLCredentials::newImplementation(const DOMElement* e) const
+ReloadableXMLFileImpl* XMLCredentials::newImplementation(const DOMElement* e, bool first) const
{
return new XMLCredentialsImpl(e);
}
void XMLCredentialsImpl::init()
{
- NDC ndc("XMLCredentialsImpl");
- Category& log=Category::getInstance(XMLPROVIDERS_LOGCAT".XMLCredentialsImpl");
+#ifdef _DEBUG
+ saml::NDC ndc("init");
+#endif
+ Category& log=Category::getInstance(XMLPROVIDERS_LOGCAT".Credentials");
try {
if (!saml::XML::isElementNamed(m_root,::XML::CREDS_NS,SHIB_L(Credentials))) {
if (!cr_type.empty()) {
try {
- ICredResolver* cr=ShibConfig::getConfig().newCredResolver(cr_type.c_str(),child);
- if (!cr)
- throw CredentialException("unknown or unimplemented type of credential resolver");
- m_resolverMap[id.get()]=cr;
+ IPlugIn* plugin=SAMLConfig::getConfig().getPlugMgr().newPlugin(cr_type.c_str(),child);
+ ICredResolver* cr=dynamic_cast<ICredResolver*>(plugin);
+ if (cr)
+ m_resolverMap[id.get()]=cr;
+ else {
+ log.error("plugin was not a credential resolver");
+ throw UnsupportedExtensionException("plugin was not a credential resolver");
+ }
}
catch (SAMLException& e) {
log.error("failed to instantiate credential resolver (%s): %s", id.get(), e.what());
- throw CredentialException("Failed to instantiate credential resolver");
+ throw;
}
}
else {
}
catch (SAMLException& e) {
log.errorStream() << "Error while parsing creds configuration: " << e.what() << CategoryStream::ENDLINE;
- for (resolvermap_t::iterator j=m_resolverMap.begin(); j!=m_resolverMap.end(); j++)
- delete j->second;
+ this->~XMLCredentialsImpl();
throw;
}
+#ifndef _DEBUG
catch (...) {
log.error("Unexpected error while parsing creds configuration");
- for (resolvermap_t::iterator j=m_resolverMap.begin(); j!=m_resolverMap.end(); j++)
- delete j->second;
+ this->~XMLCredentialsImpl();
throw;
}
+#endif
}
XMLCredentialsImpl::~XMLCredentialsImpl()
const ICredResolver* XMLCredentials::lookup(const char* id) const
{
- XMLCredentialsImpl* impl=dynamic_cast<XMLCredentialsImpl*>(getImplementation());
- XMLCredentialsImpl::resolvermap_t::const_iterator i=impl->m_resolverMap.find(id);
- if (i!=impl->m_resolverMap.end())
- return i->second;
+ if (id) {
+ XMLCredentialsImpl* impl=dynamic_cast<XMLCredentialsImpl*>(getImplementation());
+ XMLCredentialsImpl::resolvermap_t::const_iterator i=impl->m_resolverMap.find(id);
+ if (i!=impl->m_resolverMap.end())
+ return i->second;
+ }
return NULL;
}