Attachment 137403 Details for Bug 104641 – [1/4 v2] bus: Don't pass systemd environment variables to activated services

[patch] [1/4 v2] bus: Don't pass systemd environment variables to activated services

0001-bus-Don-t-pass-systemd-environment-variables-to-acti.patch (text/plain), 2.33 KB, created by Simon McVittie on 2018-02-16 19:36:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2018-02-16 19:36:40 UTC

Size: 2.33 KB

patch

obsolete

>From 0df751e2a9799c4464ad0a7739f92fb6c3a5db59 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Mon, 15 Jan 2018 15:26:33 +0000
>Subject: [PATCH 1/4] bus: Don't pass systemd environment variables to
> activated services
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=104641
>
>---
>
>Justify the ones we do and don't want to clear, in comments
>---
> bus/activation.c | 30 ++++++++++++++++++++++++++++++
> 1 file changed, 30 insertions(+)
>
>diff --git a/bus/activation.c b/bus/activation.c
>index edf96a2c..66640ba6 100644
>--- a/bus/activation.c
>+++ b/bus/activation.c
>@@ -848,6 +848,36 @@ populate_environment (BusActivation *activation)
>   retval = _dbus_hash_table_from_array (activation->environment, environment, '=');
>   dbus_free_string_array (environment);
> 
>+  /*
>+   * These environment variables are set by systemd for the dbus-daemon
>+   * itself, and are not applicable to our child processes.
>+   *
>+   * Of the other environment variables listed in systemd.exec(5):
>+   *
>+   * - XDG_RUNTIME_DIR, XDG_SESSION_ID, XDG_SEAT, XDG_VTNR: Properties of
>+   *   the session and equally true for the activated service, should not
>+   *   be reset
>+   * - PATH, LANG, USER, LOGNAME, HOME, SHELL, MANAGERPID: Equally true for
>+   *   the activated service, should not be reset
>+   * - TERM, WATCHDOG_*: Should not be set for dbus-daemon, so not applicable
>+   * - MAINPID, SERVICE_RESULT, EXIT_CODE, EXIT_STATUS: Not set for ExecStart,
>+   *   so not applicable
>+   * - INVOCATION_ID: TODO: Do we want to clear this or not? It isn't clear.
>+   */
>+
>+  /* We give activated services their own Journal stream to avoid their
>+   * logging being attributed to dbus-daemon */
>+  _dbus_hash_table_remove_string (activation->environment, "JOURNAL_STREAM");
>+
>+  /* This is dbus-daemon's listening socket, not the activatable service's */
>+  _dbus_hash_table_remove_string (activation->environment, "LISTEN_FDNAMES");
>+  _dbus_hash_table_remove_string (activation->environment, "LISTEN_FDS");
>+  _dbus_hash_table_remove_string (activation->environment, "LISTEN_PID");
>+
>+  /* This is dbus-daemon's status notification, not the activatable service's
>+   * (and NotifyAccess wouldn't let it write here anyway) */
>+  _dbus_hash_table_remove_string (activation->environment, "NOTIFY_SOCKET");
>+
>   return retval;
> }
> 
>-- 
>2.16.1
>

Actions: View | Splinter Review

Attachments on bug 104641: 136730 | 136732 | 136733 | 136734 | 136735 | 137403 | 137404 | 138222

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.