diff options
| -rw-r--r-- | dbus/dbus-server-unix.c | 64 | ||||
| -rw-r--r-- | doc/dbus-specification.xml | 17 |
2 files changed, 71 insertions, 10 deletions
diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c index d9952404..fcfe27f7 100644 --- a/dbus/dbus-server-unix.c +++ b/dbus/dbus-server-unix.c @@ -66,25 +66,75 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry, const char *path = dbus_address_entry_get_value (entry, "path"); const char *tmpdir = dbus_address_entry_get_value (entry, "tmpdir"); const char *abstract = dbus_address_entry_get_value (entry, "abstract"); + const char *runtime = dbus_address_entry_get_value (entry, "runtime"); + int mutually_exclusive_modes = 0; - if (path == NULL && tmpdir == NULL && abstract == NULL) + mutually_exclusive_modes = (path != NULL) + (tmpdir != NULL) + + (abstract != NULL) + (runtime != NULL); + + if (mutually_exclusive_modes < 1) { _dbus_set_bad_address(error, "unix", - "path or tmpdir or abstract", + "path or tmpdir or abstract or runtime", NULL); return DBUS_SERVER_LISTEN_BAD_ADDRESS; } - if ((path && tmpdir) || - (path && abstract) || - (tmpdir && abstract)) + if (mutually_exclusive_modes > 1) { _dbus_set_bad_address(error, NULL, NULL, - "cannot specify two of \"path\" and \"tmpdir\" and \"abstract\" at the same time"); + "cannot specify two of \"path\", \"tmpdir\", \"abstract\" and \"runtime\" at the same time"); return DBUS_SERVER_LISTEN_BAD_ADDRESS; } - if (tmpdir != NULL) + if (runtime != NULL) + { + DBusString full_path; + DBusString filename; + const char *runtimedir; + + if (strcmp (runtime, "yes") != 0) + { + _dbus_set_bad_address(error, NULL, NULL, + "if given, the only value allowed for \"runtime\" is \"yes\""); + return DBUS_SERVER_LISTEN_BAD_ADDRESS; + } + + runtimedir = _dbus_getenv ("XDG_RUNTIME_DIR"); + + if (runtimedir == NULL) + { + dbus_set_error (error, + DBUS_ERROR_NOT_SUPPORTED, "\"XDG_RUNTIME_DIR\" is not set"); + return DBUS_SERVER_LISTEN_DID_NOT_CONNECT; + } + + _dbus_string_init_const (&filename, "bus"); + + if (!_dbus_string_init (&full_path)) + { + _DBUS_SET_OOM (error); + return DBUS_SERVER_LISTEN_DID_NOT_CONNECT; + } + + if (!_dbus_string_append (&full_path, runtimedir) || + !_dbus_concat_dir_and_file (&full_path, &filename)) + { + _dbus_string_free (&full_path); + _DBUS_SET_OOM (error); + return DBUS_SERVER_LISTEN_DID_NOT_CONNECT; + } + + /* We can safely use filesystem sockets in the runtime directory, + * and they are preferred because they can be bind-mounted between + * Linux containers. */ + *server_p = _dbus_server_new_for_domain_socket ( + _dbus_string_get_const_data (&full_path), + FALSE, error); + + _dbus_string_free (&full_path); + } + else if (tmpdir != NULL) { DBusString full_path; DBusString filename; diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml index ce3929e2..1e0fe207 100644 --- a/doc/dbus-specification.xml +++ b/doc/dbus-specification.xml @@ -3102,9 +3102,12 @@ For instance, listening on <literal>tcp:host=127.0.0.1</literal> might result in the connectable address <literal>tcp:host=127.0.0.1,port=30958</literal>, - or listening on <literal>unix:tmpdir=/tmp</literal> + listening on <literal>unix:tmpdir=/tmp</literal> might result in the connectable address - <literal>unix:abstract=/tmp/dbus-U8OSdmf7</literal>. + <literal>unix:abstract=/tmp/dbus-U8OSdmf7</literal>, or + listening on <literal>unix:runtime=yes</literal> + might result in the connectable address + <literal>unix:path=/run/user/1234/bus</literal>. </para> </sect1> @@ -3144,6 +3147,9 @@ Unix addresses that specify <literal>tmpdir</literal> are only listenable: the corresponding connectable address will specify either <literal>path</literal> or <literal>abstract</literal>. + Similarly, Unix addresses that specify <literal>runtime</literal> + are only listenable, and the corresponding connectable address + will specify <literal>path</literal>. </para> <sect3 id="transports-unix-domain-sockets-addresses"> <title>Server Address Format</title> @@ -3176,12 +3182,17 @@ <entry>(string)</entry> <entry>unique string (path) in the abstract namespace. If set, the "path" or "tmpdir" key must not be set. This key is only supported on platforms with "abstract Unix sockets", of which Linux is the only known example.</entry> </row> + <row> + <entry>runtime</entry> + <entry><literal>yes</literal></entry> + <entry>If given, This key can only be used in server addresses, not in client addresses. If set, its value must be <literal>yes</literal>. This is typically used in an address string like <literal>unix:runtime=yes;unix:tmpdir=/tmp</literal> so that there can be a fallback if <literal>XDG_RUNTIME_DIR</literal> is not set.</entry> + </row> </tbody> </tgroup> </informaltable> <para> Exactly one of the keys <literal>path</literal>, - <literal>abstract</literal> or + <literal>abstract</literal>, <literal>runtime</literal> or <literal>tmpdir</literal> must be provided. </para> </sect3> |