fafff8f1ff
Let's fold get_user_creds_clean() into get_user_creds(), and introduce a flags argument for it to select "clean" behaviour. This flags parameter also learns to other new flags: - USER_CREDS_SYNTHESIZE_FALLBACK: in this mode the user records for root/nobody are only synthesized as fallback. Normally, the synthesized records take precedence over what is in the user database. With this flag set this is reversed, and the user database takes precedence, and the synthesized records are only used if they are missing there. This flag should be set in cases where doing NSS is deemed safe, and where there's interest in knowing the correct shell, for example if the admin changed root's shell to zsh or suchlike. - USER_CREDS_ALLOW_MISSING: if set, and a UID/GID is specified by numeric value, and there's no user/group record for it accept it anyway. This allows us to fix #9767 This then also ports all users to set the most appropriate flags. Fixes: #9767 [zj: remove one isempty() call]
69 lines
1.6 KiB
C
69 lines
1.6 KiB
C
/* SPDX-License-Identifier: LGPL-2.1+ */
|
|
|
|
#include <fcntl.h>
|
|
#include <stdlib.h>
|
|
#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
|
|
#include "acl-util.h"
|
|
#include "fd-util.h"
|
|
#include "fileio.h"
|
|
#include "string-util.h"
|
|
#include "user-util.h"
|
|
|
|
static void test_add_acls_for_user(void) {
|
|
char fn[] = "/tmp/test-empty.XXXXXX";
|
|
_cleanup_close_ int fd = -1;
|
|
char *cmd;
|
|
uid_t uid;
|
|
int r;
|
|
|
|
fd = mkostemp_safe(fn);
|
|
assert_se(fd >= 0);
|
|
|
|
/* Use the mode that user journal files use */
|
|
assert_se(fchmod(fd, 0640) == 0);
|
|
|
|
cmd = strjoina("ls -l ", fn);
|
|
assert_se(system(cmd) == 0);
|
|
|
|
cmd = strjoina("getfacl -p ", fn);
|
|
assert_se(system(cmd) == 0);
|
|
|
|
if (getuid() == 0) {
|
|
const char *nobody = NOBODY_USER_NAME;
|
|
r = get_user_creds(&nobody, &uid, NULL, NULL, NULL, 0);
|
|
if (r < 0)
|
|
uid = 0;
|
|
} else
|
|
uid = getuid();
|
|
|
|
r = add_acls_for_user(fd, uid);
|
|
assert_se(r >= 0);
|
|
|
|
cmd = strjoina("ls -l ", fn);
|
|
assert_se(system(cmd) == 0);
|
|
|
|
cmd = strjoina("getfacl -p ", fn);
|
|
assert_se(system(cmd) == 0);
|
|
|
|
/* set the acls again */
|
|
|
|
r = add_acls_for_user(fd, uid);
|
|
assert_se(r >= 0);
|
|
|
|
cmd = strjoina("ls -l ", fn);
|
|
assert_se(system(cmd) == 0);
|
|
|
|
cmd = strjoina("getfacl -p ", fn);
|
|
assert_se(system(cmd) == 0);
|
|
|
|
unlink(fn);
|
|
}
|
|
|
|
int main(int argc, char **argv) {
|
|
test_add_acls_for_user();
|
|
|
|
return 0;
|
|
}
|