wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-11 17:02:42 +07:00
Code Issues Packages Projects Releases Wiki Activity

conf: reject .conf files that declare duplicate block titles

Browse Source 
The block title is the service identity, and libconfuse merges two
sections that share one, without a word.  Two blocks titled the same
in one file therefore loaded as a single service holding a mix of both
declarations, with scalars taken from the last block and lists reset
by it.

system/10-hotplug.conf.in is written this way: two udevd blocks, one
per candidate binary, the way the line-based format spelled a
fallback.  Only the second survived the merge, so a system that has
/lib/systemd/systemd-udevd but no udevd got no udevd service at all,
and the whole `if = "udevd"` chain behind it went with it.

CFGF_NO_TITLE_DUPES turns the merge into a parse error naming the file
and the title, and the file is then rejected as a whole.  The same
title in another file is untouched, that is how an administrator
overrides a system .conf.

Format detection had to stop agreeing with it.  is_new_format() probes
by parsing, so a duplicate title made it answer "not block format" and
conf_parse_file() handed the file to the legacy parser, whose errors
buried the real message.  The probe now clears the flag on its own
copy of the option array, keeping the verdict syntactic.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2026-08-05 17:56:40 +02:00
parent c3c41f113e
commit 516ee41494
3 changed files with 115 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conf.c
+26 -5
View File
@@ -313,12 +313,21 @@ static cfg_opt_t tty_opts[] = {
CFG_END()
};
/*
* Flags for the sections whose title is a service identity.
* libconfuse merges two sections sharing a title, silently, which for
* these would fold two declarations into one service, so duplicates
* are rejected instead.
*/
#define SVC_SEC_FLAGS (CFGF_MULTI | CFGF_TITLE | CFGF_NO_TITLE_DUPES)
static cfg_opt_t conf_opts[] = {
CFG_SEC ("service", svc_opts, CFGF_MULTI | CFGF_TITLE),
CFG_SEC ("task", svc_opts, CFGF_MULTI | CFGF_TITLE),
CFG_SEC ("run", svc_opts, CFGF_MULTI | CFGF_TITLE),
CFG_SEC ("sysv", svc_opts, CFGF_MULTI | CFGF_TITLE),
CFG_SEC ("tty", tty_opts, CFGF_MULTI | CFGF_TITLE),
CFG_SEC ("service", svc_opts, SVC_SEC_FLAGS),
CFG_SEC ("task", svc_opts, SVC_SEC_FLAGS),
CFG_SEC ("run", svc_opts, SVC_SEC_FLAGS),
CFG_SEC ("sysv", svc_opts, SVC_SEC_FLAGS),
CFG_SEC ("tty", tty_opts, SVC_SEC_FLAGS),
/* cgroup titles name a group, not a service, so merging is fine */
CFG_SEC ("cgroup", cgroup_opts, CFGF_MULTI | CFGF_TITLE | CFGF_KEYSTRVAL),
CFG_SEC ("rlimit", rlimit_opts, CFGF_NONE),
CFG_SEC ("environment", env_opts, CFGF_KEYSTRVAL),
@@ -2003,6 +2012,7 @@ static int conf_parse_any(cfg_t *cfg, char *file, char *buf)
*/
static int is_new_format(char *file, char *buf)
{
cfg_opt_t *opt;
cfg_t *cfg;
int rc;
@@ -2011,6 +2021,17 @@ static int is_new_format(char *file, char *buf)
return 0;
cfg_set_error_function(cfg, cfg_error_quiet);
/*
* The verdict must stay syntactic. A duplicate section title is
* a semantic error in a file that is unmistakably block format,
* and answering 'no' here would hand it to the legacy parser,
* burying the real message under its errors. cfg_init() copies
* the option array, so this only relaxes the probe.
*/
for (opt = cfg->opts; opt && opt->name; opt++)
opt->flags &= ~CFGF_NO_TITLE_DUPES;
rc = conf_parse_any(cfg, file, buf);
cfg_free(cfg);