Skip to content

ACL refactors: Functionize more of the unpacking stage #4039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clumens merged 24 commits into from
Feb 2, 2026
Merged

ACL refactors: Functionize more of the unpacking stage #4039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
57e7f5b
Refactor: libcrmcommon: Move pcmk__unpack_acls() definition
nrwahl2 Dec 25, 2025
4710705
Refactor: libcrmcommon: Functionizing unpacking an ACL role reference
nrwahl2 Dec 25, 2025
c2e1e0f
Refactor: libcrmcommon: Functionize resolving an ACL role reference
nrwahl2 Dec 25, 2025
3b2b70e
Fix: libcrmcommon: Make parse_acl_entry() non-recursive
nrwahl2 Dec 26, 2025
9739900
Refactor: libcrmcommon: Functionize unpacking child of ACL target/group
nrwahl2 Dec 26, 2025
aff4a32
Refactor: libcrmcommon: Functionize unpacking ACL target or group
nrwahl2 Dec 26, 2025
c6be482
Refactor: libcrmcommon: Functionize parsing ACL target/group separately
nrwahl2 Dec 26, 2025
f2b3096
Refactor: libcrmcommon: Use more literals in ACL unpack log messages
nrwahl2 Dec 26, 2025
fadd6e5
Refactor: libcrmcommon: Take xml_doc_private_t in pcmk__unpack_acls()
nrwahl2 Dec 26, 2025
a3a8ac9
Fix: libcrmcommon: xml_acl_filtered_copy() returns false for NULL source
nrwahl2 Dec 26, 2025
110d69d
Refactor: libcrmcommon: pcmk__enable_acl() takes xmlDoc args
nrwahl2 Dec 26, 2025
c204f60
Refactor: libcrmcommon: Use g_clear_pointer in reset_xml_private_data()
nrwahl2 Dec 26, 2025
e7e9ba1
Refactor: libcrmcommon: Set config error on unspecified ACL permission
nrwahl2 Dec 26, 2025
6821164
Refactor: libcrmcommon: create_acl() returns xml_acl_t *
nrwahl2 Dec 26, 2025
45912e8
Refactor: libcrmcommon: Unindent create_acl()
nrwahl2 Dec 26, 2025
fbcd554
Refactor: libcrmcommon: Use g_string_append_printf() in create_acl()
nrwahl2 Dec 26, 2025
8509b15
Log: libcrmcommon: Set config warnings on mismatched ACL perm specs
nrwahl2 Dec 26, 2025
6aae587
Doc: libcrmcommon: Drop ACL snippet comment
nrwahl2 Dec 26, 2025
c3cb8a2
Refactor: libcrmcommon: Use pcmk__is_privileged() in pcmk_acl_required()
nrwahl2 Dec 26, 2025
05f080f
Refactor: libcrmcommon: Use g_list_foreach() in pcmk__apply_acls()
nrwahl2 Dec 26, 2025
87845b8
Refactor: libcrmcommon: pcmk__xe_foreach_child in unpack_acl_role_ref
nrwahl2 Dec 26, 2025
5871c41
Refactor: libcrmcommon: Rename acl_to_text() to acl_mode_text()
nrwahl2 Dec 26, 2025
ebbb160
Doc: libcrmcommon: Add Doxygen to ACL apply functions
nrwahl2 Dec 26, 2025
9f40e00
Refactor: libcrmcommon: Add Doxygen for test_acl_mode()
nrwahl2 Dec 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/crm/common/acl_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ 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);
void pcmk__enable_acls(xmlDoc *source, xmlDoc *target, const char *user);

bool pcmk__check_acl(xmlNode *xml, const char *attr_name,
enum pcmk__xml_flags mode);
Expand Down
6 changes: 3 additions & 3 deletions lib/cib/cib_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ cib_perform_op(cib_t *cib, const char *op, uint32_t call_options,
pcmk__xml_commit_changes(scratch->doc);
pcmk__xml_doc_set_flags(scratch->doc, pcmk__xf_tracking);
if (enable_acl) {
pcmk__enable_acl(*current_cib, scratch, user);
pcmk__enable_acls((*current_cib)->doc, scratch->doc, user);
}

rc = (*fn) (op, call_options, section, req, input, scratch, &scratch, output);
Expand All @@ -311,7 +311,7 @@ cib_perform_op(cib_t *cib, const char *op, uint32_t call_options,

pcmk__xml_doc_set_flags(scratch->doc, pcmk__xf_tracking);
if (enable_acl) {
pcmk__enable_acl(*current_cib, scratch, user);
pcmk__enable_acls((*current_cib)->doc, scratch->doc, user);
}

rc = (*fn) (op, call_options, section, req, input, *current_cib,
Expand All @@ -326,7 +326,7 @@ cib_perform_op(cib_t *cib, const char *op, uint32_t call_options,
pcmk__trace("Inferring changes after %s op", op);
pcmk__xml_commit_changes(scratch->doc);
if (enable_acl) {
pcmk__enable_acl(*current_cib, scratch, user);
pcmk__enable_acls((*current_cib)->doc, scratch->doc, user);
}
pcmk__xml_mark_changes(*current_cib, scratch);
}
Expand Down
Loading