[cpp-sp] branch main updated: Strip out some removed function.
Scott Cantor
cantor.2 at osu.edu
Thu Nov 21 15:37:59 UTC 2024
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=082bc4ec0ce916ff6420d69231fe60da6ff66523
The following commit(s) were added to refs/heads/main by this push:
new 082bc4ec Strip out some removed function.
082bc4ec is described below
commit 082bc4ec0ce916ff6420d69231fe60da6ff66523
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Nov 21 10:37:50 2024 -0500
Strip out some removed function.
---
shibsp/SPConfig.cpp | 2 --
shibsp/SPConfig.h | 10 ----------
shibsp/impl/XMLApplication.cpp | 28 ----------------------------
3 files changed, 40 deletions(-)
diff --git a/shibsp/SPConfig.cpp b/shibsp/SPConfig.cpp
index f7afebe0..ec95c48b 100644
--- a/shibsp/SPConfig.cpp
+++ b/shibsp/SPConfig.cpp
@@ -266,10 +266,8 @@ void SPConfig::term()
m_configDoc = nullptr;
if (isEnabled(Handlers)) {
- ArtifactResolutionServiceManager.deregisterFactories();
AssertionConsumerServiceManager.deregisterFactories();
LogoutInitiatorManager.deregisterFactories();
- ManageNameIDServiceManager.deregisterFactories();
SessionInitiatorManager.deregisterFactories();
SingleLogoutServiceManager.deregisterFactories();
HandlerManager.deregisterFactories();
diff --git a/shibsp/SPConfig.h b/shibsp/SPConfig.h
index 5ec1f167..7dbf24f1 100644
--- a/shibsp/SPConfig.h
+++ b/shibsp/SPConfig.h
@@ -168,11 +168,6 @@ namespace shibsp {
*/
xmltooling::PluginManager<AccessControl,std::string,const xercesc::DOMElement*> AccessControlManager;
- /**
- * Manages factories for Handler plugins that implement ArtifactResolutionService functionality.
- */
- xmltooling::PluginManager< Handler,std::string,std::pair<const xercesc::DOMElement*,const char*> > ArtifactResolutionServiceManager;
-
/**
* Manages factories for Handler plugins that implement AssertionConsumerService functionality.
*/
@@ -193,11 +188,6 @@ namespace shibsp {
*/
xmltooling::PluginManager< Handler,std::string,std::pair<const xercesc::DOMElement*,const char*> > LogoutInitiatorManager;
- /**
- * Manages factories for Handler plugins that implement ManageNameIDService functionality.
- */
- xmltooling::PluginManager< Handler,std::string,std::pair<const xercesc::DOMElement*,const char*> > ManageNameIDServiceManager;
-
/**
* Manages factories for RequestMapper plugins.
*/
diff --git a/shibsp/impl/XMLApplication.cpp b/shibsp/impl/XMLApplication.cpp
index 2ab11b24..faeca43b 100644
--- a/shibsp/impl/XMLApplication.cpp
+++ b/shibsp/impl/XMLApplication.cpp
@@ -58,7 +58,6 @@ namespace {
static const XMLCh _AttributeFilter[] = UNICODE_LITERAL_15(A,t,t,r,i,b,u,t,e,F,i,l,t,e,r);
static const XMLCh _AttributeResolver[] = UNICODE_LITERAL_17(A,t,t,r,i,b,u,t,e,R,e,s,o,l,v,e,r);
static const XMLCh _AssertionConsumerService[] = UNICODE_LITERAL_24(A,s,s,e,r,t,i,o,n,C,o,n,s,u,m,e,r,S,e,r,v,i,c,e);
- static const XMLCh _ArtifactResolutionService[] =UNICODE_LITERAL_25(A,r,t,i,f,a,c,t,R,e,s,o,l,u,t,i,o,n,S,e,r,v,i,c,e);
static const XMLCh _Audience[] = UNICODE_LITERAL_8(A,u,d,i,e,n,c,e);
static const XMLCh Binding[] = UNICODE_LITERAL_7(B,i,n,d,i,n,g);
static const XMLCh Channel[]= UNICODE_LITERAL_7(C,h,a,n,n,e,l);
@@ -71,7 +70,6 @@ namespace {
static const XMLCh Location[] = UNICODE_LITERAL_8(L,o,c,a,t,i,o,n);
static const XMLCh Logout[] = UNICODE_LITERAL_6(L,o,g,o,u,t);
static const XMLCh _LogoutInitiator[] = UNICODE_LITERAL_15(L,o,g,o,u,t,I,n,i,t,i,a,t,o,r);
- static const XMLCh _ManageNameIDService[] = UNICODE_LITERAL_19(M,a,n,a,g,e,N,a,m,e,I,D,S,e,r,v,i,c,e);
static const XMLCh _MetadataProvider[] = UNICODE_LITERAL_16(M,e,t,a,d,a,t,a,P,r,o,v,i,d,e,r);
static const XMLCh NameIDMgmt[] = UNICODE_LITERAL_10(N,a,m,e,I,D,M,g,m,t);
static const XMLCh Notify[] = UNICODE_LITERAL_6(N,o,t,i,f,y);
@@ -519,29 +517,6 @@ void XMLApplication::doHandlers(const DOMElement* e, Category& log)
conf.LogoutInitiatorManager.newPlugin(t.c_str(), pair<const DOMElement*,const char*>(child, getId()), m_deprecationSupport)
);
}
- else if (XMLString::equals(child->getLocalName(), _ArtifactResolutionService)) {
- string bindprop(XMLHelper::getAttrString(child, nullptr, Binding));
- if (bindprop.empty() || !*child->getAttributeNS(nullptr, Location)) {
- log.error("ArtifactResolutionService element has empty Binding or Location attribute, skipping it...");
- child = XMLHelper::getNextSiblingElement(child);
- continue;
- }
- handler.reset(
- conf.ArtifactResolutionServiceManager.newPlugin(bindprop.c_str(), pair<const DOMElement*,const char*>(child, getId()), m_deprecationSupport)
- );
-
- if (!hardArt) {
- pair<bool,bool> defprop = handler->getBool("isDefault");
- if (defprop.first) {
- if (defprop.second) {
- hardArt = true;
- m_artifactResolutionDefault = handler.get();
- }
- }
- else if (!m_artifactResolutionDefault)
- m_artifactResolutionDefault = handler.get();
- }
- }
else if (XMLString::equals(child->getLocalName(), _SingleLogoutService)) {
string bindprop(XMLHelper::getAttrString(child, nullptr, Binding));
if (bindprop.empty() || !*child->getAttributeNS(nullptr, Location)) {
@@ -614,11 +589,8 @@ DOMNodeFilter::FilterAction XMLApplication::acceptNode(const DOMNode* node) cons
XMLString::equals(name, Notify) ||
XMLString::equals(name, _Handler) ||
XMLString::equals(name, _AssertionConsumerService) ||
- XMLString::equals(name, _ArtifactResolutionService) ||
XMLString::equals(name, Logout) ||
XMLString::equals(name, _LogoutInitiator) ||
- XMLString::equals(name, _ManageNameIDService) ||
- XMLString::equals(name, NameIDMgmt) ||
XMLString::equals(name, _SessionInitiator) ||
XMLString::equals(name, _SingleLogoutService) ||
XMLString::equals(name, SSO) ||
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list