Support Blueprint services customization for masking #2091
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jan-cerny
reviewed
Mar 12, 2024
Comment on lines
878
to
881
| static int _xccdf_policy_rule_generate_blueprint_fix(struct xccdf_policy *policy, struct xccdf_rule *rule, const char *template, | ||
| struct oscap_list *generic, | ||
| struct oscap_list *services_enable, struct oscap_list *services_disable, struct oscap_list *services_mask, | ||
| struct oscap_list *kernel_append) |
There was a problem hiding this comment.
Can we have a structure instead of having too many parameters?
Comment on lines
1234
to
1243
| struct oscap_iterator *services_mask_it = oscap_iterator_new(services_mask); | ||
| while(oscap_iterator_has_more(services_mask_it)) { | ||
| char *var_line = (char *) oscap_iterator_next(services_mask_it); | ||
| _write_text_to_fd(output_fd, var_line); | ||
| if (oscap_iterator_has_more(services_mask_it)) | ||
| _write_text_to_fd(output_fd, ","); | ||
| } | ||
| _write_text_to_fd(output_fd, "]\n\n"); | ||
| oscap_iterator_free(services_mask_it); | ||
| oscap_list_free(services_mask, free); |
There was a problem hiding this comment.
This block seems to be a repeating theme. Can we refactor the code to reduce duplication?
[customizations.services] masked = ["service"]
evgenyz
force-pushed
the
add-bp-mask-services
branch
from
f98d07c to
e8369e4
Compare
jan-cerny
approved these changes
Mar 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will now be properly parsed and organized: