[cpp-sp] 02/02: Get rid of legacy htaccess ACL provider.

[Codeberg]

This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch main
in repository cpp-sp.

View the commit online:
https://codeberg.org/Shibboleth/cpp-sp/commit/f8586927e7ffb26f8d37555d6e4e6a53ee2f38dd

commit f8586927e7ffb26f8d37555d6e4e6a53ee2f38dd
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jan 13 13:05:46 2026 -0500

    Get rid of legacy htaccess ACL provider.
---
 apache/mod_shib4.cpp             |  5 -----
 shibsp/AccessControl.h           |  3 ---
 shibsp/Agent.cpp                 |  5 ++---
 shibsp/impl/XMLRequestMapper.cpp | 22 +++++++---------------
 4 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/apache/mod_shib4.cpp b/apache/mod_shib4.cpp
index 54f725fd..b7b19d9a 100644
--- a/apache/mod_shib4.cpp
+++ b/apache/mod_shib4.cpp
@@ -757,11 +757,6 @@ private:
     bool m_partialRegexMatching;
 };
 
-AccessControl* htAccessFactory(const ptree&, bool)
-{
-    return new htAccessControl();
-}
-
 AccessControl::aclresult_t htAccessControl::doAccessControl(const ShibTargetApache& sta, const Session* session, const char* plugin) const
 {
     aclresult_t result = shib_acl_false;
diff --git a/shibsp/AccessControl.h b/shibsp/AccessControl.h
index 42b6405b..de3db2ba 100644
--- a/shibsp/AccessControl.h
+++ b/shibsp/AccessControl.h
@@ -70,9 +70,6 @@ namespace shibsp {
 
     /** AccessControl based on XML syntax. */
     #define XML_ACCESS_CONTROL      "XML"
-
-    /** Reserved for Apache-style .htaccess support. */
-    #define HT_ACCESS_CONTROL       "htaccess"
 };
 
 #endif /* __shibsp_acl_h__ */
diff --git a/shibsp/Agent.cpp b/shibsp/Agent.cpp
index 724da36e..7029992c 100644
--- a/shibsp/Agent.cpp
+++ b/shibsp/Agent.cpp
@@ -267,8 +267,7 @@ pair<bool,long> Agent::doAuthentication(SPRequest& request, bool handler) const
 
         // We're done.  Everything is okay.  Nothing to report.  Nothing to do..
         // Let the caller decide how to proceed.
-        request.debug("doAuthentication succeeded");
-        return make_pair(false,0L);
+        return make_pair(false, 0L);
     }
     catch (exception& e) {
         return make_pair(true, handleError(request, nullptr, &e));
@@ -342,7 +341,7 @@ pair<bool,long> Agent::doExport(SPRequest& request, bool requireSession) const
         RequestMapper::Settings settings = request.getRequestSettings();
 
         try {
-            session = request.getSession(false, false);  // ignore timeout and do not cache
+            session = request.getSession(false, false);  // ignore timeout and address check here
         }
         catch (const exception& e) {
             request.warn("unable to obtain session to export to request: %s", e.what());
diff --git a/shibsp/impl/XMLRequestMapper.cpp b/shibsp/impl/XMLRequestMapper.cpp
index d8022621..7a386795 100644
--- a/shibsp/impl/XMLRequestMapper.cpp
+++ b/shibsp/impl/XMLRequestMapper.cpp
@@ -226,28 +226,20 @@ void Override::loadACL(ptree& pt, Category& log)
 
     static const char ACCESS_CONTROL_PROP_PATH[] = "AccessControl";
     static const char ACCESS_CONTROL_PROVIDER_PROP_PATH[] = "AccessControlProvider";
-    static const char HTACCESS_PROP_PATH[] = "htaccess";
     static const char TYPE_PROP_PATH[] = "<xmlattr>.type";
 
     try {
-        boost::optional<ptree&> acl = pt.get_child_optional(HTACCESS_PROP_PATH);
+        boost::optional<ptree&> acl = pt.get_child_optional(ACCESS_CONTROL_PROP_PATH);
         if (acl) {
-            log.info("building Apache htaccess AccessControl provider...");
-            m_acl.reset(AgentConfig::getConfig().AccessControlManager.newPlugin(HT_ACCESS_CONTROL, acl.get(), false));
+            log.info("building inline XML-based AccessControl provider...");
+            m_acl.reset(AgentConfig::getConfig().AccessControlManager.newPlugin(XML_ACCESS_CONTROL, acl.get(), false));
         }
         else {
-            acl = pt.get_child_optional(ACCESS_CONTROL_PROP_PATH);
+            acl = pt.get_child_optional(ACCESS_CONTROL_PROVIDER_PROP_PATH);
             if (acl) {
-                log.info("building inline XML-based AccessControl provider...");
-                m_acl.reset(AgentConfig::getConfig().AccessControlManager.newPlugin(XML_ACCESS_CONTROL, acl.get(), false));
-            }
-            else {
-                acl = pt.get_child_optional(ACCESS_CONTROL_PROVIDER_PROP_PATH);
-                if (acl) {
-                    string t(acl->get(TYPE_PROP_PATH, "XML"));
-                    log.info("building AccessControl provider of type %s...", t.c_str());
-                    m_acl.reset(AgentConfig::getConfig().AccessControlManager.newPlugin(t.c_str(), acl.get(), false));
-                }
+                string t(acl->get(TYPE_PROP_PATH, "XML"));
+                log.info("building AccessControl provider of type %s...", t.c_str());
+                m_acl.reset(AgentConfig::getConfig().AccessControlManager.newPlugin(t.c_str(), acl.get(), false));
             }
         }
     }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.