shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

sd-journal: when SD_JOURNAL_CURRENT_USER is set, and called from system UID, imply SD_JOURNAL_SYSTEM

Browse Source 
Fixes: #26742 #23679
This commit is contained in:
Lennart Poettering 2023-06-07 15:19:25 +02:00
parent 115d5145a2
commit 97c621b72d
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libsystemd/sd-journal/sd-journal.c
View File

@ -43,6 +43,7 @@
#include "string-util.h"
#include "strv.h"
#include "syslog-util.h"
#include "uid-alloc-range.h"
#define JOURNAL_FILES_RECHECK_USEC (2 * USEC_PER_SEC)
@ -1322,25 +1323,32 @@ static bool file_has_type_prefix(const char *prefix, const char *filename) {
static bool file_type_wanted(int flags, const char *filename) {
assert(filename);
if (!endswith(filename, ".journal") && !endswith(filename, ".journal~"))
if (!ENDSWITH_SET(filename, ".journal", ".journal~"))
return false;
/* no flags set → every type is OK */
if (!(flags & (SD_JOURNAL_SYSTEM | SD_JOURNAL_CURRENT_USER)))
return true;
if (flags & SD_JOURNAL_SYSTEM && file_has_type_prefix("system", filename))
return true;
if (flags & SD_JOURNAL_CURRENT_USER) {
if (FLAGS_SET(flags, SD_JOURNAL_CURRENT_USER)) {
char prefix[5 + DECIMAL_STR_MAX(uid_t) + 1];
xsprintf(prefix, "user-"UID_FMT, getuid());
xsprintf(prefix, "user-" UID_FMT, getuid());
if (file_has_type_prefix(prefix, filename))
return true;
/* If SD_JOURNAL_CURRENT_USER is specified and we are invoked under a system UID, then
* automatically enable SD_JOURNAL_SYSTEM too, because journald will actually put system user
* data into the system journal. */
if (uid_for_system_journal(getuid()))
flags |= SD_JOURNAL_SYSTEM;
}
if (FLAGS_SET(flags, SD_JOURNAL_SYSTEM) && file_has_type_prefix("system", filename))
return true;
return false;
}