ClusterLabs · nrwahl2 · Dec 25, 2025 · Dec 25, 2025 · Dec 25, 2025 · Dec 25, 2025
diff --git a/cts/cli/regression.acls.exp b/cts/cli/regression.acls.exp
@@ -537,7 +537,7 @@ crm_attribute: Error performing operation: Permission denied
 * Passed: crm_attribute         - unknownguy: Set fencing-enabled
 =#=#=#= Begin test: unknownguy: Create a resource =#=#=#=
 pcmk__check_acl 	trace: Lack of ACL denies user 'unknownguy' read/write access to /cib/configuration/resources/primitive[@id='dummy']
-pcmk__apply_creation_acl 	trace: ACLs disallow creation of <primitive> with id="dummy"
+check_creation_disallowed 	trace: ACLs disallow creation of <primitive> with id="dummy"
 cibadmin: CIB API call failed: Permission denied
 =#=#=#= End test: unknownguy: Create a resource - Insufficient privileges (4) =#=#=#=
 * Passed: cibadmin              - unknownguy: Create a resource
@@ -555,7 +555,7 @@ crm_attribute: Error performing operation: Permission denied
 * Passed: crm_attribute         - l33t-haxor: Set fencing-enabled
 =#=#=#= Begin test: l33t-haxor: Create a resource =#=#=#=
 pcmk__check_acl 	trace: Parent ACL denies user 'l33t-haxor' read/write access to /cib/configuration/resources/primitive[@id='dummy']
-pcmk__apply_creation_acl 	trace: ACLs disallow creation of <primitive> with id="dummy"
+check_creation_disallowed 	trace: ACLs disallow creation of <primitive> with id="dummy"
 cibadmin: CIB API call failed: Permission denied
 =#=#=#= End test: l33t-haxor: Create a resource - Insufficient privileges (4) =#=#=#=
 * Passed: cibadmin              - l33t-haxor: Create a resource
@@ -639,7 +639,7 @@ crm_attribute: Error performing operation: Permission denied
 =#=#=#= End test: niceguy: Set enable-acl - Insufficient privileges (4) =#=#=#=
 * Passed: crm_attribute         - niceguy: Set enable-acl
 =#=#=#= Begin test: niceguy: Set fencing-enabled =#=#=#=
-pcmk__apply_creation_acl 	trace: ACLs allow creation of <nvpair> with id="cib-bootstrap-options-fencing-enabled"
+check_creation_disallowed 	trace: ACLs allow creation of <nvpair> with id="cib-bootstrap-options-fencing-enabled"
 =#=#=#= Current cib after: niceguy: Set fencing-enabled =#=#=#=
 <cib epoch="10" num_updates="0" admin_epoch="0">
   <configuration>
@@ -716,7 +716,7 @@ pcmk__apply_creation_acl 	trace: ACLs allow creation of <nvpair> with id="cib-bo
 * Passed: crm_attribute         - niceguy: Set fencing-enabled
 =#=#=#= Begin test: niceguy: Create a resource =#=#=#=
 pcmk__check_acl 	trace: Default ACL denies user 'niceguy' read/write access to /cib/configuration/resources/primitive[@id='dummy']
-pcmk__apply_creation_acl 	trace: ACLs disallow creation of <primitive> with id="dummy"
+check_creation_disallowed 	trace: ACLs disallow creation of <primitive> with id="dummy"
 cibadmin: CIB API call failed: Permission denied
 =#=#=#= End test: niceguy: Create a resource - Insufficient privileges (4) =#=#=#=
 * Passed: cibadmin              - niceguy: Create a resource
@@ -1041,8 +1041,8 @@ crm_resource: Error performing operation: Insufficient privileges
 * Passed: crm_resource          - l33t-haxor: Remove a resource meta attribute
 =#=#=#= Begin test: niceguy: Create a resource meta attribute =#=#=#=
 unpack_resources 	error: Resource start-up disabled since no fencing resources have been defined. Either configure some or disable fencing with the fencing-enabled option. NOTE: Clusters with shared data need fencing to ensure data integrity.
-pcmk__apply_creation_acl 	trace: Creation of <meta_attributes> scaffolding with id="dummy-meta_attributes" is implicitly allowed
-pcmk__apply_creation_acl 	trace: ACLs allow creation of <nvpair> with id="dummy-meta_attributes-target-role"
+check_creation_disallowed 	trace: Creation of <meta_attributes> scaffolding with id="dummy-meta_attributes" is implicitly allowed
+check_creation_disallowed 	trace: ACLs allow creation of <nvpair> with id="dummy-meta_attributes-target-role"
 Set 'dummy' option: id=dummy-meta_attributes-target-role set=dummy-meta_attributes name=target-role value=Stopped
 =#=#=#= Current cib after: niceguy: Create a resource meta attribute =#=#=#=
 <cib epoch="14" num_updates="0" admin_epoch="0">
@@ -1293,7 +1293,7 @@ Deleted 'dummy' option: id=dummy-meta_attributes-target-role name=target-role
 * Passed: crm_resource          - niceguy: Remove a resource meta attribute
 =#=#=#= Begin test: niceguy: Create a resource meta attribute =#=#=#=
 unpack_resources 	error: Resource start-up disabled since no fencing resources have been defined. Either configure some or disable fencing with the fencing-enabled option. NOTE: Clusters with shared data need fencing to ensure data integrity.
-pcmk__apply_creation_acl 	trace: ACLs allow creation of <nvpair> with id="dummy-meta_attributes-target-role"
+check_creation_disallowed 	trace: ACLs allow creation of <nvpair> with id="dummy-meta_attributes-target-role"
 Set 'dummy' option: id=dummy-meta_attributes-target-role set=dummy-meta_attributes name=target-role value=Started
 =#=#=#= Current cib after: niceguy: Create a resource meta attribute =#=#=#=
 <cib epoch="16" num_updates="0" admin_epoch="0">
@@ -1514,7 +1514,7 @@ cibadmin: CIB API call failed: Permission denied
 =#=#=#= Begin test: niceguy: Replace - create resource =#=#=#=
 pcmk__check_acl 	trace: Default ACL denies user 'niceguy' read/write access to /cib[@epoch]
 pcmk__check_acl 	trace: Default ACL denies user 'niceguy' read/write access to /cib/configuration/resources/primitive[@id='dummy2']
-pcmk__apply_creation_acl 	trace: ACLs disallow creation of <primitive> with id="dummy2"
+check_creation_disallowed 	trace: ACLs disallow creation of <primitive> with id="dummy2"
 cibadmin: CIB API call failed: Permission denied
 =#=#=#= End test: niceguy: Replace - create resource - Insufficient privileges (4) =#=#=#=
 * Passed: cibadmin              - niceguy: Replace - create resource
@@ -2546,7 +2546,7 @@ cibadmin: CIB API call failed: Permission denied
   <status/>
 </cib>
 =#=#=#= Begin test: mike: Create another resource =#=#=#=
-pcmk__apply_creation_acl 	trace: ACLs allow creation of <primitive> with id="dummy2"
+check_creation_disallowed 	trace: ACLs allow creation of <primitive> with id="dummy2"
 =#=#=#= Current cib after: mike: Create another resource =#=#=#=
 <cib epoch="26" num_updates="0" admin_epoch="0">
   <configuration>

diff --git a/cts/cts-cli.in b/cts/cts-cli.in
@@ -249,6 +249,7 @@ def sanitize_output(s):
         (r'(<change-attr name="crm_feature_set" .* value=")[0-9.]*"', r'\1"'),
         (r'(<change-attr name="validate-with" .* value="pacemaker-)[0-9.]+"', r'\1X"'),
         (r'(<cib.*) cib-last-written="[^"]*"', r'\1'),
+        (r'\((check_creation_disallowed.*)@.*\.c:[0-9]+\)', r'\1'),
         (r'crm_feature_set="[^"]*" ', r''),
         (r'@crm_feature_set=[0-9.]+, ', r''),
         (r'\(crm_time_parse_duration@.*\.c:[0-9]+\)', r'crm_time_parse_duration'),
@@ -2942,7 +2943,7 @@ class AclsRegressionTest(RegressionTest):
         return [
             ShadowTestGroup(basic_tests + [
                             TestGroup(loop_tests,
-                                      env={"PCMK_trace_functions": "pcmk__check_acl,pcmk__apply_creation_acl"})]),
+                                      env={"PCMK_trace_functions": "pcmk__check_acl,check_creation_disallowed"})]),
         ]
 
 

diff --git a/daemons/attrd/attrd_messages.c b/daemons/attrd/attrd_messages.c
@@ -25,9 +25,10 @@ int minimum_protocol_version = -1;
 static GHashTable *attrd_handlers = NULL;
 
 static bool
-is_sync_point_attr(xmlAttrPtr attr, void *data)
+is_sync_point_attr(const xmlAttr *attr, void *data)
 {
-    return pcmk__str_eq((const char *) attr->name, PCMK__XA_ATTR_SYNC_POINT, pcmk__str_none);
+    return pcmk__str_eq((const char *) attr->name, PCMK__XA_ATTR_SYNC_POINT,
+                        pcmk__str_none);
 }
 
 static int

diff --git a/daemons/controld/controld_join_dc.c b/daemons/controld/controld_join_dc.c
@@ -968,11 +968,9 @@ finalize_join_for(gpointer key, gpointer value, gpointer user_data)
                 }
 
                 remote = pcmk__xe_create(remotes, PCMK_XE_NODE);
-                pcmk__xe_set_props(remote,
-                                   PCMK_XA_ID, node->name,
-                                   PCMK__XA_NODE_STATE, node->state,
-                                   PCMK__XA_CONNECTION_HOST, node->conn_host,
-                                   NULL);
+                pcmk__xe_set(remote, PCMK_XA_ID, node->name);
+                pcmk__xe_set(remote, PCMK__XA_NODE_STATE, node->state);
+                pcmk__xe_set(remote, PCMK__XA_CONNECTION_HOST, node->conn_host);
             }
         }
     }

diff --git a/daemons/pacemakerd/pacemakerd.c b/daemons/pacemakerd/pacemakerd.c
@@ -67,12 +67,12 @@ PCMK__OUTPUT_ARGS("features")
 static int
 pacemakerd_features_xml(pcmk__output_t *out, va_list args) {
     gchar **feature_list = g_strsplit(CRM_FEATURES, " ", 0);
+    xmlNode *xml = pcmk__output_xml_create_parent(out, PCMK_XE_PACEMAKERD);
+
+    pcmk__xe_set(xml, PCMK_XA_VERSION, PACEMAKER_VERSION);
+    pcmk__xe_set(xml, PCMK_XA_BUILD, BUILD_VERSION);
+    pcmk__xe_set(xml, PCMK_XA_FEATURE_SET, CRM_FEATURE_SET);
 
-    pcmk__output_xml_create_parent(out, PCMK_XE_PACEMAKERD,
-                                   PCMK_XA_VERSION, PACEMAKER_VERSION,
-                                   PCMK_XA_BUILD, BUILD_VERSION,
-                                   PCMK_XA_FEATURE_SET, CRM_FEATURE_SET,
-                                   NULL);
     out->begin_list(out, NULL, NULL, PCMK_XE_FEATURES);
 
     for (char **s = feature_list; *s != NULL; s++) {

diff --git a/include/crm/common/acl.h b/include/crm/common/acl.h
@@ -24,11 +24,6 @@ extern "C" {
  */
 
 void xml_acl_disable(xmlNode *xml);
-bool xml_acl_denied(const xmlNode *xml);
-bool xml_acl_filtered_copy(const char *user, xmlNode* acl_source, xmlNode *xml,
-                           xmlNode **result);
-
-bool pcmk_acl_required(const char *user);
 
 #ifdef __cplusplus
 }

diff --git a/include/crm/common/acl_compat.h b/include/crm/common/acl_compat.h
@@ -30,6 +30,16 @@ extern "C" {
 //! \deprecated Do not use
 bool xml_acl_enabled(const xmlNode *xml);
 
+//! \deprecated Do not use
+bool xml_acl_filtered_copy(const char *user, xmlNode *acl_source, xmlNode *xml,
+                           xmlNode **result);
+
+//! \deprecated Do not use
+bool xml_acl_denied(const xmlNode *xml);
+
+//! \deprecated Do not use
+bool pcmk_acl_required(const char *user);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/crm/common/acl_internal.h b/include/crm/common/acl_internal.h
@@ -32,7 +32,25 @@ pcmk__is_privileged(const char *user)
     return user && (!strcmp(user, CRM_DAEMON_USER) || !strcmp(user, "root"));
 }
 
-void pcmk__enable_acl(xmlNode *acl_source, xmlNode *target, const char *user);
+/*!
+ * \internal
+ * \brief Check whether an ACL is required for a given user to access the CIB
+ *
+ * \param[in] user  User name
+ *
+ * \return \c true if \p user requires an ACL to access the CIB, or \c false
+ *         otherwise
+ */
+static inline bool
+pcmk__acl_required(const char *user)
+{
+    return !pcmk__str_empty(user) && !pcmk__is_privileged(user);
+}
+
+void pcmk__enable_acls(xmlDoc *source, xmlDoc *target, const char *user);
+
+xmlNode *pcmk__acl_filtered_copy(const char *user, xmlDoc *acl_source,
+                                 xmlNode *xml);
 
 bool pcmk__check_acl(xmlNode *xml, const char *attr_name,
                      enum pcmk__xml_flags mode);

diff --git a/include/crm/common/internal.h b/include/crm/common/internal.h
@@ -32,6 +32,7 @@
 #include <crm/common/nvpair_internal.h>
 #include <crm/common/scores_internal.h>
 #include <crm/common/strings_internal.h>    // pcmk__assert_asprintf()
+#include <crm/common/xml_attr_internal.h>
 #include <crm/common/acl_internal.h>
 
 #ifdef __cplusplus

diff --git a/include/crm/common/output_internal.h b/include/crm/common/output_internal.h
@@ -753,11 +753,9 @@ void pcmk__output_set_log_filter(pcmk__output_t *out, const char *file,
  *
  * \param[in,out] out  The output functions structure.
  * \param[in]     name The name of the node to be created.
- * \param[in]     ...     Name/value pairs to set as XML properties.
  */
-xmlNodePtr
-pcmk__output_xml_create_parent(pcmk__output_t *out, const char *name, ...)
-G_GNUC_NULL_TERMINATED;
+xmlNode *
+pcmk__output_xml_create_parent(pcmk__output_t *out, const char *name);
 
 /*!
  * \internal
@@ -777,11 +775,9 @@ pcmk__output_xml_add_node_copy(pcmk__output_t *out, xmlNodePtr node);
  *
  * \param[in,out] out  The output functions structure.
  * \param[in]     name The name of the node to be created.
- * \param[in]     ...     Name/value pairs to set as XML properties.
  */
-xmlNodePtr
-pcmk__output_create_xml_node(pcmk__output_t *out, const char *name, ...)
-G_GNUC_NULL_TERMINATED;
+xmlNode *
+pcmk__output_create_xml_node(pcmk__output_t *out, const char *name);
 
 /*!
  * \internal

diff --git a/include/crm/common/xml_attr_internal.h b/include/crm/common/xml_attr_internal.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2025 the Pacemaker project contributors
+ *
+ * The version control history for this file may have further details.
+ *
+ * This source code is licensed under the GNU Lesser General Public License
+ * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
+ */
+
+#ifndef PCMK__CRM_COMMON_XML_ATTR_INTERNAL__H
+#define PCMK__CRM_COMMON_XML_ATTR_INTERNAL__H
+
+/*
+ * Internal-only wrappers for and extensions to libxml2 for processing XML
+ * attributes
+ */
+
+#include <stdbool.h>        // bool
+
+#include <libxml/tree.h>    // xmlAttr
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool pcmk__xa_insert_dup(const xmlAttr *attr, void *user_data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // PCMK__XML_ATTR_INTERNAL__H
diff --git a/include/crm/common/xml_element_internal.h b/include/crm/common/xml_element_internal.h
@@ -33,13 +33,19 @@ extern "C" {
 
 const char *pcmk__xe_add_last_written(xmlNode *xe);
 
+bool pcmk__xe_foreach_attr(xmlNode *xml, bool (*fn)(xmlAttr *, void *),
+                           void *user_data);
+bool pcmk__xe_foreach_const_attr(const xmlNode *xml,
+                                 bool (*fn)(const xmlAttr *, void *),
+                                 void *user_data);
+
 xmlNode *pcmk__xe_first_child(const xmlNode *parent, const char *node_name,
                               const char *attr_n, const char *attr_v);
 
 void pcmk__xe_remove_attr(xmlNode *element, const char *name);
 bool pcmk__xe_remove_attr_cb(xmlNode *xml, void *user_data);
 void pcmk__xe_remove_matching_attrs(xmlNode *element, bool force,
-                                    bool (*match)(xmlAttrPtr, void *),
+                                    bool (*match)(const xmlAttr *, void *),
                                     void *user_data);
 int pcmk__xe_delete_match(xmlNode *xml, xmlNode *search);
 int pcmk__xe_replace_match(xmlNode *xml, xmlNode *replace);
@@ -76,31 +82,6 @@ void pcmk__xe_sort_attrs(xmlNode *xml);
 void pcmk__xe_set_id(xmlNode *xml, const char *format, ...)
     G_GNUC_PRINTF(2, 3);
 
-/*!
- * \internal
- * \brief Like pcmk__xe_set_props, but takes a va_list instead of
- *        arguments directly.
- *
- * \param[in,out] node   XML to add attributes to
- * \param[in]     pairs  NULL-terminated list of name/value pairs to add
- */
-void
-pcmk__xe_set_propv(xmlNodePtr node, va_list pairs);
-
-/*!
- * \internal
- * \brief Add a NULL-terminated list of name/value pairs to the given
- *        XML node as properties.
- *
- * \param[in,out] node XML node to add properties to
- * \param[in]     ...  NULL-terminated list of name/value pairs
- *
- * \note A NULL name terminates the arguments; a NULL value will be skipped.
- */
-void
-pcmk__xe_set_props(xmlNodePtr node, ...)
-G_GNUC_NULL_TERMINATED;
-
 /*!
  * \internal
  * \brief Get first attribute of an XML element

diff --git a/include/crm/common/xml_internal.h b/include/crm/common/xml_internal.h
@@ -29,6 +29,7 @@
 #include <crm/common/xml_idref_internal.h>
 #include <crm/common/xml_io_internal.h>
 #include <crm/common/xml_names_internal.h>
+#include <crm/common/xml_tracking_internal.h>
 #include <crm/common/xpath_internal.h>
 
 #include <libxml/relaxng.h>
@@ -255,7 +256,6 @@ enum pcmk__xml_escape_type {
     pcmk__xml_escape_attr_pretty,
 };
 
-bool pcmk__xml_needs_escape(const char *text, enum pcmk__xml_escape_type type);
 char *pcmk__xml_escape(const char *text, enum pcmk__xml_escape_type type);
 
 /*!
@@ -421,17 +421,28 @@ enum pcmk__xml_flags {
 void pcmk__xml_doc_set_flags(xmlDoc *doc, uint32_t flags);
 bool pcmk__xml_doc_all_flags_set(const xmlDoc *xml, uint32_t flags);
 
-void pcmk__xml_commit_changes(xmlDoc *doc);
-void pcmk__xml_mark_changes(xmlNode *old_xml, xmlNode *new_xml);
-
+bool pcmk__xml_foreach_child(xmlNode *xml, bool (*fn)(xmlNode *, void *),
+                             void *user_data);
 bool pcmk__xml_tree_foreach(xmlNode *xml, bool (*fn)(xmlNode *, void *),
                             void *user_data);
 
+/*!
+ * \internal
+ * \brief Get an XML attribute's value
+ *
+ * \param[in] attr  XML attribute
+ *
+ * \return Value of \p attr, or \c NULL if \p attr is \c NULL or its value is
+ *         unset
+ */
 static inline const char *
 pcmk__xml_attr_value(const xmlAttr *attr)
 {
-    return ((attr == NULL) || (attr->children == NULL))? NULL
-           : (const char *) attr->children->content;
+    if ((attr == NULL) || (attr->children == NULL)) {
+        return NULL;
+    }
+
+    return (const char *) attr->children->content;
 }
 
 void pcmk__xml_patchset_add_digest(xmlNode *patchset, const xmlNode *target);

diff --git a/include/crm/common/xml_tracking_internal.h b/include/crm/common/xml_tracking_internal.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2017-2025 the Pacemaker project contributors
+ *
+ * The version control history for this file may have further details.
+ *
+ * This source code is licensed under the GNU Lesser General Public License
+ * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
+ */
+
+#ifndef PCMK__CRM_COMMON_XML_TRACKING_INTERNAL__H
+#define PCMK__CRM_COMMON_XML_TRACKING_INTERNAL__H
+
+/*
+ * Internal-only functions for tracking, calculating, and committing XML changes
+ */
+
+#include <libxml/tree.h>    // xmlDoc, xmlNode
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void pcmk__xml_mark_changes(xmlNode *old_xml, xmlNode *new_xml);
+void pcmk__xml_commit_changes(xmlDoc *doc);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // PCMK__CRM_COMMON_XML_TRACKING_INTERNAL__H