[cpp-sp] branch maint-3 updated: SSPCPP-1012 - Add deprecation warnings where required
Codeberg
noreply at shibboleth.net
Mon Aug 17 20:20:21 UTC 2026
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch maint-3
in repository cpp-sp.
View the commit online:
https://codeberg.org/Shibboleth/cpp-sp/commit/a721d100c34fc9a3e7e9455a19bde9b993ad3ca3
The following commit(s) were added to refs/heads/maint-3 by this push:
new a721d100 SSPCPP-1012 - Add deprecation warnings where required
a721d100 is described below
commit a721d100c34fc9a3e7e9455a19bde9b993ad3ca3
Author: Scott Cantor <scott at restingparrotsoftware.com>
AuthorDate: Mon Aug 17 16:19:34 2026 -0400
SSPCPP-1012 - Add deprecation warnings where required
https://shibboleth.atlassian.net/browse/SSPCPP-1012
Another "final" round of warnings added.
---
plugins/CaseFoldingAttributeResolver.cpp | 8 +++++++-
plugins/GSSAPIAttributeExtractor.cpp | 2 ++
plugins/TemplateAttributeResolver.cpp | 7 ++++++-
plugins/TransformAttributeResolver.cpp | 9 +++++++--
shibsp/attribute/Attribute.cpp | 6 +++---
shibsp/attribute/Base64AttributeDecoder.cpp | 2 +-
shibsp/attribute/DOMAttributeDecoder.cpp | 2 +-
shibsp/attribute/KeyInfoAttributeDecoder.cpp | 2 +-
shibsp/attribute/resolver/impl/DelegationAttributeExtractor.cpp | 1 +
.../attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp | 2 +-
shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp | 2 ++
.../resolver/impl/SimpleAggregationAttributeResolver.cpp | 2 ++
shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp | 2 +-
13 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/plugins/CaseFoldingAttributeResolver.cpp b/plugins/CaseFoldingAttributeResolver.cpp
index 4a882fef..2aaa51ef 100644
--- a/plugins/CaseFoldingAttributeResolver.cpp
+++ b/plugins/CaseFoldingAttributeResolver.cpp
@@ -27,14 +27,18 @@
#include "internal.h"
#include <algorithm>
+#include <xercesc/util/XMLUniDefs.hpp>
+
#include <shibsp/exceptions.h>
#include <shibsp/SessionCache.h>
+#include <shibsp/SPConfig.h>
#include <shibsp/attribute/SimpleAttribute.h>
#include <shibsp/attribute/resolver/AttributeResolver.h>
#include <shibsp/attribute/resolver/ResolutionContext.h>
+
#include <xmltooling/XMLToolingConfig.h>
#include <xmltooling/util/XMLHelper.h>
-#include <xercesc/util/XMLUniDefs.hpp>
+
using namespace shibsp;
using namespace xmltooling;
@@ -141,6 +145,8 @@ CaseFoldingAttributeResolver::CaseFoldingAttributeResolver(const DOMElement* e,
m_source(XMLHelper::getAttrString(e, nullptr, source)),
m_dest(1, XMLHelper::getAttrString(e, nullptr, dest))
{
+ SPConfig::getConfig().deprecation().warn("UppperCase/LowerCase AttributeResolvers removed in next major version");
+
if (m_source.empty())
throw ConfigurationException("CaseFolding AttributeResolver requires source attribute.");
}
diff --git a/plugins/GSSAPIAttributeExtractor.cpp b/plugins/GSSAPIAttributeExtractor.cpp
index 09261811..14f477c1 100644
--- a/plugins/GSSAPIAttributeExtractor.cpp
+++ b/plugins/GSSAPIAttributeExtractor.cpp
@@ -163,6 +163,8 @@ GSSAPIExtractorImpl::GSSAPIExtractorImpl(const DOMElement* e, Category& log)
xmltooling::NDC ndc("GSSAPIExtractorImpl");
#endif
+ SPConfig::getConfig().deprecation().warn("GSS-API AttributeExtractor is removed from next major version");
+
if (!XMLHelper::isNodeNamed(e, shibspconstants::SHIB2ATTRIBUTEMAP_NS, Attributes))
throw ConfigurationException("GSSAPI AttributeExtractor requires am:Attributes at root of configuration.");
diff --git a/plugins/TemplateAttributeResolver.cpp b/plugins/TemplateAttributeResolver.cpp
index cfa84a7f..86ab1f8f 100644
--- a/plugins/TemplateAttributeResolver.cpp
+++ b/plugins/TemplateAttributeResolver.cpp
@@ -27,15 +27,18 @@
#include "internal.h"
#include <boost/algorithm/string.hpp>
+#include <xercesc/util/XMLUniDefs.hpp>
+
#include <shibsp/exceptions.h>
#include <shibsp/SessionCache.h>
+#include <shibsp/SPConfig.h>
#include <shibsp/attribute/SimpleAttribute.h>
#include <shibsp/attribute/resolver/AttributeResolver.h>
#include <shibsp/attribute/resolver/ResolutionContext.h>
+
#include <xmltooling/XMLToolingConfig.h>
#include <xmltooling/util/Predicates.h>
#include <xmltooling/util/XMLHelper.h>
-#include <xercesc/util/XMLUniDefs.hpp>
using namespace shibsp;
using namespace xmltooling;
@@ -131,6 +134,8 @@ TemplateAttributeResolver::TemplateAttributeResolver(const DOMElement* e)
: m_log(Category::getInstance(SHIBSP_LOGCAT ".AttributeResolver.Template")),
m_dest(1, XMLHelper::getAttrString(e, nullptr, dest))
{
+ SPConfig::getConfig().deprecation().warn("Template AttributeResolver removed in next major version");
+
if (m_dest.front().empty())
throw ConfigurationException("Template AttributeResolver requires dest attribute.");
diff --git a/plugins/TransformAttributeResolver.cpp b/plugins/TransformAttributeResolver.cpp
index 50a5aa7e..1c7030ce 100644
--- a/plugins/TransformAttributeResolver.cpp
+++ b/plugins/TransformAttributeResolver.cpp
@@ -30,15 +30,18 @@
#include <boost/shared_ptr.hpp>
#include <boost/algorithm/string/trim.hpp>
#include <boost/tuple/tuple.hpp>
+#include <xercesc/util/XMLUniDefs.hpp>
+#include <xercesc/util/regx/RegularExpression.hpp>
+
#include <shibsp/exceptions.h>
#include <shibsp/SessionCache.h>
+#include <shibsp/SPConfig.h>
#include <shibsp/attribute/SimpleAttribute.h>
#include <shibsp/attribute/resolver/AttributeResolver.h>
#include <shibsp/attribute/resolver/ResolutionContext.h>
+
#include <xmltooling/XMLToolingConfig.h>
#include <xmltooling/util/XMLHelper.h>
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/regx/RegularExpression.hpp>
using namespace shibsp;
using namespace xmltooling;
@@ -141,6 +144,8 @@ TransformAttributeResolver::TransformAttributeResolver(const DOMElement* e)
: m_log(Category::getInstance(SHIBSP_LOGCAT ".AttributeResolver.Transform")),
m_source(XMLHelper::getAttrString(e, nullptr, source))
{
+ SPConfig::getConfig().deprecation().warn("Transform AttributeResolver removed in next major version");
+
if (m_source.empty())
throw ConfigurationException("Transform AttributeResolver requires source attribute.");
diff --git a/shibsp/attribute/Attribute.cpp b/shibsp/attribute/Attribute.cpp
index 6acfb8b2..b77f7d0a 100644
--- a/shibsp/attribute/Attribute.cpp
+++ b/shibsp/attribute/Attribute.cpp
@@ -109,13 +109,13 @@ AttributeDecoder::AttributeDecoder(const DOMElement *e)
m_hashAlg(XMLHelper::getAttrString(e, nullptr, hashAlg))
{
if (m_internal) {
- SPConfig::getConfig().deprecation().warn("<AttributeDecoder> internal option");
+ SPConfig::getConfig().deprecation().warn("<AttributeDecoder> 'internal' option removed in next major version");
}
if (m_langAware) {
- SPConfig::getConfig().deprecation().warn("<AttributeDecoder> langAware option");
+ SPConfig::getConfig().deprecation().warn("<AttributeDecoder> 'langAware' option removed in next major version");
}
if (!m_hashAlg.empty()) {
- SPConfig::getConfig().deprecation().warn("<AttributeDecoder> hashAlg option");
+ SPConfig::getConfig().deprecation().warn("<AttributeDecoder> 'hashAlg' option removed in next major version");
}
}
diff --git a/shibsp/attribute/Base64AttributeDecoder.cpp b/shibsp/attribute/Base64AttributeDecoder.cpp
index fb22b242..9012aab9 100644
--- a/shibsp/attribute/Base64AttributeDecoder.cpp
+++ b/shibsp/attribute/Base64AttributeDecoder.cpp
@@ -45,7 +45,7 @@ namespace shibsp {
{
public:
Base64AttributeDecoder(const DOMElement* e) : AttributeDecoder(e) {
- SPConfig::getConfig().deprecation().warn("Base64AttributeDecoder");
+ SPConfig::getConfig().deprecation().warn("Base64AttributeDecoder removed in next major version");
}
~Base64AttributeDecoder() {}
diff --git a/shibsp/attribute/DOMAttributeDecoder.cpp b/shibsp/attribute/DOMAttributeDecoder.cpp
index 6d815c3c..26679d46 100644
--- a/shibsp/attribute/DOMAttributeDecoder.cpp
+++ b/shibsp/attribute/DOMAttributeDecoder.cpp
@@ -70,7 +70,7 @@ DOMAttributeDecoder::DOMAttributeDecoder(const DOMElement* e)
{
Category& log = Category::getInstance(SHIBSP_LOGCAT ".AttributeDecoder.DOM");
- SPConfig::getConfig().deprecation().warn("DOMAttributeDecoder");
+ SPConfig::getConfig().deprecation().warn("DOMAttributeDecoder removed in next major version");
e = XMLHelper::getFirstChildElement(e, Mapping);
while (e) {
diff --git a/shibsp/attribute/KeyInfoAttributeDecoder.cpp b/shibsp/attribute/KeyInfoAttributeDecoder.cpp
index ec318063..7c26750d 100644
--- a/shibsp/attribute/KeyInfoAttributeDecoder.cpp
+++ b/shibsp/attribute/KeyInfoAttributeDecoder.cpp
@@ -90,7 +90,7 @@ KeyInfoAttributeDecoder::KeyInfoAttributeDecoder(const DOMElement* e, bool depre
m_hash(XMLHelper::getAttrBool(e, false, _hash)),
m_keyInfoHashAlg(XMLHelper::getAttrString(e, "SHA1", keyInfoHashAlg)) {
- SPConfig::getConfig().deprecation().warn("KeyInfoAttributeDecoder");
+ SPConfig::getConfig().deprecation().warn("KeyInfoAttributeDecoder removed in next major version");
e = XMLHelper::getFirstChildElement(e, _KeyInfoResolver);
if (e) {
diff --git a/shibsp/attribute/resolver/impl/DelegationAttributeExtractor.cpp b/shibsp/attribute/resolver/impl/DelegationAttributeExtractor.cpp
index 2b9d8413..c9b4991a 100644
--- a/shibsp/attribute/resolver/impl/DelegationAttributeExtractor.cpp
+++ b/shibsp/attribute/resolver/impl/DelegationAttributeExtractor.cpp
@@ -96,6 +96,7 @@ DelegationExtractor::DelegationExtractor(const DOMElement* e)
: m_attributeId(XMLHelper::getAttrString(e, "delegate", attributeId)),
m_formatter(XMLHelper::getAttrString(e, "$Name", formatter))
{
+ SPConfig::getConfig().deprecation().warn(DELEGATION_ATTRIBUTE_EXTRACTOR" AttributeExtractor removed in next major version");
}
void DelegationExtractor::extractAttributes(
diff --git a/shibsp/attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp b/shibsp/attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp
index 370321d2..4758fe5f 100644
--- a/shibsp/attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp
+++ b/shibsp/attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp
@@ -104,7 +104,7 @@ namespace shibsp {
KeyDescriptorExtractor::KeyDescriptorExtractor(const DOMElement* e) : m_hashAlg(XMLHelper::getAttrString(e, "SHA1", hashAlg))
{
- SPConfig::getConfig().deprecation().warn(KEYDESCRIPTOR_ATTRIBUTE_EXTRACTOR" AttributeExtractor");
+ SPConfig::getConfig().deprecation().warn(KEYDESCRIPTOR_ATTRIBUTE_EXTRACTOR" AttributeExtractor removed in next major version");
if (e) {
string a(XMLHelper::getAttrString(e, nullptr, hashId));
if (!a.empty())
diff --git a/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp b/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp
index 600de29a..2cf6a856 100644
--- a/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp
+++ b/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp
@@ -123,6 +123,8 @@ MetadataExtractor::MetadataExtractor(const DOMElement* e, bool deprecationSuppor
m_orgURL(XMLHelper::getAttrString(e, nullptr, OrganizationURL::LOCAL_NAME)),
m_registrationAuthority(XMLHelper::getAttrString(e, nullptr, RegistrationInfo::REGAUTHORITY_ATTRIB_NAME))
{
+ SPConfig::getConfig().deprecation().warn(METADATA_ATTRIBUTE_EXTRACTOR" AttributeExtractor removed in next major version");
+
const DOMElement* child = e ? XMLHelper::getFirstChildElement(e) : nullptr;
while (child) {
if (XMLHelper::isNodeNamed(child, e->getNamespaceURI(), ContactPerson::LOCAL_NAME)) {
diff --git a/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp b/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
index 6d0b12d3..4b88ad47 100644
--- a/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
+++ b/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
@@ -240,6 +240,8 @@ SimpleAggregationResolver::SimpleAggregationResolver(const DOMElement* e, bool d
xmltooling::NDC ndc("SimpleAggregationResolver");
#endif
+ SPConfig::getConfig().deprecation().warn(SIMPLEAGGREGATION_ATTRIBUTE_RESOLVER" AttributeResolver removed in next major version");
+
const XMLCh* aid = e ? e->getAttributeNS(nullptr, attributeId) : nullptr;
if (aid && *aid) {
auto_ptr_char dup(aid);
diff --git a/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp b/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
index 927788c8..16c5d1c3 100644
--- a/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
+++ b/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
@@ -369,7 +369,7 @@ XMLExtractorImpl::XMLExtractorImpl(const DOMElement* e, Category& log, bool depr
if (deprecationSupport) {
name = child->getAttributeNS(nullptr, _aliases);
if (name && *name) {
- SPConfig::getConfig().deprecation().warn("attribute mapping rule (%s) uses deprecated aliases feature", id.get());
+ SPConfig::getConfig().deprecation().warn("Attribuute rule (%s): 'aliases' setting removed in next major version", id.get());
auto_ptr_char aliases(name);
string dup(aliases.get());
set<string> new_aliases;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list