-/*
- * Copyright 2001-2009 Internet2
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
*
- * 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.
+ * 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.
*/
/**
#include <saml/saml2/core/Assertions.h>
#include <saml/saml2/metadata/Metadata.h>
#include <saml/saml2/metadata/MetadataProvider.h>
-#include <xercesc/util/XMLUniDefs.hpp>
#include <xmltooling/XMLToolingConfig.h>
#include <xmltooling/util/ParserPool.h>
#include <xmltooling/util/XMLHelper.h>
+#include <xercesc/util/XMLUniDefs.hpp>
+#include <boost/iterator/indirect_iterator.hpp>
using namespace shibsp;
using namespace opensaml::saml2md;
using namespace xmltooling::logging;
using namespace xmltooling;
using namespace xercesc;
+using namespace boost;
using namespace std;
#if defined (_MSC_VER)
{
public:
ResolverTest(const DOMElement* e, const char* appId)
- : shibsp::AssertionConsumerService(e, appId, Category::getInstance(SHIBSP_LOGCAT".Utilities.ResolverTest")) {
+ : shibsp::AssertionConsumerService(e, appId, Category::getInstance(SHIBSP_LOGCAT ".Utilities.ResolverTest")) {
}
virtual ~ResolverTest() {}
int main(int argc,char* argv[])
{
- char* a_param=NULL;
- char* n_param=NULL;
- char* f_param=NULL;
- char* i_param=NULL;
- char* prot = NULL;
- const XMLCh* protocol = NULL;
+ char* a_param=nullptr;
+ char* n_param=nullptr;
+ char* f_param=nullptr;
+ char* i_param=nullptr;
+ char* prot = nullptr;
+ const XMLCh* protocol = nullptr;
for (int i=1; i<argc; i++) {
if (!strcmp(argv[i],"-n") && i+1<argc)
ServiceProvider* sp=conf.getServiceProvider();
sp->lock();
- Category& log = Category::getInstance(SHIBSP_LOGCAT".Utility.ResolverTest");
+ Category& log = Category::getInstance(SHIBSP_LOGCAT ".Utility.ResolverTest");
const Application* app = sp->getApplication(a_param);
if (!app) {
}
try {
- ResolutionContext* ctx;
+ scoped_ptr<ResolutionContext> ctx;
if (n_param) {
auto_ptr_XMLCh issuer(i_param);
auto_ptr_XMLCh name(n_param);
auto_ptr_XMLCh format(f_param);
- MetadataProvider* m=app->getMetadataProvider();
- xmltooling::Locker mlocker(m);
+ MetadataProvider* m = app->getMetadataProvider();
+ Locker mlocker(m);
MetadataProviderCriteria mc(*app, i_param, &IDPSSODescriptor::ELEMENT_QNAME, protocol);
- pair<const EntityDescriptor*,const RoleDescriptor*> site=m->getEntityDescriptor(mc);
+ pair<const EntityDescriptor*,const RoleDescriptor*> site = m->getEntityDescriptor(mc);
if (!site.first)
throw MetadataException("Unable to locate metadata for IdP ($1).", params(1,i_param));
// Build NameID(s).
- auto_ptr<saml2::NameID> v2name(saml2::NameIDBuilder::buildNameID());
+ scoped_ptr<saml1::NameIdentifier> v1name;
+ scoped_ptr<saml2::NameID> v2name(saml2::NameIDBuilder::buildNameID());
v2name->setName(name.get());
v2name->setFormat(format.get());
- saml1::NameIdentifier* v1name = NULL;
if (!XMLString::equals(protocol, samlconstants::SAML20P_NS)) {
- v1name = saml1::NameIdentifierBuilder::buildNameIdentifier();
+ v1name.reset(saml1::NameIdentifierBuilder::buildNameIdentifier());
v1name->setName(name.get());
v1name->setFormat(format.get());
v1name->setNameQualifier(issuer.get());
}
- ResolverTest rt(NULL, a_param);
- try {
- ctx = rt.resolveAttributes(*app, site.second, protocol, v1name, v2name.get(), NULL, NULL, NULL);
- }
- catch (...) {
- delete v1name;
- throw;
- }
+ ResolverTest rt(nullptr, a_param);
+ ctx.reset(rt.resolveAttributes(*app, site.second, protocol, v1name.get(), v2name.get(), nullptr, nullptr, nullptr));
}
else {
// Try and load assertion from stdin.
DOMDocument* doc = XMLToolingConfig::getConfig().getParser().parse(cin);
XercesJanitor<DOMDocument> docjan(doc);
- auto_ptr<XMLObject> token(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
+ scoped_ptr<XMLObject> token(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
docjan.release();
// Get the issuer and protocol and NameIDs.
- const XMLCh* issuer = NULL;
- const saml1::NameIdentifier* v1name = NULL;
- saml2::NameID* v2name = NULL;
+ const XMLCh* issuer = nullptr;
+ const saml1::NameIdentifier* v1name = nullptr;
+ saml2::NameID* v2name = nullptr;
saml2::Assertion* a2 = dynamic_cast<saml2::Assertion*>(token.get());
saml1::Assertion* a1 = dynamic_cast<saml1::Assertion*>(token.get());
if (a2) {
const saml2::Issuer* iss = a2->getIssuer();
- issuer = iss ? iss->getName() : NULL;
+ issuer = iss ? iss->getName() : nullptr;
protocol = samlconstants::SAML20P_NS;
- v2name = a2->getSubject() ? a2->getSubject()->getNameID() : NULL;
+ v2name = a2->getSubject() ? a2->getSubject()->getNameID() : nullptr;
}
else if (a1) {
issuer = a1->getIssuer();
else
protocol = samlconstants::SAML11_PROTOCOL_ENUM;
v1name = a1->getAuthenticationStatements().size() ?
- a1->getAuthenticationStatements().front()->getSubject()->getNameIdentifier() : NULL;
+ a1->getAuthenticationStatements().front()->getSubject()->getNameIdentifier() : nullptr;
if (!v1name)
v1name = a1->getAttributeStatements().size() ?
- a1->getAttributeStatements().front()->getSubject()->getNameIdentifier() : NULL;
+ a1->getAttributeStatements().front()->getSubject()->getNameIdentifier() : nullptr;
if (v1name) {
// Normalize the SAML 1.x NameIdentifier...
v2name = saml2::NameIDBuilder::buildNameID();
throw FatalProfileException("Unknown assertion type.");
}
- auto_ptr<saml2::NameID> nameidwrapper(v1name ? v2name : NULL);
+ scoped_ptr<saml2::NameID> nameidwrapper(v1name ? v2name : nullptr);
if (!issuer)
throw FatalProfileException("Unable to determine issuer.");
- MetadataProvider* m=app->getMetadataProvider();
- xmltooling::Locker mlocker(m);
+ MetadataProvider* m = app->getMetadataProvider();
+ Locker mlocker(m);
MetadataProviderCriteria mc(*app, issuer, &IDPSSODescriptor::ELEMENT_QNAME, protocol);
- pair<const EntityDescriptor*,const RoleDescriptor*> site=m->getEntityDescriptor(mc);
+ pair<const EntityDescriptor*,const RoleDescriptor*> site = m->getEntityDescriptor(mc);
if (!site.first) {
auto_ptr_char temp(issuer);
throw MetadataException("Unable to locate metadata for IdP ($1).", params(1,temp.get()));
}
vector<const Assertion*> tokens(1, dynamic_cast<Assertion*>(token.get()));
- ResolverTest rt(NULL, a_param);
- ctx = rt.resolveAttributes(*app, site.second, protocol, v1name, v2name, NULL, NULL, &tokens);
+ ResolverTest rt(nullptr, a_param);
+ ctx.reset(rt.resolveAttributes(*app, site.second, protocol, v1name, v2name, nullptr, nullptr, &tokens));
}
- auto_ptr<ResolutionContext> wrapper(ctx);
- for (vector<Attribute*>::const_iterator a = ctx->getResolvedAttributes().begin(); a != ctx->getResolvedAttributes().end(); ++a) {
- for (vector<string>::const_iterator s = (*a)->getAliases().begin(); s != (*a)->getAliases().end(); ++s) {
+ for (indirect_iterator<vector<Attribute*>::const_iterator> a = make_indirect_iterator(ctx->getResolvedAttributes().begin());
+ a != make_indirect_iterator(ctx->getResolvedAttributes().end()); ++a) {
+ for (vector<string>::const_iterator s = a->getAliases().begin(); s != a->getAliases().end(); ++s) {
cout << *s << ": ";
- for (vector<string>::const_iterator v = (*a)->getSerializedValues().begin(); v != (*a)->getSerializedValues().end(); ++v) {
- if (v != (*a)->getSerializedValues().begin())
+ for (vector<string>::const_iterator v = a->getSerializedValues().begin(); v != a->getSerializedValues().end(); ++v) {
+ if (v != a->getSerializedValues().begin())
cout << ';';
cout << *v;
}
}
cout << endl;
}
- catch(exception& ex) {
+ catch (std::exception& ex) {
log.error(ex.what());
sp->unlock();
conf.term();
projects / shibboleth / cpp-sp.git / blobdiff