[cpp-sp] branch main updated: Remove Transform SessionInitiator.
Scott Cantor
cantor.2 at osu.edu
Mon Nov 4 16:58:07 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=838e5436e0be6ab914e81b31afbaebd47b1f32a1
The following commit(s) were added to refs/heads/main by this push:
new 838e5436 Remove Transform SessionInitiator.
838e5436 is described below
commit 838e5436e0be6ab914e81b31afbaebd47b1f32a1
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 4 11:58:01 2024 -0500
Remove Transform SessionInitiator.
---
Projects/vc15/shibsp/shibsp.vcxproj | 1 -
shibsp/Makefile.am | 1 -
shibsp/handler/SessionInitiator.h | 3 -
shibsp/handler/impl/SessionInitiator.cpp | 2 -
shibsp/handler/impl/TransformSessionInitiator.cpp | 290 ----------------------
5 files changed, 297 deletions(-)
diff --git a/Projects/vc15/shibsp/shibsp.vcxproj b/Projects/vc15/shibsp/shibsp.vcxproj
index 70043de7..1f46ccdf 100644
--- a/Projects/vc15/shibsp/shibsp.vcxproj
+++ b/Projects/vc15/shibsp/shibsp.vcxproj
@@ -245,7 +245,6 @@
<ClCompile Include="..\..\..\shibsp\handler\impl\SessionHandler.cpp" />
<ClCompile Include="..\..\..\shibsp\handler\impl\SessionInitiator.cpp" />
<ClCompile Include="..\..\..\shibsp\handler\impl\StatusHandler.cpp" />
- <ClCompile Include="..\..\..\shibsp\handler\impl\TransformSessionInitiator.cpp" />
<ClCompile Include="..\..\..\shibsp\lite\CommonDomainCookie.cpp" />
<ClCompile Include="..\..\..\shibsp\lite\SAMLConstants.cpp" />
<ClCompile Include="..\..\..\shibsp\version.cpp" />
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 53b04eb8..2a349313 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -105,7 +105,6 @@ libshibsp_la_SOURCES = \
handler/impl/SessionHandler.cpp \
handler/impl/SessionInitiator.cpp \
handler/impl/StatusHandler.cpp \
- handler/impl/TransformSessionInitiator.cpp \
impl/ChainingAccessControl.cpp \
impl/StoredSession.cpp \
impl/StorageServiceSessionCache.cpp \
diff --git a/shibsp/handler/SessionInitiator.h b/shibsp/handler/SessionInitiator.h
index 0f9be37a..d0dfd796 100644
--- a/shibsp/handler/SessionInitiator.h
+++ b/shibsp/handler/SessionInitiator.h
@@ -103,9 +103,6 @@ namespace shibsp {
/** SessionInitiator that supports SAML Discovery Service protocol. */
#define SAMLDS_SESSION_INITIATOR "SAMLDS"
- /** SessionInitiator that attempts a sequence of transforms of an input until an entityID is found. */
- #define TRANSFORM_SESSION_INITIATOR "Transform"
-
/** SessionInitiator that uses HTML form submission from the user. */
#define FORM_SESSION_INITIATOR "Form"
diff --git a/shibsp/handler/impl/SessionInitiator.cpp b/shibsp/handler/impl/SessionInitiator.cpp
index 64148986..7090ee14 100644
--- a/shibsp/handler/impl/SessionInitiator.cpp
+++ b/shibsp/handler/impl/SessionInitiator.cpp
@@ -42,7 +42,6 @@ namespace shibsp {
SHIBSP_DLLLOCAL PluginManager< SessionInitiator,string,pair<const DOMElement*,const char*> >::Factory ChainingSessionInitiatorFactory;
SHIBSP_DLLLOCAL PluginManager< SessionInitiator,string,pair<const DOMElement*,const char*> >::Factory SAML2SessionInitiatorFactory;
SHIBSP_DLLLOCAL PluginManager< SessionInitiator,string,pair<const DOMElement*,const char*> >::Factory SAMLDSSessionInitiatorFactory;
- SHIBSP_DLLLOCAL PluginManager< SessionInitiator,string,pair<const DOMElement*,const char*> >::Factory TransformSessionInitiatorFactory;
SHIBSP_DLLLOCAL PluginManager< SessionInitiator,string,pair<const DOMElement*,const char*> >::Factory FormSessionInitiatorFactory;
SHIBSP_DLLLOCAL PluginManager< SessionInitiator,string,pair<const DOMElement*,const char*> >::Factory CookieSessionInitiatorFactory;
};
@@ -53,7 +52,6 @@ void SHIBSP_API shibsp::registerSessionInitiators()
conf.SessionInitiatorManager.registerFactory(CHAINING_SESSION_INITIATOR, ChainingSessionInitiatorFactory);
conf.SessionInitiatorManager.registerFactory(SAML2_SESSION_INITIATOR, SAML2SessionInitiatorFactory);
conf.SessionInitiatorManager.registerFactory(SAMLDS_SESSION_INITIATOR, SAMLDSSessionInitiatorFactory);
- conf.SessionInitiatorManager.registerFactory(TRANSFORM_SESSION_INITIATOR, TransformSessionInitiatorFactory);
conf.SessionInitiatorManager.registerFactory(FORM_SESSION_INITIATOR, FormSessionInitiatorFactory);
conf.SessionInitiatorManager.registerFactory(COOKIE_SESSION_INITIATOR, CookieSessionInitiatorFactory);
}
diff --git a/shibsp/handler/impl/TransformSessionInitiator.cpp b/shibsp/handler/impl/TransformSessionInitiator.cpp
deleted file mode 100644
index 0be3b53c..00000000
--- a/shibsp/handler/impl/TransformSessionInitiator.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-/**
- * 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.
- *
- * 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
- *
- * 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.
- */
-
-/**
- * TransformSessionInitiator.cpp
- *
- * Support for mapping input into an entityID using a transform.
- */
-
-#include "internal.h"
-#include "Application.h"
-#include "exceptions.h"
-#include "ServiceProvider.h"
-#include "SPRequest.h"
-#include "handler/AbstractHandler.h"
-#include "handler/RemotedHandler.h"
-#include "handler/SessionInitiator.h"
-#include "util/SPConstants.h"
-
-#ifndef SHIBSP_LITE
-# include "metadata/MetadataProviderCriteria.h"
-# include <saml/saml2/metadata/Metadata.h>
-#endif
-#include <boost/tuple/tuple.hpp>
-#include <xmltooling/XMLToolingConfig.h>
-#include <xmltooling/util/URLEncoder.h>
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/regx/RegularExpression.hpp>
-
-using namespace shibsp;
-using namespace opensaml::saml2md;
-using namespace opensaml;
-using namespace xmltooling;
-using namespace boost;
-using namespace std;
-
-namespace shibsp {
-
-#if defined (_MSC_VER)
- #pragma warning( push )
- #pragma warning( disable : 4250 )
-#endif
-
- class SHIBSP_DLLLOCAL TransformSINodeFilter : public DOMNodeFilter
- {
- public:
- FilterAction acceptNode(const DOMNode* node) const {
- return FILTER_REJECT;
- }
- };
-
- static SHIBSP_DLLLOCAL TransformSINodeFilter g_TSINFilter;
-
-#ifndef SHIBSP_LITE
- static const XMLCh force[] = UNICODE_LITERAL_5(f,o,r,c,e);
- static const XMLCh match[] = UNICODE_LITERAL_5(m,a,t,c,h);
- static const XMLCh Regex[] = UNICODE_LITERAL_5(R,e,g,e,x);
- static const XMLCh Subst[] = UNICODE_LITERAL_5(S,u,b,s,t);
-#endif
-
- class SHIBSP_DLLLOCAL TransformSessionInitiator : public SessionInitiator, public AbstractHandler, public RemotedHandler
- {
- public:
- TransformSessionInitiator(const DOMElement* e, const char* appId)
- : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT ".SessionInitiator.Transform"), &g_TSINFilter), m_appId(appId) {
- // If Location isn't set, defer address registration until the setParent call.
- pair<bool,const char*> loc = getString("Location");
- if (loc.first) {
- string address = m_appId + loc.second + "::run::TransformSI";
- setAddress(address.c_str());
- }
- m_supportedOptions.insert("isPassive");
-
-#ifndef SHIBSP_LITE
- if (SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess)) {
- m_alwaysRun = getBool("alwaysRun").second;
- e = XMLHelper::getFirstChildElement(e);
- while (e) {
- if (e->hasChildNodes()) {
- bool flag = XMLHelper::getAttrBool(e, false, force);
- if (XMLString::equals(e->getLocalName(), Subst)) {
- auto_ptr_char temp(XMLHelper::getTextContent(e));
- if (temp.get() && *temp.get())
- m_subst.push_back(pair<bool,string>(flag, temp.get()));
- }
- else if (XMLString::equals(e->getLocalName(), Regex) && e->hasAttributeNS(nullptr, match)) {
- auto_ptr_char m(e->getAttributeNS(nullptr, match));
- auto_ptr_char repl(XMLHelper::getTextContent(e));
- if (m.get() && *m.get() && repl.get() && *repl.get())
- m_regex.push_back(boost::tuple<bool,string,string>(flag, m.get(), repl.get()));
- }
- else {
- m_log.warn("Unknown element found in Transform SessionInitiator configuration, check for errors.");
- }
- }
- e = XMLHelper::getNextSiblingElement(e);
- }
- }
-#endif
- SPConfig::getConfig().deprecation().warn(TRANSFORM_SESSION_INITIATOR" SessionInitiator is slated for removal");
- }
-
- virtual ~TransformSessionInitiator() {}
-
- void setParent(const PropertySet* parent);
- void receive(DDF& in, ostream& out);
- pair<bool,long> run(SPRequest& request, string& entityID, bool isHandler=true) const;
-
- private:
- void doRequest(const Application& application, string& entityID) const;
- string m_appId;
-#ifndef SHIBSP_LITE
- bool m_alwaysRun;
- vector< pair<bool, string> > m_subst;
- vector< boost::tuple<bool,string,string> > m_regex;
-#endif
- };
-
-#if defined (_MSC_VER)
- #pragma warning( pop )
-#endif
-
- SessionInitiator* SHIBSP_DLLLOCAL TransformSessionInitiatorFactory(const pair<const DOMElement*,const char*>& p, bool)
- {
- return new TransformSessionInitiator(p.first, p.second);
- }
-
-};
-
-void TransformSessionInitiator::setParent(const PropertySet* parent)
-{
- DOMPropertySet::setParent(parent);
- pair<bool,const char*> loc = getString("Location");
- if (loc.first) {
- string address = m_appId + loc.second + "::run::TransformSI";
- setAddress(address.c_str());
- }
- else {
- m_log.warn("no Location property in Transform SessionInitiator (or parent), can't register as remoted handler");
- }
-}
-
-pair<bool,long> TransformSessionInitiator::run(SPRequest& request, string& entityID, bool isHandler) const
-{
- // We have to have a candidate name to function.
- if (entityID.empty() || !checkCompatibility(request, isHandler))
- return make_pair(false, 0L);
-
- const Application& app = request.getApplication();
-
- m_log.debug("attempting to transform input (%s) into a valid entityID", entityID.c_str());
-
- if (SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess))
- doRequest(app, entityID);
- else {
- // Remote the call.
- DDF out,in = DDF(m_address.c_str()).structure();
- DDFJanitor jin(in), jout(out);
- in.addmember("application_id").string(app.getId());
- in.addmember("entity_id").string(entityID.c_str());
-
- // Remote the processing.
- out = send(request, in);
- if (out.isstring())
- entityID = out.string();
- }
-
- return make_pair(false, 0L);
-}
-
-void TransformSessionInitiator::receive(DDF& in, ostream& out)
-{
- // Find application.
- const char* aid = in["application_id"].string();
- const Application* app = aid ? SPConfig::getConfig().getServiceProvider()->getApplication(aid) : nullptr;
- if (!app) {
- // Something's horribly wrong.
- m_log.error("couldn't find application (%s) to generate AuthnRequest", aid ? aid : "(missing)");
- throw ConfigurationException("Unable to locate application for new session, deleted?");
- }
-
- const char* entityID = in["entity_id"].string();
- if (!entityID)
- throw ConfigurationException("No entityID parameter supplied to remoted SessionInitiator.");
-
- string copy(entityID);
- doRequest(*app, copy);
- DDF ret = DDF(nullptr).string(copy.c_str());
- DDFJanitor jout(ret);
- out << ret;
-}
-
-void TransformSessionInitiator::doRequest(const Application& application, string& entityID) const
-{
-#ifndef SHIBSP_LITE
- MetadataProvider* m = application.getMetadataProvider();
- Locker locker(m);
-
- MetadataProviderCriteria mc(application, entityID.c_str(), &IDPSSODescriptor::ELEMENT_QNAME);
- pair<const EntityDescriptor*,const RoleDescriptor*> entity;
- if (!m_alwaysRun) {
- // First check the original value, it might be valid already.
- entity = m->getEntityDescriptor(mc);
- if (entity.first)
- return;
- }
-
- m_log.debug("attempting transform of (%s)", entityID.c_str());
-
- // Guess not, try each subst.
- string transform;
- for (vector< pair<bool,string> >::const_iterator t = m_subst.begin(); t != m_subst.end(); ++t) {
- string::size_type pos = t->second.find("$entityID");
- if (pos == string::npos)
- continue;
- transform = t->second;
- transform.replace(pos, 9, entityID);
- if (t->first) {
- m_log.info("forcibly transformed entityID from (%s) to (%s)", entityID.c_str(), transform.c_str());
- entityID = transform;
- }
-
- m_log.debug("attempting lookup with entityID (%s)", transform.c_str());
-
- mc.entityID_ascii = transform.c_str();
- entity = m->getEntityDescriptor(mc);
- if (entity.first) {
- m_log.info("transformed entityID from (%s) to (%s)", entityID.c_str(), transform.c_str());
- if (!t->first)
- entityID = transform;
- return;
- }
- }
-
- // Now try regexs.
- for (vector< boost::tuple<bool,string,string> >::const_iterator r = m_regex.begin(); r != m_regex.end(); ++r) {
- try {
- RegularExpression exp(r->get<1>().c_str());
- XMLCh* temp = exp.replace(entityID.c_str(), r->get<2>().c_str());
- if (temp) {
- auto_ptr_char narrow(temp);
- XMLString::release(&temp);
-
- // For some reason it returns the match string if it doesn't match the expression.
- if (entityID == narrow.get())
- continue;
-
- if (r->get<0>()) {
- m_log.info("forcibly transformed entityID from (%s) to (%s)", entityID.c_str(), narrow.get());
- entityID = narrow.get();
- }
-
- m_log.debug("attempting lookup with entityID (%s)", narrow.get());
-
- mc.entityID_ascii = narrow.get();
- entity = m->getEntityDescriptor(mc);
- if (entity.first) {
- m_log.info("transformed entityID from (%s) to (%s)", entityID.c_str(), narrow.get());
- if (!r->get<0>())
- entityID = narrow.get();
- return;
- }
- }
- }
- catch (XMLException& ex) {
- auto_ptr_char msg(ex.getMessage());
- m_log.error("caught error applying regular expression: %s", msg.get());
- }
- }
-
- m_log.warn("unable to find a valid entityID based on the supplied input");
-#endif
-}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list