[cpp-sp] branch main updated: Default ACL plugin type in Apache rule.

[Scott Cantor]

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:
https://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=95612d5a17dafd93b43d2c92d61d19b966243cd5

The following commit(s) were added to refs/heads/main by this push:
     new 95612d5a Default ACL plugin type in Apache rule.
95612d5a is described below

commit 95612d5a17dafd93b43d2c92d61d19b966243cd5
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Oct 29 10:11:02 2025 -0400

    Default ACL plugin type in Apache rule.
---
 apache/mod_shib4.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apache/mod_shib4.cpp b/apache/mod_shib4.cpp
index 3251d34c..461002dc 100644
--- a/apache/mod_shib4.cpp
+++ b/apache/mod_shib4.cpp
@@ -778,12 +778,12 @@ AccessControl::aclresult_t htAccessControl::doAccessControl(const ShibTargetApac
     try {
         ptree pt;
         xml_parser::read_xml(plugin, pt, xml_parser::no_comments|xml_parser::trim_whitespace);
-        if (pt.size() != 1)
+        if (pt.size() != 1) {
             throw ConfigurationException("AccessControl plugin configuration did not contain the expected XML document.");
+        }
         ptree& pt_root = pt.front().second;
-        string t = pt_root.get("<xmlattr>.type", "");
-        if (t.empty())
-            throw ConfigurationException("Missing type attribute in AccessControl plugin configuration.");
+        // Default to XML type to allow "naked" rules since we have no other types for now (probably ever).
+        string t = pt_root.get("<xmlattr>.type", "XML");
         unique_ptr<AccessControl> aclplugin(AgentConfig::getConfig().AccessControlManager.newPlugin(t.c_str(), pt_root, true));
 #ifdef HAVE_CXX14
         shared_lock<AccessControl> acllock(*aclplugin);

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