-/*
- * 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 "internal.h"
#include <saml/binding/SecurityPolicyRule.h>
#include <saml/saml2/metadata/Metadata.h>
#include <saml/saml2/metadata/MetadataProvider.h>
+
+#include <boost/scoped_ptr.hpp>
#include <xmltooling/io/HTTPRequest.h>
#include <xmltooling/io/HTTPResponse.h>
#include <xmltooling/security/Credential.h>
class SAMLBindingBaseTestCase : public HTTPRequest, public HTTPResponse
{
protected:
- CredentialResolver* m_creds;
- MetadataProvider* m_metadata;
- TrustEngine* m_trust;
+ boost::scoped_ptr<CredentialResolver> m_creds;
+ boost::scoped_ptr<MetadataProvider> m_metadata;
+ boost::scoped_ptr<TrustEngine> m_trust;
map<string,string> m_fields;
map<string,string> m_headers;
string m_method,m_url,m_query;
public:
void setUp() {
- m_creds=NULL;
- m_metadata=NULL;
- m_trust=NULL;
m_fields.clear();
m_headers.clear();
m_method.erase();
auto_ptr_XMLCh path("path");
string s = data_path + "binding/example-metadata.xml";
auto_ptr_XMLCh file(s.c_str());
- doc->getDocumentElement()->setAttributeNS(NULL,path.get(),file.get());
+ doc->getDocumentElement()->setAttributeNS(nullptr,path.get(),file.get());
- m_metadata = SAMLConfig::getConfig().MetadataProviderManager.newPlugin(
- XML_METADATA_PROVIDER,doc->getDocumentElement()
+ m_metadata.reset(
+ SAMLConfig::getConfig().MetadataProviderManager.newPlugin(XML_METADATA_PROVIDER, doc->getDocumentElement())
);
m_metadata->init();
ifstream in2(config.c_str());
DOMDocument* doc2=XMLToolingConfig::getConfig().getParser().parse(in2);
XercesJanitor<DOMDocument> janitor2(doc2);
- m_creds = XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(
- FILESYSTEM_CREDENTIAL_RESOLVER,doc2->getDocumentElement()
+ m_creds.reset(
+ XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(FILESYSTEM_CREDENTIAL_RESOLVER, doc2->getDocumentElement())
);
- m_trust = XMLToolingConfig::getConfig().TrustEngineManager.newPlugin(EXPLICIT_KEY_TRUSTENGINE, NULL);
+ m_trust.reset(XMLToolingConfig::getConfig().TrustEngineManager.newPlugin(EXPLICIT_KEY_TRUSTENGINE, nullptr));
- m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(MESSAGEFLOW_POLICY_RULE,NULL));
- m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(SIMPLESIGNING_POLICY_RULE,NULL));
- m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(XMLSIGNING_POLICY_RULE,NULL));
+ m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(MESSAGEFLOW_POLICY_RULE,nullptr));
+ m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(SIMPLESIGNING_POLICY_RULE,nullptr));
+ m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(XMLSIGNING_POLICY_RULE,nullptr));
}
catch (XMLToolingException& ex) {
TS_TRACE(ex.what());
void tearDown() {
for_each(m_rules.begin(), m_rules.end(), xmltooling::cleanup<SecurityPolicyRule>());
+ m_trust.reset();
+ m_metadata.reset();
+ m_creds.reset();
m_rules.clear();
- delete m_creds;
- delete m_metadata;
- delete m_trust;
- m_creds=NULL;
- m_metadata=NULL;
- m_trust=NULL;
m_fields.clear();
m_headers.clear();
m_method.erase();
}
const char* getRequestBody() const {
- return NULL;
+ return nullptr;
}
const char* getQueryString() const {
const char* getParameter(const char* name) const {
map<string,string>::const_iterator i=m_fields.find(name);
- return i==m_fields.end() ? NULL : i->second.c_str();
+ return i==m_fields.end() ? nullptr : i->second.c_str();
}
vector<const char*>::size_type getParameters(const char* name, vector<const char*>& values) const {
pch+=strlen("action=\"");
m_url = html_decode(page.substr(pch-page.c_str(),strchr(pch,'"')-pch));
- while (pch=strstr(pch,"<input type=\"hidden\" name=\"")) {
+ while ((pch = strstr(pch,"<input type=\"hidden\" name=\""))) {
pch+=strlen("<input type=\"hidden\" name=\"");
string name = page.substr(pch-page.c_str(),strchr(pch,'"')-pch);
pch=strstr(pch,"value=\"");