daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
bd1529
From 40dff18947fa198810db4cd3e5291349fc84a0e8 Mon Sep 17 00:00:00 2001
bd1529
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
bd1529
Date: Thu, 1 Aug 2019 10:02:14 +0200
bd1529
Subject: [PATCH] shared/user-util: allow usernames with dots in specific
bd1529
 fields
bd1529
bd1529
People do have usernames with dots, and it makes them very unhappy that systemd
bd1529
doesn't like their that. It seems that there is no actual problem with allowing
bd1529
dots in the username. In particular chown declares ":" as the official
bd1529
separator, and internally in systemd we never rely on "." as the seperator
bd1529
between user and group (nor do we call chown directly). Using dots in the name
bd1529
is probably not a very good idea, but we don't need to care. Debian tools
bd1529
(adduser) do not allow users with dots to be created.
bd1529
bd1529
This patch allows *existing* names with dots to be used in User, Group,
bd1529
SupplementaryGroups, SocketUser, SocketGroup fields, both in unit files and on
bd1529
the command line. DynamicUsers and sysusers still follow the strict policy.
bd1529
user@.service and tmpfiles already allowed arbitrary user names, and this
bd1529
remains unchanged.
bd1529
bd1529
Fixes #12754.
bd1529
bd1529
(cherry picked from commit ae480f0b09aec815b64579bb1828ea935d8ee236)
bd1529
bd1529
Related: #1848373
bd1529
---
bd1529
 src/core/dbus-execute.c               | 12 ++++++------
bd1529
 src/core/dbus-socket.c                |  4 ++--
bd1529
 src/core/dbus-util.c                  |  2 +-
bd1529
 src/core/dbus-util.h                  |  2 +-
bd1529
 src/core/load-fragment-gperf.gperf.m4 | 10 +++++-----
bd1529
 src/core/load-fragment.c              |  8 ++++----
bd1529
 src/core/load-fragment.h              |  4 ++--
bd1529
 7 files changed, 21 insertions(+), 21 deletions(-)
bd1529
bd1529
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
bd1529
index 0fe4c14e48..e004fb55c9 100644
bd1529
--- a/src/core/dbus-execute.c
bd1529
+++ b/src/core/dbus-execute.c
bd1529
@@ -1113,10 +1113,10 @@ int bus_exec_context_set_transient_property(
bd1529
         flags |= UNIT_PRIVATE;
bd1529
 
bd1529
         if (streq(name, "User"))
bd1529
-                return bus_set_transient_user(u, name, &c->user, message, flags, error);
bd1529
+                return bus_set_transient_user_compat(u, name, &c->user, message, flags, error);
bd1529
 
bd1529
         if (streq(name, "Group"))
bd1529
-                return bus_set_transient_user(u, name, &c->group, message, flags, error);
bd1529
+                return bus_set_transient_user_compat(u, name, &c->group, message, flags, error);
bd1529
 
bd1529
         if (streq(name, "TTYPath"))
bd1529
                 return bus_set_transient_path(u, name, &c->tty_path, message, flags, error);
bd1529
@@ -1297,10 +1297,10 @@ int bus_exec_context_set_transient_property(
bd1529
                 if (r < 0)
bd1529
                         return r;
bd1529
 
bd1529
-                STRV_FOREACH(p, l) {
bd1529
-                        if (!isempty(*p) && !valid_user_group_name_or_id(*p))
bd1529
-                                return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid supplementary group names");
bd1529
-                }
bd1529
+                STRV_FOREACH(p, l)
bd1529
+                        if (!isempty(*p) && !valid_user_group_name_or_id_compat(*p))
bd1529
+                                return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS,
bd1529
+                                                         "Invalid supplementary group names");
bd1529
 
bd1529
                 if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
bd1529
                         if (strv_isempty(l)) {
bd1529
diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c
bd1529
index bb77539030..8fdbc05409 100644
bd1529
--- a/src/core/dbus-socket.c
bd1529
+++ b/src/core/dbus-socket.c
bd1529
@@ -281,10 +281,10 @@ static int bus_socket_set_transient_property(
bd1529
                 return bus_set_transient_fdname(u, name, &s->fdname, message, flags, error);
bd1529
 
bd1529
         if (streq(name, "SocketUser"))
bd1529
-                return bus_set_transient_user(u, name, &s->user, message, flags, error);
bd1529
+                return bus_set_transient_user_compat(u, name, &s->user, message, flags, error);
bd1529
 
bd1529
         if (streq(name, "SocketGroup"))
bd1529
-                return bus_set_transient_user(u, name, &s->group, message, flags, error);
bd1529
+                return bus_set_transient_user_compat(u, name, &s->group, message, flags, error);
bd1529
 
bd1529
         if (streq(name, "BindIPv6Only"))
bd1529
                 return bus_set_transient_bind_ipv6_only(u, name, &s->bind_ipv6_only, message, flags, error);
bd1529
diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c
bd1529
index f4fbb72cb9..7862beaacb 100644
bd1529
--- a/src/core/dbus-util.c
bd1529
+++ b/src/core/dbus-util.c
bd1529
@@ -30,7 +30,7 @@ int bus_property_get_triggered_unit(
bd1529
 
bd1529
 BUS_DEFINE_SET_TRANSIENT(mode_t, "u", uint32_t, mode_t, "%040o");
bd1529
 BUS_DEFINE_SET_TRANSIENT(unsigned, "u", uint32_t, unsigned, "%" PRIu32);
bd1529
-BUS_DEFINE_SET_TRANSIENT_STRING_WITH_CHECK(user, valid_user_group_name_or_id);
bd1529
+BUS_DEFINE_SET_TRANSIENT_STRING_WITH_CHECK(user_compat, valid_user_group_name_or_id_compat);
bd1529
 BUS_DEFINE_SET_TRANSIENT_STRING_WITH_CHECK(path, path_is_absolute);
bd1529
 
bd1529
 int bus_set_transient_string(
bd1529
diff --git a/src/core/dbus-util.h b/src/core/dbus-util.h
bd1529
index 12b055e4ac..a3316c6701 100644
bd1529
--- a/src/core/dbus-util.h
bd1529
+++ b/src/core/dbus-util.h
bd1529
@@ -235,7 +235,7 @@ int bus_property_get_triggered_unit(sd_bus *bus, const char *path, const char *i
bd1529
 
bd1529
 int bus_set_transient_mode_t(Unit *u, const char *name, mode_t *p, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);
bd1529
 int bus_set_transient_unsigned(Unit *u, const char *name, unsigned *p, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);
bd1529
-int bus_set_transient_user(Unit *u, const char *name, char **p, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);
bd1529
+int bus_set_transient_user_compat(Unit *u, const char *name, char **p, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);
bd1529
 int bus_set_transient_path(Unit *u, const char *name, char **p, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);
bd1529
 int bus_set_transient_string(Unit *u, const char *name, char **p, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);
bd1529
 int bus_set_transient_bool(Unit *u, const char *name, bool *p, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);
bd1529
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
bd1529
index 24ee5ae6fe..156a4d0a6d 100644
bd1529
--- a/src/core/load-fragment-gperf.gperf.m4
bd1529
+++ b/src/core/load-fragment-gperf.gperf.m4
bd1529
@@ -25,9 +25,9 @@ m4_define(`EXEC_CONTEXT_CONFIG_ITEMS',
bd1529
 `$1.WorkingDirectory,            config_parse_working_directory,     0,                             offsetof($1, exec_context)
bd1529
 $1.RootDirectory,                config_parse_unit_path_printf,      true,                          offsetof($1, exec_context.root_directory)
bd1529
 $1.RootImage,                    config_parse_unit_path_printf,      true,                          offsetof($1, exec_context.root_image)
bd1529
-$1.User,                         config_parse_user_group,            0,                             offsetof($1, exec_context.user)
bd1529
-$1.Group,                        config_parse_user_group,            0,                             offsetof($1, exec_context.group)
bd1529
-$1.SupplementaryGroups,          config_parse_user_group_strv,       0,                             offsetof($1, exec_context.supplementary_groups)
bd1529
+$1.User,                         config_parse_user_group_compat,     0,                             offsetof($1, exec_context.user)
bd1529
+$1.Group,                        config_parse_user_group_compat,     0,                             offsetof($1, exec_context.group)
bd1529
+$1.SupplementaryGroups,          config_parse_user_group_strv_compat, 0,                            offsetof($1, exec_context.supplementary_groups)
bd1529
 $1.Nice,                         config_parse_exec_nice,             0,                             offsetof($1, exec_context)
bd1529
 $1.OOMScoreAdjust,               config_parse_exec_oom_score_adjust, 0,                             offsetof($1, exec_context)
bd1529
 $1.IOSchedulingClass,            config_parse_exec_io_class,         0,                             offsetof($1, exec_context)
bd1529
@@ -354,8 +354,8 @@ Socket.ExecStartPost,            config_parse_exec,                  SOCKET_EXEC
bd1529
 Socket.ExecStopPre,              config_parse_exec,                  SOCKET_EXEC_STOP_PRE,          offsetof(Socket, exec_command)
bd1529
 Socket.ExecStopPost,             config_parse_exec,                  SOCKET_EXEC_STOP_POST,         offsetof(Socket, exec_command)
bd1529
 Socket.TimeoutSec,               config_parse_sec_fix_0,             0,                             offsetof(Socket, timeout_usec)
bd1529
-Socket.SocketUser,               config_parse_user_group,            0,                             offsetof(Socket, user)
bd1529
-Socket.SocketGroup,              config_parse_user_group,            0,                             offsetof(Socket, group)
bd1529
+Socket.SocketUser,               config_parse_user_group_compat,     0,                             offsetof(Socket, user)
bd1529
+Socket.SocketGroup,              config_parse_user_group_compat,     0,                             offsetof(Socket, group)
bd1529
 Socket.SocketMode,               config_parse_mode,                  0,                             offsetof(Socket, socket_mode)
bd1529
 Socket.DirectoryMode,            config_parse_mode,                  0,                             offsetof(Socket, directory_mode)
bd1529
 Socket.Accept,                   config_parse_bool,                  0,                             offsetof(Socket, accept)
bd1529
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
bd1529
index 740401a582..ba81d94504 100644
bd1529
--- a/src/core/load-fragment.c
bd1529
+++ b/src/core/load-fragment.c
bd1529
@@ -1899,7 +1899,7 @@ int config_parse_sec_fix_0(
bd1529
         return 0;
bd1529
 }
bd1529
 
bd1529
-int config_parse_user_group(
bd1529
+int config_parse_user_group_compat(
bd1529
                 const char *unit,
bd1529
                 const char *filename,
bd1529
                 unsigned line,
bd1529
@@ -1932,7 +1932,7 @@ int config_parse_user_group(
bd1529
                 return -ENOEXEC;
bd1529
         }
bd1529
 
bd1529
-        if (!valid_user_group_name_or_id(k)) {
bd1529
+        if (!valid_user_group_name_or_id_compat(k)) {
bd1529
                 log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid user/group name or numeric ID: %s", k);
bd1529
                 return -ENOEXEC;
bd1529
         }
bd1529
@@ -1940,7 +1940,7 @@ int config_parse_user_group(
bd1529
         return free_and_replace(*user, k);
bd1529
 }
bd1529
 
bd1529
-int config_parse_user_group_strv(
bd1529
+int config_parse_user_group_strv_compat(
bd1529
                 const char *unit,
bd1529
                 const char *filename,
bd1529
                 unsigned line,
bd1529
@@ -1986,7 +1986,7 @@ int config_parse_user_group_strv(
bd1529
                         return -ENOEXEC;
bd1529
                 }
bd1529
 
bd1529
-                if (!valid_user_group_name_or_id(k)) {
bd1529
+                if (!valid_user_group_name_or_id_compat(k)) {
bd1529
                         log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid user/group name or numeric ID: %s", k);
bd1529
                         return -ENOEXEC;
bd1529
                 }
bd1529
diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
bd1529
index 65a94d53cc..f9d34d484d 100644
bd1529
--- a/src/core/load-fragment.h
bd1529
+++ b/src/core/load-fragment.h
bd1529
@@ -96,8 +96,8 @@ CONFIG_PARSER_PROTOTYPE(config_parse_exec_utmp_mode);
bd1529
 CONFIG_PARSER_PROTOTYPE(config_parse_working_directory);
bd1529
 CONFIG_PARSER_PROTOTYPE(config_parse_fdname);
bd1529
 CONFIG_PARSER_PROTOTYPE(config_parse_sec_fix_0);
bd1529
-CONFIG_PARSER_PROTOTYPE(config_parse_user_group);
bd1529
-CONFIG_PARSER_PROTOTYPE(config_parse_user_group_strv);
bd1529
+CONFIG_PARSER_PROTOTYPE(config_parse_user_group_compat);
bd1529
+CONFIG_PARSER_PROTOTYPE(config_parse_user_group_strv_compat);
bd1529
 CONFIG_PARSER_PROTOTYPE(config_parse_restrict_namespaces);
bd1529
 CONFIG_PARSER_PROTOTYPE(config_parse_bind_paths);
bd1529
 CONFIG_PARSER_PROTOTYPE(config_parse_exec_keyring_mode);