[cpp-sp] branch master updated: Remove more deprecated APIs and settings.
Scott Cantor
cantor.2 at osu.edu
Thu Apr 26 20:05:02 EDT 2018
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=9fb817acc9660087e4c1b081b4f7ee6b38eeb7bc
The following commit(s) were added to refs/heads/master by this push:
new 9fb817a Remove more deprecated APIs and settings.
9fb817a is described below
commit 9fb817acc9660087e4c1b081b4f7ee6b38eeb7bc
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Apr 26 20:04:51 2018 -0400
Remove more deprecated APIs and settings.
---
schemas/shibboleth-3.0-native-sp-config.xsd | 3 ---
shibsp/Application.cpp | 7 ------
shibsp/Application.h | 12 +---------
shibsp/attribute/Attribute.cpp | 23 ------------------
shibsp/attribute/AttributeDecoder.h | 19 +--------------
shibsp/attribute/Base64AttributeDecoder.cpp | 7 ------
shibsp/attribute/DOMAttributeDecoder.cpp | 7 ------
shibsp/attribute/KeyInfoAttributeDecoder.cpp | 7 ------
shibsp/attribute/NameIDAttributeDecoder.cpp | 7 ------
.../attribute/NameIDFromScopedAttributeDecoder.cpp | 7 ------
shibsp/attribute/ScopedAttributeDecoder.cpp | 7 ------
shibsp/attribute/StringAttributeDecoder.cpp | 7 ------
shibsp/attribute/XMLAttributeDecoder.cpp | 7 ------
.../resolver/impl/MetadataAttributeExtractor.cpp | 10 ++++----
shibsp/handler/AbstractHandler.h | 27 ----------------------
shibsp/handler/AssertionConsumerService.h | 18 ---------------
shibsp/handler/impl/AbstractHandler.cpp | 14 -----------
shibsp/handler/impl/AssertionConsumerService.cpp | 7 ------
shibsp/impl/XMLApplication.cpp | 8 -------
shibsp/impl/XMLApplication.h | 3 +--
shibsp/impl/XMLRequestMapper.cpp | 2 +-
shibsp/impl/XMLSecurityPolicyProvider.cpp | 4 ++--
unittests/TestApplication.cpp | 5 ++--
unittests/TestApplication.h | 2 +-
24 files changed, 14 insertions(+), 206 deletions(-)
diff --git a/schemas/shibboleth-3.0-native-sp-config.xsd b/schemas/shibboleth-3.0-native-sp-config.xsd
index 24a0aec..77c2073 100644
--- a/schemas/shibboleth-3.0-native-sp-config.xsd
+++ b/schemas/shibboleth-3.0-native-sp-config.xsd
@@ -256,7 +256,6 @@
<simpleContent>
<extension base="conf:string">
<attribute name="require" type="conf:string" use="required"/>
- <attribute name="ignoreCase" type="boolean"/>
<attribute name="caseSensitive" type="boolean"/>
</extension>
</simpleContent>
@@ -364,7 +363,6 @@
</choice>
</sequence>
<attribute name="regex" type="conf:string" use="required"/>
- <attribute name="ignoreCase" type="boolean"/>
<attribute name="caseSensitive" type="boolean"/>
<attributeGroup ref="conf:ContentSettings"/>
</complexType>
@@ -396,7 +394,6 @@
<element name="Query" type="conf:QueryType" minOccurs="0" maxOccurs="unbounded"/>
</sequence>
<attribute name="regex" type="conf:string" use="required"/>
- <attribute name="ignoreCase" type="boolean"/>
<attribute name="caseSensitive" type="boolean"/>
<attributeGroup ref="conf:ContentSettings"/>
</complexType>
diff --git a/shibsp/Application.cpp b/shibsp/Application.cpp
index cf48efa..c9f858e 100644
--- a/shibsp/Application.cpp
+++ b/shibsp/Application.cpp
@@ -159,13 +159,6 @@ void Application::clearAttributeHeaders(SPRequest& request) const
);
}
-const Handler* Application::getAssertionConsumerServiceByProtocol(const XMLCh* protocol, const char* binding) const
-{
- auto_ptr_XMLCh b(binding);
- const vector<const Handler*>& handlers = getAssertionConsumerServicesByBinding(b.get());
- return handlers.empty() ? nullptr : handlers.front();
-}
-
void Application::limitRedirect(const GenericRequest& request, const char* url) const
{
}
diff --git a/shibsp/Application.h b/shibsp/Application.h
index dde11f2..076bfd8 100644
--- a/shibsp/Application.h
+++ b/shibsp/Application.h
@@ -294,17 +294,7 @@ namespace shibsp {
* @param binding a binding identifier
* @return a matching AssertionConsumerService, or nullptr
*/
- virtual const Handler* getAssertionConsumerServiceByProtocol(const XMLCh* protocol, const char* binding=nullptr) const;
-
- /**
- * @deprecated
- * Returns one or more AssertionConsumerService Handlers that support
- * a particular protocol binding.
- *
- * @param binding a protocol binding identifier
- * @return a set of qualifying AssertionConsumerServices
- */
- virtual const std::vector<const Handler*>& getAssertionConsumerServicesByBinding(const XMLCh* binding) const=0;
+ virtual const Handler* getAssertionConsumerServiceByProtocol(const XMLCh* protocol, const char* binding=nullptr) const=0;
/**
* Returns the Handler associated with a particular path/location.
diff --git a/shibsp/attribute/Attribute.cpp b/shibsp/attribute/Attribute.cpp
index 2a75aba..8cddda3 100644
--- a/shibsp/attribute/Attribute.cpp
+++ b/shibsp/attribute/Attribute.cpp
@@ -114,29 +114,6 @@ AttributeDecoder::~AttributeDecoder()
{
}
-Attribute* AttributeDecoder::decode(
- const GenericRequest* request,
- const std::vector<std::string>& ids,
- const xmltooling::XMLObject* xmlObject,
- const char* assertingParty,
- const char* relyingParty
- ) const
-{
- // Default call into deprecated method.
- return decode(ids, xmlObject, assertingParty, relyingParty);
-}
-
-Attribute* AttributeDecoder::decode(
- const std::vector<std::string>& ids,
- const xmltooling::XMLObject* xmlObject,
- const char* assertingParty,
- const char* relyingParty
- ) const
-{
- // Default for deprecated method.
- return nullptr;
-}
-
Attribute* AttributeDecoder::_decode(Attribute* attr) const
{
if (attr) {
diff --git a/shibsp/attribute/AttributeDecoder.h b/shibsp/attribute/AttributeDecoder.h
index abfc968..8a0d521 100644
--- a/shibsp/attribute/AttributeDecoder.h
+++ b/shibsp/attribute/AttributeDecoder.h
@@ -107,24 +107,7 @@ namespace shibsp {
const xmltooling::XMLObject* xmlObject,
const char* assertingParty=nullptr,
const char* relyingParty=nullptr
- ) const;
-
- /**
- * @deprecated
- * Decodes an XMLObject into a resolved Attribute.
- *
- * @param ids array containing primary identifier in first position, followed by any aliases
- * @param xmlObject XMLObject to decode
- * @param assertingParty name of the party asserting the attribute
- * @param relyingParty name of the party relying on the attribute
- * @return a resolved Attribute, or nullptr
- */
- virtual Attribute* decode(
- const std::vector<std::string>& ids,
- const xmltooling::XMLObject* xmlObject,
- const char* assertingParty=nullptr,
- const char* relyingParty=nullptr
- ) const;
+ ) const=0;
};
diff --git a/shibsp/attribute/Base64AttributeDecoder.cpp b/shibsp/attribute/Base64AttributeDecoder.cpp
index f6880ba..8966200 100644
--- a/shibsp/attribute/Base64AttributeDecoder.cpp
+++ b/shibsp/attribute/Base64AttributeDecoder.cpp
@@ -47,13 +47,6 @@ namespace shibsp {
Base64AttributeDecoder(const DOMElement* e) : AttributeDecoder(e) {}
~Base64AttributeDecoder() {}
- // deprecated method
- shibsp::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);
- }
-
shibsp::Attribute* decode(
const GenericRequest*, const vector<string>&, const XMLObject*, const char* assertingParty=nullptr, const char* relyingParty=nullptr
) const;
diff --git a/shibsp/attribute/DOMAttributeDecoder.cpp b/shibsp/attribute/DOMAttributeDecoder.cpp
index 2aad842..79c8d9f 100644
--- a/shibsp/attribute/DOMAttributeDecoder.cpp
+++ b/shibsp/attribute/DOMAttributeDecoder.cpp
@@ -44,13 +44,6 @@ namespace shibsp {
DOMAttributeDecoder(const DOMElement* e);
~DOMAttributeDecoder() {}
- // 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 GenericRequest*, const vector<string>&, const XMLObject*, const char* assertingParty=nullptr, const char* relyingParty=nullptr
) const;
diff --git a/shibsp/attribute/KeyInfoAttributeDecoder.cpp b/shibsp/attribute/KeyInfoAttributeDecoder.cpp
index ecff131..600bee2 100644
--- a/shibsp/attribute/KeyInfoAttributeDecoder.cpp
+++ b/shibsp/attribute/KeyInfoAttributeDecoder.cpp
@@ -50,13 +50,6 @@ namespace shibsp {
KeyInfoAttributeDecoder(const DOMElement* e);
~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 GenericRequest*, const vector<string>&, const XMLObject*, const char* assertingParty=nullptr, const char* relyingParty=nullptr
) const;
diff --git a/shibsp/attribute/NameIDAttributeDecoder.cpp b/shibsp/attribute/NameIDAttributeDecoder.cpp
index d3a198b..8128011 100644
--- a/shibsp/attribute/NameIDAttributeDecoder.cpp
+++ b/shibsp/attribute/NameIDAttributeDecoder.cpp
@@ -51,13 +51,6 @@ namespace shibsp {
}
~NameIDAttributeDecoder() {}
- // deprecated method
- shibsp::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);
- }
-
shibsp::Attribute* decode(
const GenericRequest*, const vector<string>&, const XMLObject*, const char* assertingParty=nullptr, const char* relyingParty=nullptr
) const;
diff --git a/shibsp/attribute/NameIDFromScopedAttributeDecoder.cpp b/shibsp/attribute/NameIDFromScopedAttributeDecoder.cpp
index 5fc5476..90adc48 100644
--- a/shibsp/attribute/NameIDFromScopedAttributeDecoder.cpp
+++ b/shibsp/attribute/NameIDFromScopedAttributeDecoder.cpp
@@ -60,13 +60,6 @@ namespace shibsp {
}
~NameIDFromScopedAttributeDecoder() {}
- // deprecated method
- shibsp::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);
- }
-
shibsp::Attribute* decode(
const GenericRequest*, const vector<string>&, const XMLObject*, const char* assertingParty=nullptr, const char* relyingParty=nullptr
) const;
diff --git a/shibsp/attribute/ScopedAttributeDecoder.cpp b/shibsp/attribute/ScopedAttributeDecoder.cpp
index 7a667b7..37cb701 100644
--- a/shibsp/attribute/ScopedAttributeDecoder.cpp
+++ b/shibsp/attribute/ScopedAttributeDecoder.cpp
@@ -52,13 +52,6 @@ namespace shibsp {
}
~ScopedAttributeDecoder() {}
- // deprecated method
- shibsp::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);
- }
-
shibsp::Attribute* decode(
const GenericRequest*, const vector<string>&, const XMLObject*, const char* assertingParty=nullptr, const char* relyingParty=nullptr
) const;
diff --git a/shibsp/attribute/StringAttributeDecoder.cpp b/shibsp/attribute/StringAttributeDecoder.cpp
index b46af05..87add82 100644
--- a/shibsp/attribute/StringAttributeDecoder.cpp
+++ b/shibsp/attribute/StringAttributeDecoder.cpp
@@ -44,13 +44,6 @@ namespace shibsp {
StringAttributeDecoder(const DOMElement* e) : AttributeDecoder(e) {}
~StringAttributeDecoder() {}
- // deprecated method
- shibsp::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);
- }
-
shibsp::Attribute* decode(
const GenericRequest*, const vector<string>&, const XMLObject*, const char* assertingParty=nullptr, const char* relyingParty=nullptr
) const;
diff --git a/shibsp/attribute/XMLAttributeDecoder.cpp b/shibsp/attribute/XMLAttributeDecoder.cpp
index de4630e..727a926 100644
--- a/shibsp/attribute/XMLAttributeDecoder.cpp
+++ b/shibsp/attribute/XMLAttributeDecoder.cpp
@@ -44,13 +44,6 @@ namespace shibsp {
XMLAttributeDecoder(const DOMElement* e) : AttributeDecoder(e) {}
~XMLAttributeDecoder() {}
- // 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 GenericRequest*, const vector<string>&, const XMLObject*, const char* assertingParty=nullptr, const char* relyingParty=nullptr
) const;
diff --git a/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp b/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp
index fbaba22..ee90b18 100644
--- a/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp
+++ b/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp
@@ -92,7 +92,7 @@ namespace shibsp {
vector<logo_tuple_t> m_logos; // tuple is attributeID, height, width, decoder
template <class T> void doLangSensitive(const GenericRequest*, const vector<T*>&, const string&, vector<shibsp::Attribute*>&) const;
- void doContactPerson(const RoleDescriptor*, const contact_tuple_t&, vector<shibsp::Attribute*>&) const;
+ void doContactPerson(const GenericRequest* request, const RoleDescriptor*, const contact_tuple_t&, vector<shibsp::Attribute*>&) const;
void doLogo(const GenericRequest*, const vector<Logo*>&,const logo_tuple_t&, vector<shibsp::Attribute*>&) const;
};
@@ -255,7 +255,7 @@ void MetadataExtractor::extractAttributes(
for_each(
m_contacts.begin(), m_contacts.end(),
- boost::bind(&MetadataExtractor::doContactPerson, this, roleToExtract, _1, boost::ref(attributes))
+ boost::bind(&MetadataExtractor::doContactPerson, this, request, roleToExtract, _1, boost::ref(attributes))
);
}
@@ -349,7 +349,7 @@ void MetadataExtractor::doLogo(
match->marshall();
}
vector<string> ids(1, params.get<0>());
- auto_ptr<Attribute> attr(params.get<3>()->decode(ids, match));
+ auto_ptr<Attribute> attr(params.get<3>()->decode(request, ids, match));
if (attr.get()) {
attributes.push_back(attr.get());
attr.release();
@@ -357,7 +357,7 @@ void MetadataExtractor::doLogo(
}
void MetadataExtractor::doContactPerson(
- const RoleDescriptor* role, const contact_tuple_t& params, vector<shibsp::Attribute*>& attributes
+ const GenericRequest* request, const RoleDescriptor* role, const contact_tuple_t& params, vector<shibsp::Attribute*>& attributes
) const
{
const XMLCh* ctype = params.get<1>().c_str();
@@ -373,7 +373,7 @@ void MetadataExtractor::doContactPerson(
cp->marshall();
}
vector<string> ids(1, params.get<0>());
- auto_ptr<Attribute> attr(params.get<2>()->decode(ids, cp));
+ auto_ptr<Attribute> attr(params.get<2>()->decode(request, ids, cp));
if (attr.get()) {
attributes.push_back(attr.get());
attr.release();
diff --git a/shibsp/handler/AbstractHandler.h b/shibsp/handler/AbstractHandler.h
index 5152f9b..567f022 100644
--- a/shibsp/handler/AbstractHandler.h
+++ b/shibsp/handler/AbstractHandler.h
@@ -134,33 +134,6 @@ namespace shibsp {
xmltooling::HTTPResponse& httpResponse,
const char* defaultSigningProperty
) const;
-
- /**
- * @deprecated
- *
- * Encodes and sends SAML 2.0 message, optionally signing it in the process.
- * If the method returns, the message MUST NOT be freed by the caller.
- *
- * @param encoder the MessageEncoder to use
- * @param msg the message to send
- * @param relayState any RelayState to include with the message
- * @param destination location to send message, if not a backchannel response
- * @param role recipient of message, if known
- * @param application the Application sending the message
- * @param httpResponse channel for sending message
- * @param signIfPossible true iff signing should be attempted regardless of "signing" property
- * @return the result of sending the message using the encoder
- */
- long sendMessage(
- const opensaml::MessageEncoder& encoder,
- xmltooling::XMLObject* msg,
- const char* relayState,
- const char* destination,
- const opensaml::saml2md::RoleDescriptor* role,
- const Application& application,
- xmltooling::HTTPResponse& httpResponse,
- bool signIfPossible=false
- ) const;
#endif
/**
diff --git a/shibsp/handler/AssertionConsumerService.h b/shibsp/handler/AssertionConsumerService.h
index f4a5e20..3ca124c 100644
--- a/shibsp/handler/AssertionConsumerService.h
+++ b/shibsp/handler/AssertionConsumerService.h
@@ -119,24 +119,6 @@ namespace shibsp {
void generateMetadata(opensaml::saml2md::SPSSODescriptor& role, const char* handlerURL) const;
/**
- * @deprecated
- * Returns a SecurityPolicy instance to use for an incoming request.
- *
- * <p>Allows handlers to customize the type of policy object their policy rules might require.
- * <p>The caller <strong>MUST</strong> lock the application's MetadataProvider for the life
- * of the returned object.
- *
- * @param application reference to application receiving message
- * @param role identifies the role (generally IdP or SP) of the policy peer
- * @param validate true iff XML parsing should be done with validation
- * @param policyId identifies policy rules to auto-attach, defaults to the application's set
- * @return a new policy instance, which the caller is responsible for freeing
- */
- virtual opensaml::SecurityPolicy* createSecurityPolicy(
- const Application& application, const xmltooling::QName* role, bool validate, const char* policyId
- ) const;
-
- /**
* Implement protocol-specific handling of the incoming decoded message.
*
* <p>The result of implementing the protocol should be an exception or
diff --git a/shibsp/handler/impl/AbstractHandler.cpp b/shibsp/handler/impl/AbstractHandler.cpp
index 24ab894..75d3e83 100644
--- a/shibsp/handler/impl/AbstractHandler.cpp
+++ b/shibsp/handler/impl/AbstractHandler.cpp
@@ -503,20 +503,6 @@ long AbstractHandler::sendMessage(
const saml2md::RoleDescriptor* role,
const Application& application,
HTTPResponse& httpResponse,
- bool signIfPossible
-) const
-{
- return sendMessage(encoder, msg, relayState, destination, role, application, httpResponse, signIfPossible ? "true" : "conditional");
-}
-
-long AbstractHandler::sendMessage(
- const MessageEncoder& encoder,
- XMLObject* msg,
- const char* relayState,
- const char* destination,
- const saml2md::RoleDescriptor* role,
- const Application& application,
- HTTPResponse& httpResponse,
const char* defaultSigningProperty
) const
{
diff --git a/shibsp/handler/impl/AssertionConsumerService.cpp b/shibsp/handler/impl/AssertionConsumerService.cpp
index 001e806..fd39ab0 100644
--- a/shibsp/handler/impl/AssertionConsumerService.cpp
+++ b/shibsp/handler/impl/AssertionConsumerService.cpp
@@ -382,13 +382,6 @@ void AssertionConsumerService::generateMetadata(SPSSODescriptor& role, const cha
role.getAssertionConsumerServices().push_back(ep);
}
-opensaml::SecurityPolicy* AssertionConsumerService::createSecurityPolicy(
- const Application& application, const xmltooling::QName* role, bool validate, const char* policyId
- ) const
-{
- return new SecurityPolicy(application, role, validate, policyId);
-}
-
namespace {
class SHIBSP_DLLLOCAL DummyContext : public ResolutionContext
{
diff --git a/shibsp/impl/XMLApplication.cpp b/shibsp/impl/XMLApplication.cpp
index 33448f4..5c08609 100644
--- a/shibsp/impl/XMLApplication.cpp
+++ b/shibsp/impl/XMLApplication.cpp
@@ -1399,14 +1399,6 @@ const Handler* XMLApplication::getAssertionConsumerServiceByProtocol(const XMLCh
return m_base ? m_base->getAssertionConsumerServiceByProtocol(protocol, binding) : nullptr;
}
-const vector<const Handler*>& XMLApplication::getAssertionConsumerServicesByBinding(const XMLCh* binding) const
-{
- ACSBindingMap::const_iterator i = m_acsBindingMap.find(binding);
- if (i != m_acsBindingMap.end())
- return i->second;
- return m_base ? m_base->getAssertionConsumerServicesByBinding(binding) : g_noHandlers;
-}
-
const Handler* XMLApplication::getHandler(const char* path) const
{
string wrap(path);
diff --git a/shibsp/impl/XMLApplication.h b/shibsp/impl/XMLApplication.h
index f4d5018..62d150c 100644
--- a/shibsp/impl/XMLApplication.h
+++ b/shibsp/impl/XMLApplication.h
@@ -135,8 +135,7 @@ namespace shibsp {
const SessionInitiator* getSessionInitiatorById(const char* id) const;
const Handler* getDefaultAssertionConsumerService() const;
const Handler* getAssertionConsumerServiceByIndex(unsigned short index) const;
- const Handler* getAssertionConsumerServiceByProtocol(const XMLCh* protocol, const char* binding = nullptr) const;
- const std::vector<const Handler*>& getAssertionConsumerServicesByBinding(const XMLCh* binding) const;
+ const Handler* getAssertionConsumerServiceByProtocol(const XMLCh* protocol, const char* binding=nullptr) const;
const Handler* getHandler(const char* path) const;
void getHandlers(std::vector<const Handler*>& handlers) const;
void limitRedirect(const xmltooling::GenericRequest& request, const char* url) const;
diff --git a/shibsp/impl/XMLRequestMapper.cpp b/shibsp/impl/XMLRequestMapper.cpp
index 1ba6e29..ee4dede 100644
--- a/shibsp/impl/XMLRequestMapper.cpp
+++ b/shibsp/impl/XMLRequestMapper.cpp
@@ -315,7 +315,7 @@ Override::Override(bool unicodeAware, const DOMElement* e, Category& log, const
if (path && path->hasAttributeNS(nullptr, ignoreCase)) {
// In this one case, we've left ignoreCase reversed (true means case sensitive, false means insensitive).
// This was to protect people who followed the security advisory for SSPCPP-691 and reversed their setting.
- log.error("Deprecated ignoreCase attribute in PathRegex element will be interpreted backwards. Replace with caseSensitive");
+ log.error("DEPRECATED: ignoreCase attribute in PathRegex element will be interpreted backwards. Replace with caseSensitive");
caseSensitive = XMLHelper::getAttrBool(path, true, ignoreCase);
} else {
// If the old ignoreCase setting isn't set, then we just process normally.
diff --git a/shibsp/impl/XMLSecurityPolicyProvider.cpp b/shibsp/impl/XMLSecurityPolicyProvider.cpp
index 6c58de6..ae85a8f 100644
--- a/shibsp/impl/XMLSecurityPolicyProvider.cpp
+++ b/shibsp/impl/XMLSecurityPolicyProvider.cpp
@@ -264,7 +264,7 @@ XMLSecurityPolicyProviderImpl::XMLSecurityPolicyProviderImpl(const DOMElement* e
if (rules.second.size() == 0) {
// Process Rule elements.
- log.warn("detected deprecated Policy configuration, consider converting to new PolicyRule syntax");
+ log.warn("DEPRECATED: Rule elements detected, convert to PolicyRule syntax");
rule = XMLHelper::getFirstChildElement(e, Rule);
while (rule) {
string t(XMLHelper::getAttrString(rule, nullptr, _type));
@@ -282,7 +282,7 @@ XMLSecurityPolicyProviderImpl::XMLSecurityPolicyProviderImpl(const DOMElement* e
}
// Manually add a basic Conditions rule.
- log.info("installing a default Conditions rule in policy (%s) for compatibility with legacy configuration", id.c_str());
+ log.warn("installing a default Conditions rule in policy (%s) for compatibility with legacy configuration", id.c_str());
boost::shared_ptr<SecurityPolicyRule> cptr(samlConf.SecurityPolicyRuleManager.newPlugin(CONDITIONS_POLICY_RULE, nullptr));
m_ruleJanitor.push_back(cptr);
rules.second.push_back(cptr.get());
diff --git a/unittests/TestApplication.cpp b/unittests/TestApplication.cpp
index 137664d..fe0ba31 100644
--- a/unittests/TestApplication.cpp
+++ b/unittests/TestApplication.cpp
@@ -98,10 +98,9 @@ namespace ta {
return nullptr;
}
- const vector<const Handler*>& TestApplication::getAssertionConsumerServicesByBinding(const XMLCh* binding) const
+ const Handler* TestApplication::getAssertionConsumerServiceByProtocol(const XMLCh* protocol, const char* binding) const
{
- static const vector<const Handler*> retVal(0);
- return retVal;
+ return nullptr;
}
const Handler* TestApplication::getHandler(const char* path) const
diff --git a/unittests/TestApplication.h b/unittests/TestApplication.h
index 0e497fc..937ebd0 100644
--- a/unittests/TestApplication.h
+++ b/unittests/TestApplication.h
@@ -38,7 +38,7 @@ namespace ta {
virtual const SessionInitiator* getSessionInitiatorById(const char* id) const;
virtual const Handler* getDefaultAssertionConsumerService() const;
virtual const Handler* getAssertionConsumerServiceByIndex(unsigned short index) const;
- virtual const vector<const Handler*>& getAssertionConsumerServicesByBinding(const XMLCh* binding) const;
+ virtual const Handler* getAssertionConsumerServiceByProtocol(const XMLCh* protocol, const char* binding=nullptr) const;
virtual const Handler* getHandler(const char* path) const;
virtual void getHandlers(vector<const Handler*>& handlers) const;
virtual SAMLArtifact* generateSAML1Artifact(const EntityDescriptor* relyingParty) const;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list