isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

cvtsudoers: merge aliases when multiple sudoers files are specified

Browse Source 
Duplicate aliases are remove.  If there are conflicting alias names,
the conflicts are renamed by appending a numerical suffix.
For example, if there are two SERVERS Host_Aliases, the second one
will be renamed to SERVERS_1.
This commit is contained in:
Todd C. Miller
2021-11-19 12:29:21 -07:00
parent 33fbf59467
commit ab9e44a6ca
7 changed files with 600 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
plugins/sudoers/cvtsudoers.c
View File

@@ -104,7 +104,7 @@ int
main(int argc, char *argv[])
{
struct sudoers_parse_tree_list parse_trees = TAILQ_HEAD_INITIALIZER(parse_trees);
struct sudoers_parse_tree *parse_tree;
struct sudoers_parse_tree *parse_tree, merged_tree;
struct cvtsudoers_config *conf = NULL;
enum sudoers_formats output_format = format_ldif;
enum sudoers_formats input_format = format_sudoers;
@@ -415,24 +415,30 @@ main(int argc, char *argv[])
argv++;
} while (argc > 0);
/* TODO: merge parse tree into a single one and output that. */
TAILQ_FOREACH(parse_tree, &parse_trees, entries) {
switch (output_format) {
case format_csv:
exitcode = !convert_sudoers_csv(parse_tree, output_file, conf);
break;
case format_json:
exitcode = !convert_sudoers_json(parse_tree, output_file, conf);
break;
case format_ldif:
exitcode = !convert_sudoers_ldif(parse_tree, output_file, conf);
break;
case format_sudoers:
exitcode = !convert_sudoers_sudoers(parse_tree, output_file, conf);
break;
default:
sudo_fatalx("error: unhandled output format %d", output_format);
}
parse_tree = TAILQ_FIRST(&parse_trees);
if (parse_tree == TAILQ_LAST(&parse_trees, sudoers_parse_tree_list)) {
/* No merging required. */
goto output;
}
parse_tree = merge_sudoers(&parse_trees, &merged_tree);
output:
switch (output_format) {
case format_csv:
exitcode = !convert_sudoers_csv(parse_tree, output_file, conf);
break;
case format_json:
exitcode = !convert_sudoers_json(parse_tree, output_file, conf);
break;
case format_ldif:
exitcode = !convert_sudoers_ldif(parse_tree, output_file, conf);
break;
case format_sudoers:
exitcode = !convert_sudoers_sudoers(parse_tree, output_file, conf);
break;
default:
sudo_fatalx("error: unhandled output format %d", output_format);
}
done: