dus-borker: new package (branch yem/dbus-broker)
v5 cover dus-borker: new package (branch yem/dbus-broker)
Hello All!
This series is a rework of the original submission by Norbert, to add dbus-broker and make use of it as a message us daemon for use with systemd.
I (Yann) have reorganised the package, and fixed various issues, and finally introduced run-time tests.
All the gory details necessary to make dbus-broker work are explained in the first patch' commit log.
Regards,
Yann E. MORIN.
The following changes since commit 3346d78384c9732affb4149f941c74c369b7c1d7
package/systemd: cosmetic rearrange list of users (2020-07-18 13:43:23 +0200)
are available in the git repository at:
https://git.busybox.net/~ymorin/git/buildroot
for you to fetch changes up to a63f1dc4a5c32382d5861934aa426cfbe58a490e
support/run-test: add test for systemd using dbus-broker (2020-07-18 13:46:20 +0200)
----------------------------------------------------------------
Norbert Lange (1):
package/dbus-broker: new package
Yann E. MORIN (3):
package/systemd: do not force dbus if dbus-broker is available support/testsuite: de-duplicate the systemd runtime tests support/run-test: add test for systemd using dbus-broker
.gitlab-ci.yml | 4 + DEVELOPERS | 2 + package/Config.in | 1 + package/dbus-broker/Config.in | 22 ++++++ package/dbus-broker/dbus-broker.hash | 3 + package/dbus-broker/dbus-broker.mk | 77 ++++++++++++++++++ package/dbus-broker/dbus.socket | 5 ++ package/dbus-broker/session.conf | 65 +++++++++++++++ package/dbus-broker/system.conf | 123 +++++++++++++++++++++++++++++ package/systemd/Config.in | 2 +- support/testing/tests/init/test_systemd.py | 69 +++++++++++----- 11 files changed, 352 insertions(+), 21 deletions(-) create mode 100644 package/dbus-broker/Config.in create mode 100644 package/dbus-broker/dbus-broker.hash create mode 100644 package/dbus-broker/dbus-broker.mk create mode 100644 package/dbus-broker/dbus.socket create mode 100644 package/dbus-broker/session.conf create mode 100644 package/dbus-broker/system.conf
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v5 1/4 package/dbus-broker: new package
From: Norbert Lange <[email protected]>
dbus-broker is an alternate implementation of a dbus dameon. It can be used as a drop-in replacement for the system bus daemon, as well as the session bus daemon.
dbus-broker is (basically, and as far as we're concerned in Buildroot) split in two components:
- the actual message bus daemon, that relays messages across clients
- a launcher, which is responsible for setting various aspects of the bus, like setting the policy et al. and opening the socket(s) the message bus daemon will have to listen on...
The launcher can only be used in a systemd setup (it makes heavy use of systemd facilities), while the message bus is generic. However, the message bus daemon is useless without a launcher. There does not exist a non-systemd launcher, which makes dbus-broker actually a systemd-only package; this can be revisited when/if a non-systemd launcher appears.
There are two cases:
1. original dbus disabled
Here, we install the config files and systemd socket activation units; dbus-broker provides the system and sessions bus daemons.
2. original dbus enabled
In this case, we do not install the config files and systemd socket activation units, or define a user: they all are provided by the original dbus, and we piggy-back on those.
In this situation, the default system and sessions message bus are the original dbus; dbus-broker is not enabled.
However, users may opt-in to use dbus-broker in a few ways:
- at build-time: by providing drop-in units or presets in an overlay or custom skeleton;
- at build-time: by calling systemctl enable/disable from a post-build script;
- at runtime (on a RW filesystem): by calling systemctl enable/disable
Note about the user: the path to the system bus socket is a so-called "well-known location": it is expected to be there, by spec. Moving it elsewhere is going to break existing programs. So, the user running the system bus daemon must be able to create that socket.
As we may have two packages providing a system bus daemon, they have to be both able to create the socket, and thus must both be able to write in the directory containing the socket. And since they can be switched at runtime, they must be running as the same user.
We can't just reference the original dbus user, so we duplicate the entry. What is important, is that the user be named 'dbus', as that's what we use in both cases.
Finally, the licensing terms are pretty trivial for dbus-broker itself, but it makes use of third-party code that it inherits as git submodules (that are bundled in the release archive). Thus the licensing is a bit convoluted... The third-party codes claim to be licensed as "Apache-2.0 and LGP-2.1+" in their AUTHORS files, but at the same time claim "**Apache-2.0** OR **LGPL-2.1-or-later**" in their README files. The individual source files (that are used) do not seem to have any licensing header to clarify the situation. So we represent the situation with "Apache-2.0 and/or LGPL-2.1+".
[yann.morin.1998 at free.fr:
- don't select systemd; depend on it instead
- only install config files and systemd units without original dbus
- install a user to run the message bus as
- fix licensing info
- entirely reword and extend the commit log
- add myself to DEVELOPERS as well
]
---
Changes v4 -> v5 (Yann, after review by Norbert):
- define the user to run as directly in system.conf
- as a consequence, drop the unit drop-in
- add myself to DEVELOPERS as well
Changes v3 -> v4 (Yann, respining after review by Norbert):
- drop the non-systemd case
- drop the launcher option
- reinstate BR2_COREUTILS_HOST_DEPENDENCY and ln --relative
- reinstate the user, explain it
Changes v2 -> v3 (Norbert, respinning after Yann):
- add an own config entry for dbus-broker-launch enabled by default if systemd init is used
- undo BR2_COREUTILS_HOST_DEPENDENCY
- undo adding dbus user - never used by this package
- add condtional audit dependency
- cleanup conditional logic a bit
Changes v1 -> v2 (Yann):
- make launcher conditional
- don't select systemd; don't depend on it either
- don't install systemd units without systemd
- only install config files and systemd units wihtout original dbus
- rename hooks with meaningful names
- fix licensing info
- entirely reword and extend the commit log
--- DEVELOPERS | 2 + package/Config.in | 1 + package/dbus-broker/Config.in | 22 +++++ package/dbus-broker/dbus-broker.hash | 3 + package/dbus-broker/dbus-broker.mk | 77 +++++++++++++++++ package/dbus-broker/dbus.socket | 5 ++ package/dbus-broker/session.conf | 65 ++++++++++++++ package/dbus-broker/system.conf | 123 +++++++++++++++++++++++++++ 8 files changed, 298 insertions(+) create mode 100644 package/dbus-broker/Config.in create mode 100644 package/dbus-broker/dbus-broker.hash create mode 100644 package/dbus-broker/dbus-broker.mk create mode 100644 package/dbus-broker/dbus.socket create mode 100644 package/dbus-broker/session.conf create mode 100644 package/dbus-broker/system.conf
DEVELOPERS +2 -0
@@ -1900,6 +1900,7 @@ F: package/tpm-tools/ F: package/trousers/ N: Norbert Lange <[email protected]> +F: package/dbus-broker/ F: package/tcf-agent/ N: Nylon Chen <[email protected]>
@@ -2641,6 +2642,7 @@ F: package/asterisk/ F: package/cegui/ F: package/dahdi-linux/ F: package/dahdi-tools/ +F: package/dbus-broker/ F: package/dtc/ F: package/dtv-scan-tables/ F: package/dvb-apps/
package/Config.in +1 -0
@@ -434,6 +434,7 @@ endmenu source "package/dahdi-linux/Config.in" source "package/dahdi-tools/Config.in" source "package/dbus/Config.in" + source "package/dbus-broker/Config.in" source "package/dbus-cpp/Config.in" source "package/dbus-glib/Config.in" source "package/dbus-python/Config.in"
package/dbus-broker/Config.in new file +22 -0
@@ -0,0 +1,22 @@ +config BR2_PACKAGE_DBUS_BROKER + bool "dbus-broker" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_SYSTEMD + select BR2_PACKAGE_EXPAT + help + Linux D-Bus Message Broker. + + The dbus-broker project is an implementation of a message bus + as defined by the D-Bus specification. Its aim is to provide + high performance and reliability, while keeping compatibility + to the D-Bus reference implementation. + + It is exclusively written for Linux systems, and makes use of + many modern features provided by recent linux kernel releases. + + https://github.com/bus1/dbus-broker/wiki + +comment "dbusbroker needs systemd and a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_SYSTEMD
package/dbus-broker/dbus-broker.hash new file +3 -0
@@ -0,0 +1,3 @@ +# Locally calculated +sha256 95adfde56bce898c3b69eee0524732365e802348dd8189a35d5d00c30990dc81 dbus-broker-23.tar.xz +sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE
package/dbus-broker/dbus-broker.mk new file +77 -0
77 lines not on this page · raw message
package/dbus-broker/dbus.socket new file +5 -0
@@ -0,0 +1,5 @@ +[Unit] +Description=D-Bus System Message Bus Socket + +[Socket] +ListenStream=/run/dbus/system_bus_socket
package/dbus-broker/session.conf new file +65 -0
65 lines not on this page · raw message
package/dbus-broker/system.conf new file +123 -0
123 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v5 1/4 package/dbus-broker: new package
Am Sa., 18. Juli 2020 um 13:48 Uhr schrieb Yann E. MORIN <[email protected]>:
Quoted 246 lines
From: Norbert Lange <[email protected]>
dbus-broker is an alternate implementation of a dbus dameon. It can be used as a drop-in replacement for the system bus daemon, as well as the session bus daemon.
dbus-broker is (basically, and as far as we're concerned in Buildroot) split in two components:
- the actual message bus daemon, that relays messages across clients
- a launcher, which is responsible for setting various aspects of the bus, like setting the policy et al. and opening the socket(s) the message bus daemon will have to listen on...
The launcher can only be used in a systemd setup (it makes heavy use of systemd facilities), while the message bus is generic. However, the message bus daemon is useless without a launcher. There does not exist a non-systemd launcher, which makes dbus-broker actually a systemd-only package; this can be revisited when/if a non-systemd launcher appears.
There are two cases:
1. original dbus disabled
Here, we install the config files and systemd socket activation units; dbus-broker provides the system and sessions bus daemons.
2. original dbus enabled
In this case, we do not install the config files and systemd socket activation units, or define a user: they all are provided by the original dbus, and we piggy-back on those.
In this situation, the default system and sessions message bus are the original dbus; dbus-broker is not enabled.
However, users may opt-in to use dbus-broker in a few ways:
- at build-time: by providing drop-in units or presets in an overlay or custom skeleton;
- at build-time: by calling systemctl enable/disable from a post-build script;
- at runtime (on a RW filesystem): by calling systemctl enable/disableNote about the user: the path to the system bus socket is a so-called "well-known location": it is expected to be there, by spec. Moving it elsewhere is going to break existing programs. So, the user running the system bus daemon must be able to create that socket.
As we may have two packages providing a system bus daemon, they have to be both able to create the socket, and thus must both be able to write in the directory containing the socket. And since they can be switched at runtime, they must be running as the same user.
We can't just reference the original dbus user, so we duplicate the entry. What is important, is that the user be named 'dbus', as that's what we use in both cases.
Finally, the licensing terms are pretty trivial for dbus-broker itself, but it makes use of third-party code that it inherits as git submodules (that are bundled in the release archive). Thus the licensing is a bit convoluted... The third-party codes claim to be licensed as "Apache-2.0 and LGP-2.1+" in their AUTHORS files, but at the same time claim "**Apache-2.0** OR **LGPL-2.1-or-later**" in their README files. The individual source files (that are used) do not seem to have any licensing header to clarify the situation. So we represent the situation with "Apache-2.0 and/or LGPL-2.1+".
Signed-off-by Norbert Lange <[email protected]>[yann.morin.1998 at free.fr:
- don't select systemd; depend on it instead
- only install config files and systemd units without original dbus
- install a user to run the message bus as
- fix licensing info
- entirely reword and extend the commit log
- add myself to DEVELOPERS as well
]Signed-off-by Yann E. MORIN <[email protected]>---
Changes v4 -> v5 (Yann, after review by Norbert):
- define the user to run as directly in system.conf
- as a consequence, drop the unit drop-in
- add myself to DEVELOPERS as wellChanges v3 -> v4 (Yann, respining after review by Norbert):
- drop the non-systemd case
- drop the launcher option
- reinstateBR2_COREUTILS_HOST_DEPENDENCYand ln --relative
- reinstate the user, explain itChanges v2 -> v3 (Norbert, respinning after Yann):
- add an own config entry for dbus-broker-launch enabled by default if systemd init is used
- undoBR2_COREUTILS_HOST_DEPENDENCY
- undo adding dbus user - never used by this package
- add condtional audit dependency
- cleanup conditional logic a bitChanges v1 -> v2 (Yann):
- make launcher conditional
- don't select systemd; don't depend on it either
- don't install systemd units without systemd
- only install config files and systemd units wihtout original dbus
- rename hooks with meaningful names
- fix licensing info
- entirely reword and extend the commit log--- DEVELOPERS | 2 + package/Config.in | 1 + package/dbus-broker/Config.in | 22 +++++ package/dbus-broker/dbus-broker.hash | 3 + package/dbus-broker/dbus-broker.mk | 77 +++++++++++++++++ package/dbus-broker/dbus.socket | 5 ++ package/dbus-broker/session.conf | 65 ++++++++++++++ package/dbus-broker/system.conf | 123 +++++++++++++++++++++++++++ 8 files changed, 298 insertions(+) create mode 100644 package/dbus-broker/Config.in create mode 100644 package/dbus-broker/dbus-broker.hash create mode 100644 package/dbus-broker/dbus-broker.mk create mode 100644 package/dbus-broker/dbus.socket create mode 100644 package/dbus-broker/session.conf create mode 100644 package/dbus-broker/system.confDEVELOPERS +2
-0@@ -1900,6 +1900,7 @@ F: package/tpm-tools/ F: package/trousers/ N: Norbert Lange <[email protected]> +F: package/dbus-broker/ F: package/tcf-agent/ N: Nylon Chen <[email protected]>@@ -2641,6 +2642,7 @@ F: package/asterisk/ F: package/cegui/ F: package/dahdi-linux/ F: package/dahdi-tools/ +F: package/dbus-broker/ F: package/dtc/ F: package/dtv-scan-tables/ F: package/dvb-apps/package/Config.in +1
-0@@ -434,6 +434,7 @@ endmenu source "package/dahdi-linux/Config.in" source "package/dahdi-tools/Config.in" source "package/dbus/Config.in" + source "package/dbus-broker/Config.in" source "package/dbus-cpp/Config.in" source "package/dbus-glib/Config.in" source "package/dbus-python/Config.in"package/dbus-broker/Config.in new file +22
-0@@ -0,0 +1,22 @@ +config BR2_PACKAGE_DBUS_BROKER + bool "dbus-broker" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_SYSTEMD + select BR2_PACKAGE_EXPAT + help + Linux D-Bus Message Broker. + + The dbus-broker project is an implementation of a message bus + as defined by the D-Bus specification. Its aim is to provide + high performance and reliability, while keeping compatibility + to the D-Bus reference implementation. + + It is exclusively written for Linux systems, and makes use of + many modern features provided by recent linux kernel releases. + + https://github.com/bus1/dbus-broker/wiki + +comment "dbusbroker needs systemd and a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_SYSTEMDpackage/dbus-broker/dbus-broker.hash new file +3
-0@@ -0,0 +1,3 @@ +# Locally calculated +sha256 95adfde56bce898c3b69eee0524732365e802348dd8189a35d5d00c30990dc81 dbus-broker-23.tar.xz +sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSEpackage/dbus-broker/dbus-broker.mk new file +45
-0@@ -0,0 +1,77 @@ +################################################################################ +# +# dbus-broker +# +################################################################################ + +DBUS_BROKER_VERSION = 23 +DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz +DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) + +# For the third-party code, the licensing legla-info is inconsistent between +# the AUTHORS and README, so keep both +DBUS_BROKER_LICENSE = \ + Apache-2.0, \ + Apache-2.0 and/or LGPL-2.1+ (c-dvar, c-ini, c-list, c-rbtree, c-shquote, c-stdaux, c-utf8) +DBUS_BROKER_LICENSE_FILES = \ + LICENSE \ + subprojects/c-dvar/AUTHORS subprojects/c-dvar/README.md \ + subprojects/c-ini/AUTHORS subprojects/c-ini/README.md \ + subprojects/c-list/AUTHORS subprojects/c-list/README.md \ + subprojects/c-rbtree/AUTHORS subprojects/c-rbtree/README.md \ + subprojects/c-shquote/AUTHORS subprojects/c-shquote/README.md \ + subprojects/c-stdaux/AUTHORS subprojects/c-stdaux/README.md \ + subprojects/c-utf8/AUTHORS subprojects/c-utf8/README.md + +DBUS_BROKER_DEPENDENCIES = expat systemd +DBUS_BROKER_CONF_OPTS = -Dlauncher=true + +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17),y) +DBUS_BROKER_CONF_OPTS += -Dlinux-4-17=true +else +DBUS_BROKER_CONF_OPTS += -Dlinux-4-17=false +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +DBUS_BROKER_DEPENDENCIES += audit +DBUS_BROKER_CONF_OPTS += -Daudit=true +else +DBUS_BROKER_CONF_OPTS += -Daudit=false +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +DBUS_BROKER_DEPENDENCIES += libselinux +DBUS_BROKER_CONF_OPTS += -Dselinux=true +else
package/dbus-broker/dbus-broker.mk line 55
Quoted 10 lines
package/dbus-broker/dbus-broker.mk new file +10
-0+DBUS_BROKER_CONF_OPTS += -Dselinux=false +endif + +# We must be using the same user as the original dbus, so we can share +# the home directory and create a socket there. As a consequence, the +# username and groupname must be dbus:dbus, and they both need to have +# the same home. +define DBUS_BROKER_USERS + dbus -1 dbus -1 * /var/run/dbus - dbus DBus messagebus user +endef
The basic issue is, that we read the same configuration file. The sockets/dir is owned by root and connection is done as root.
But it's fine as-is, there's always potential for improvement.
Quoted 234 lines
package/dbus-broker/dbus-broker.mk new file +22
-0+ +# Only install units for system bus daemon socket if original dbus is not present +# Only install config and service files if original dbus is not present +# +# Note: BR2_COREUTILS_HOST_DEPENDENCY to be able to use ln --relative +ifeq ($(BR2_PACKAGE_DBUS),) +DBUS_BROKER_DEPENDENCIES += $(BR2_COREUTILS_HOST_DEPENDENCY) + +define DBUS_BROKER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/session.conf \ + $(TARGET_DIR)/usr/share/dbus-1/session.conf + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/system.conf \ + $(TARGET_DIR)/usr/share/dbus-1/system.conf + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/dbus.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/dbus.socket + $(HOST_MAKE_ENV) ln -sf --relative \ + $(TARGET_DIR)/usr/lib/systemd/system/dbus.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/sockets.target.wants/dbus.socket +endef +endif # !BR2_PACKAGE_DBUS + +$(eval $(meson-package))package/dbus-broker/dbus.socket new file +5
-0@@ -0,0 +1,5 @@ +[Unit] +Description=D-Bus System Message Bus Socket + +[Socket] +ListenStream=/run/dbus/system_bus_socketpackage/dbus-broker/session.conf new file +65
-0@@ -0,0 +1,65 @@ +<!-- This configuration file controls the per-user-login-session message bus. + Add a session-local.conf and edit that rather than changing this + file directly. --> + +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <!-- Our well-known bus type, don't change this --> + <type>session</type> + + <!-- If we fork, keep the user's original umask to avoid affecting + the behavior of child processes. --> + <keep_umask/> + + <standard_session_servicedirs /> + + <policy context="default"> + <!-- Allow everything to be sent --> + <allow send_destination="*" eavesdrop="true"/> + <!-- Allow everything to be received --> + <allow eavesdrop="true"/> + <!-- Allow anyone to own anything --> + <allow own="*"/> + </policy> + + <!-- Config files are placed here that among other things, + further restrict the above policy for specific services. --> + <includedir>session.d</includedir> + + <includedir>/etc/dbus-1/session.d</includedir> + + <!-- This is included last so local configuration can override what's + in this standard file --> + <include ignore_missing="yes">/etc/dbus-1/session-local.conf</include> + + <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include> + + <!-- For the session bus, override the default relatively-low limits + with essentially infinite limits, since the bus is just running + as the user anyway, using up bus resources is not something we need + to worry about. In some cases, we do set the limits lower than + "all available memory" if exceeding the limit is almost certainly a bug, + having the bus enforce a limit is nicer than a huge memory leak. But the + intent is that these limits should never be hit. --> + + <!-- the memory limits are 1G instead of say 4G because they can't exceed 32-bit signed int max --> + <limit name="max_incoming_bytes">1000000000</limit> + <limit name="max_incoming_unix_fds">250000000</limit> + <limit name="max_outgoing_bytes">1000000000</limit> + <limit name="max_outgoing_unix_fds">250000000</limit> + <limit name="max_message_size">1000000000</limit> + <!-- We do not override max_message_unix_fds here since the in-kernel + limit is also relatively low --> + <limit name="service_start_timeout">120000</limit> + <limit name="auth_timeout">240000</limit> + <limit name="pending_fd_timeout">150000</limit> + <limit name="max_completed_connections">100000</limit> + <limit name="max_incomplete_connections">10000</limit> + <limit name="max_connections_per_user">100000</limit> + <limit name="max_pending_service_starts">10000</limit> + <limit name="max_names_per_connection">50000</limit> + <limit name="max_match_rules_per_connection">50000</limit> + <limit name="max_replies_per_connection">50000</limit> + +</busconfig>package/dbus-broker/system.conf new file +123
-1@@ -0,0 +1,123 @@ +<!-- This configuration file controls the systemwide message bus. + Add a system-local.conf and edit that rather than changing this + file directly. --> + +<!-- Note that there are any number of ways you can hose yourself + security-wise by screwing up this file; in particular, you + probably don't want to listen on any more addresses, add any more + auth mechanisms, run as a different user, etc. --> + +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + + <!-- Our well-known bus type, do not change this --> + <type>system</type> + + <!-- Fork into daemon mode --> + <fork/> + + <!-- Run as special user --> + <user>dbus</user> + + <!-- We use system service launching using a helper --> + <standard_system_servicedirs/> + + <!-- Enable logging to syslog --> + <syslog/> + + <policy context="default"> + <!-- All users can connect to system bus --> + <allow user="*"/> + + <!-- Holes must be punched in service configuration files for + name ownership and sending method calls --> + <deny own="*"/> + <deny send_type="method_call"/> + + <!-- Signals and reply messages (method returns, errors) are allowed + by default --> + <allow send_type="signal"/> + <allow send_requested_reply="true" send_type="method_return"/> + <allow send_requested_reply="true" send_type="error"/> + + <!-- All messages may be received by default --> + <allow receive_type="method_call"/> + <allow receive_type="method_return"/> + <allow receive_type="error"/> + <allow receive_type="signal"/> + + <!-- Allow anyone to talk to the message bus --> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus" /> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Introspectable"/> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Properties"/> + <!-- But disallow some specific bus services --> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus" + send_member="UpdateActivationEnvironment"/> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Debug.Stats"/> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.systemd1.Activator"/> + </policy> + + <!-- Only systemd, which runs as root, may report activation failures. --> + <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.systemd1.Activator"/> + </policy> + + <!-- root may monitor the system bus. --> + <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Monitoring"/> + </policy> + + <!-- If the Stats interface was enabled@compile-time, root may use it. + Copy this into system.local.conf or system.d/*.conf if you want to + enable other privileged users to view statistics and debug info --> + <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Debug.Stats"/> + </policy> + + + <!-- The defaults for these limits are hard-coded in dbus-daemon. + Some clarifications: + Times are in milliseconds (ms); 1000ms = 1 second + 133169152 bytes = 127 MiB + 33554432 bytes = 32 MiB + 150000ms = 2.5 minutes --> + <!-- <limit name="max_incoming_bytes">133169152</limit> --> + <!-- <limit name="max_incoming_unix_fds">64</limit> --> + <!-- <limit name="max_outgoing_bytes">133169152</limit> --> + <!-- <limit name="max_outgoing_unix_fds">64</limit> --> + <!-- <limit name="max_message_size">33554432</limit> --> + <!-- <limit name="max_message_unix_fds">16</limit> --> + <!-- <limit name="service_start_timeout">25000</limit> --> + <!-- <limit name="auth_timeout">5000</limit> --> + <!-- <limit name="pending_fd_timeout">150000</limit> --> + <!-- <limit name="max_completed_connections">2048</limit> --> + <!-- <limit name="max_incomplete_connections">64</limit> --> + <!-- <limit name="max_connections_per_user">256</limit> --> + <!-- <limit name="max_pending_service_starts">512</limit> --> + <!-- <limit name="max_names_per_connection">512</limit> --> + <!-- <limit name="max_match_rules_per_connection">512</limit> --> + <!-- <limit name="max_replies_per_connection">128</limit> --> + + <!-- Config files are placed here that among other things, punch + holes in the above policy for specific services. --> + <includedir>system.d</includedir> + + <includedir>/etc/dbus-1/system.d</includedir> + + <!-- This is included last so local configuration can override what's + in this standard file --> + <include ignore_missing="yes">/etc/dbus-1/system-local.conf</include> + + <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include> + +</busconfig> --
Quoted 2 lines
2.20.1
Regards, Norbert
PATCH v5 1/4 package/dbus-broker: new package
Am Sa., 18. Juli 2020 um 16:26 Uhr schrieb Norbert Lange <[email protected]>:
Quoted 494 lines
Am Sa., 18. Juli 2020 um 13:48 Uhr schrieb Yann E. MORIN <[email protected]>:
Quoted 246 lines
From: Norbert Lange <[email protected]>
dbus-broker is an alternate implementation of a dbus dameon. It can be used as a drop-in replacement for the system bus daemon, as well as the session bus daemon.
dbus-broker is (basically, and as far as we're concerned in Buildroot) split in two components:
- the actual message bus daemon, that relays messages across clients
- a launcher, which is responsible for setting various aspects of the bus, like setting the policy et al. and opening the socket(s) the message bus daemon will have to listen on...
The launcher can only be used in a systemd setup (it makes heavy use of systemd facilities), while the message bus is generic. However, the message bus daemon is useless without a launcher. There does not exist a non-systemd launcher, which makes dbus-broker actually a systemd-only package; this can be revisited when/if a non-systemd launcher appears.
There are two cases:
1. original dbus disabled
Here, we install the config files and systemd socket activation units; dbus-broker provides the system and sessions bus daemons.
2. original dbus enabled
In this case, we do not install the config files and systemd socket activation units, or define a user: they all are provided by the original dbus, and we piggy-back on those.
In this situation, the default system and sessions message bus are the original dbus; dbus-broker is not enabled.
However, users may opt-in to use dbus-broker in a few ways:
- at build-time: by providing drop-in units or presets in an overlay or custom skeleton;
- at build-time: by calling systemctl enable/disable from a post-build script;
- at runtime (on a RW filesystem): by calling systemctl enable/disableNote about the user: the path to the system bus socket is a so-called "well-known location": it is expected to be there, by spec. Moving it elsewhere is going to break existing programs. So, the user running the system bus daemon must be able to create that socket.
As we may have two packages providing a system bus daemon, they have to be both able to create the socket, and thus must both be able to write in the directory containing the socket. And since they can be switched at runtime, they must be running as the same user.
We can't just reference the original dbus user, so we duplicate the entry. What is important, is that the user be named 'dbus', as that's what we use in both cases.
Finally, the licensing terms are pretty trivial for dbus-broker itself, but it makes use of third-party code that it inherits as git submodules (that are bundled in the release archive). Thus the licensing is a bit convoluted... The third-party codes claim to be licensed as "Apache-2.0 and LGP-2.1+" in their AUTHORS files, but at the same time claim "**Apache-2.0** OR **LGPL-2.1-or-later**" in their README files. The individual source files (that are used) do not seem to have any licensing header to clarify the situation. So we represent the situation with "Apache-2.0 and/or LGPL-2.1+".
Signed-off-by Norbert Lange <[email protected]>[yann.morin.1998 at free.fr:
- don't select systemd; depend on it instead
- only install config files and systemd units without original dbus
- install a user to run the message bus as
- fix licensing info
- entirely reword and extend the commit log
- add myself to DEVELOPERS as well
]Signed-off-by Yann E. MORIN <[email protected]>---
Changes v4 -> v5 (Yann, after review by Norbert):
- define the user to run as directly in system.conf
- as a consequence, drop the unit drop-in
- add myself to DEVELOPERS as wellChanges v3 -> v4 (Yann, respining after review by Norbert):
- drop the non-systemd case
- drop the launcher option
- reinstateBR2_COREUTILS_HOST_DEPENDENCYand ln --relative
- reinstate the user, explain itChanges v2 -> v3 (Norbert, respinning after Yann):
- add an own config entry for dbus-broker-launch enabled by default if systemd init is used
- undoBR2_COREUTILS_HOST_DEPENDENCY
- undo adding dbus user - never used by this package
- add condtional audit dependency
- cleanup conditional logic a bitChanges v1 -> v2 (Yann):
- make launcher conditional
- don't select systemd; don't depend on it either
- don't install systemd units without systemd
- only install config files and systemd units wihtout original dbus
- rename hooks with meaningful names
- fix licensing info
- entirely reword and extend the commit log--- DEVELOPERS | 2 + package/Config.in | 1 + package/dbus-broker/Config.in | 22 +++++ package/dbus-broker/dbus-broker.hash | 3 + package/dbus-broker/dbus-broker.mk | 77 +++++++++++++++++ package/dbus-broker/dbus.socket | 5 ++ package/dbus-broker/session.conf | 65 ++++++++++++++ package/dbus-broker/system.conf | 123 +++++++++++++++++++++++++++ 8 files changed, 298 insertions(+) create mode 100644 package/dbus-broker/Config.in create mode 100644 package/dbus-broker/dbus-broker.hash create mode 100644 package/dbus-broker/dbus-broker.mk create mode 100644 package/dbus-broker/dbus.socket create mode 100644 package/dbus-broker/session.conf create mode 100644 package/dbus-broker/system.confDEVELOPERS +2
-0@@ -1900,6 +1900,7 @@ F: package/tpm-tools/ F: package/trousers/ N: Norbert Lange <[email protected]> +F: package/dbus-broker/ F: package/tcf-agent/ N: Nylon Chen <[email protected]>@@ -2641,6 +2642,7 @@ F: package/asterisk/ F: package/cegui/ F: package/dahdi-linux/ F: package/dahdi-tools/ +F: package/dbus-broker/ F: package/dtc/ F: package/dtv-scan-tables/ F: package/dvb-apps/package/Config.in +1
-0@@ -434,6 +434,7 @@ endmenu source "package/dahdi-linux/Config.in" source "package/dahdi-tools/Config.in" source "package/dbus/Config.in" + source "package/dbus-broker/Config.in" source "package/dbus-cpp/Config.in" source "package/dbus-glib/Config.in" source "package/dbus-python/Config.in"package/dbus-broker/Config.in new file +22
-0@@ -0,0 +1,22 @@ +config BR2_PACKAGE_DBUS_BROKER + bool "dbus-broker" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_SYSTEMD + select BR2_PACKAGE_EXPAT + help + Linux D-Bus Message Broker. + + The dbus-broker project is an implementation of a message bus + as defined by the D-Bus specification. Its aim is to provide + high performance and reliability, while keeping compatibility + to the D-Bus reference implementation. + + It is exclusively written for Linux systems, and makes use of + many modern features provided by recent linux kernel releases. + + https://github.com/bus1/dbus-broker/wiki + +comment "dbusbroker needs systemd and a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_SYSTEMDpackage/dbus-broker/dbus-broker.hash new file +3
-0@@ -0,0 +1,3 @@ +# Locally calculated +sha256 95adfde56bce898c3b69eee0524732365e802348dd8189a35d5d00c30990dc81 dbus-broker-23.tar.xz +sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSEpackage/dbus-broker/dbus-broker.mk new file +45
-0@@ -0,0 +1,77 @@ +################################################################################ +# +# dbus-broker +# +################################################################################ + +DBUS_BROKER_VERSION = 23 +DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz +DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) + +# For the third-party code, the licensing legla-info is inconsistent between +# the AUTHORS and README, so keep both +DBUS_BROKER_LICENSE = \ + Apache-2.0, \ + Apache-2.0 and/or LGPL-2.1+ (c-dvar, c-ini, c-list, c-rbtree, c-shquote, c-stdaux, c-utf8) +DBUS_BROKER_LICENSE_FILES = \ + LICENSE \ + subprojects/c-dvar/AUTHORS subprojects/c-dvar/README.md \ + subprojects/c-ini/AUTHORS subprojects/c-ini/README.md \ + subprojects/c-list/AUTHORS subprojects/c-list/README.md \ + subprojects/c-rbtree/AUTHORS subprojects/c-rbtree/README.md \ + subprojects/c-shquote/AUTHORS subprojects/c-shquote/README.md \ + subprojects/c-stdaux/AUTHORS subprojects/c-stdaux/README.md \ + subprojects/c-utf8/AUTHORS subprojects/c-utf8/README.md + +DBUS_BROKER_DEPENDENCIES = expat systemd +DBUS_BROKER_CONF_OPTS = -Dlauncher=true + +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17),y) +DBUS_BROKER_CONF_OPTS += -Dlinux-4-17=true +else +DBUS_BROKER_CONF_OPTS += -Dlinux-4-17=false +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +DBUS_BROKER_DEPENDENCIES += audit +DBUS_BROKER_CONF_OPTS += -Daudit=true +else +DBUS_BROKER_CONF_OPTS += -Daudit=false +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +DBUS_BROKER_DEPENDENCIES += libselinux +DBUS_BROKER_CONF_OPTS += -Dselinux=true +elsepackage/dbus-broker/dbus-broker.mk line 55
Quoted 10 lines
package/dbus-broker/dbus-broker.mk new file +10
-0+DBUS_BROKER_CONF_OPTS += -Dselinux=false +endif + +# We must be using the same user as the original dbus, so we can share +# the home directory and create a socket there. As a consequence, the +# username and groupname must be dbus:dbus, and they both need to have +# the same home. +define DBUS_BROKER_USERS + dbus -1 dbus -1 * /var/run/dbus - dbus DBus messagebus user +endefThe basic issue is, that we read the same configuration file. The sockets/dir is owned by root and connection is done as root.
But it's fine as-is, there's always potential for improvement.Quoted 230 lines
package/dbus-broker/dbus-broker.mk new file +22
-0+ +# Only install units for system bus daemon socket if original dbus is not present +# Only install config and service files if original dbus is not present +# +# Note: BR2_COREUTILS_HOST_DEPENDENCY to be able to use ln --relative +ifeq ($(BR2_PACKAGE_DBUS),) +DBUS_BROKER_DEPENDENCIES += $(BR2_COREUTILS_HOST_DEPENDENCY) + +define DBUS_BROKER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/session.conf \ + $(TARGET_DIR)/usr/share/dbus-1/session.conf + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/system.conf \ + $(TARGET_DIR)/usr/share/dbus-1/system.conf + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/dbus.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/dbus.socket + $(HOST_MAKE_ENV) ln -sf --relative \ + $(TARGET_DIR)/usr/lib/systemd/system/dbus.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/sockets.target.wants/dbus.socket +endef +endif # !BR2_PACKAGE_DBUS + +$(eval $(meson-package))package/dbus-broker/dbus.socket new file +5
-0@@ -0,0 +1,5 @@ +[Unit] +Description=D-Bus System Message Bus Socket + +[Socket] +ListenStream=/run/dbus/system_bus_socketpackage/dbus-broker/session.conf new file +65
-0@@ -0,0 +1,65 @@ +<!-- This configuration file controls the per-user-login-session message bus. + Add a session-local.conf and edit that rather than changing this + file directly. --> + +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <!-- Our well-known bus type, don't change this --> + <type>session</type> + + <!-- If we fork, keep the user's original umask to avoid affecting + the behavior of child processes. --> + <keep_umask/> + + <standard_session_servicedirs /> + + <policy context="default"> + <!-- Allow everything to be sent --> + <allow send_destination="*" eavesdrop="true"/> + <!-- Allow everything to be received --> + <allow eavesdrop="true"/> + <!-- Allow anyone to own anything --> + <allow own="*"/> + </policy> + + <!-- Config files are placed here that among other things, + further restrict the above policy for specific services. --> + <includedir>session.d</includedir> + + <includedir>/etc/dbus-1/session.d</includedir> + + <!-- This is included last so local configuration can override what's + in this standard file --> + <include ignore_missing="yes">/etc/dbus-1/session-local.conf</include> + + <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include> + + <!-- For the session bus, override the default relatively-low limits + with essentially infinite limits, since the bus is just running + as the user anyway, using up bus resources is not something we need + to worry about. In some cases, we do set the limits lower than + "all available memory" if exceeding the limit is almost certainly a bug, + having the bus enforce a limit is nicer than a huge memory leak. But the + intent is that these limits should never be hit. --> + + <!-- the memory limits are 1G instead of say 4G because they can't exceed 32-bit signed int max --> + <limit name="max_incoming_bytes">1000000000</limit> + <limit name="max_incoming_unix_fds">250000000</limit> + <limit name="max_outgoing_bytes">1000000000</limit> + <limit name="max_outgoing_unix_fds">250000000</limit> + <limit name="max_message_size">1000000000</limit> + <!-- We do not override max_message_unix_fds here since the in-kernel + limit is also relatively low --> + <limit name="service_start_timeout">120000</limit> + <limit name="auth_timeout">240000</limit> + <limit name="pending_fd_timeout">150000</limit> + <limit name="max_completed_connections">100000</limit> + <limit name="max_incomplete_connections">10000</limit> + <limit name="max_connections_per_user">100000</limit> + <limit name="max_pending_service_starts">10000</limit> + <limit name="max_names_per_connection">50000</limit> + <limit name="max_match_rules_per_connection">50000</limit> + <limit name="max_replies_per_connection">50000</limit> + +</busconfig>package/dbus-broker/system.conf new file +120
-0@@ -0,0 +1,123 @@ +<!-- This configuration file controls the systemwide message bus. + Add a system-local.conf and edit that rather than changing this + file directly. --> + +<!-- Note that there are any number of ways you can hose yourself + security-wise by screwing up this file; in particular, you + probably don't want to listen on any more addresses, add any more + auth mechanisms, run as a different user, etc. --> + +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + + <!-- Our well-known bus type, do not change this --> + <type>system</type> + + <!-- Fork into daemon mode --> + <fork/> + + <!-- Run as special user --> + <user>dbus</user> + + <!-- We use system service launching using a helper --> + <standard_system_servicedirs/> + + <!-- Enable logging to syslog --> + <syslog/> + + <policy context="default"> + <!-- All users can connect to system bus --> + <allow user="*"/> + + <!-- Holes must be punched in service configuration files for + name ownership and sending method calls --> + <deny own="*"/> + <deny send_type="method_call"/> + + <!-- Signals and reply messages (method returns, errors) are allowed + by default --> + <allow send_type="signal"/> + <allow send_requested_reply="true" send_type="method_return"/> + <allow send_requested_reply="true" send_type="error"/> + + <!-- All messages may be received by default --> + <allow receive_type="method_call"/> + <allow receive_type="method_return"/> + <allow receive_type="error"/> + <allow receive_type="signal"/> + + <!-- Allow anyone to talk to the message bus --> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus" /> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Introspectable"/> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Properties"/> + <!-- But disallow some specific bus services --> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus" + send_member="UpdateActivationEnvironment"/> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Debug.Stats"/> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.systemd1.Activator"/> + </policy> + + <!-- Only systemd, which runs as root, may report activation failures. --> + <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.systemd1.Activator"/> + </policy> + + <!-- root may monitor the system bus. --> + <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Monitoring"/> + </policy> + + <!-- If the Stats interface was enabled@compile-time, root may use it. + Copy this into system.local.conf or system.d/*.conf if you want to + enable other privileged users to view statistics and debug info --> + <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Debug.Stats"/> + </policy> + + + <!-- The defaults for these limits are hard-coded in dbus-daemon. + Some clarifications: + Times are in milliseconds (ms); 1000ms = 1 second + 133169152 bytes = 127 MiB + 33554432 bytes = 32 MiB + 150000ms = 2.5 minutes --> + <!-- <limit name="max_incoming_bytes">133169152</limit> --> + <!-- <limit name="max_incoming_unix_fds">64</limit> --> + <!-- <limit name="max_outgoing_bytes">133169152</limit> --> + <!-- <limit name="max_outgoing_unix_fds">64</limit> --> + <!-- <limit name="max_message_size">33554432</limit> --> + <!-- <limit name="max_message_unix_fds">16</limit> --> + <!-- <limit name="service_start_timeout">25000</limit> --> + <!-- <limit name="auth_timeout">5000</limit> --> + <!-- <limit name="pending_fd_timeout">150000</limit> --> + <!-- <limit name="max_completed_connections">2048</limit> --> + <!-- <limit name="max_incomplete_connections">64</limit> --> + <!-- <limit name="max_connections_per_user">256</limit> --> + <!-- <limit name="max_pending_service_starts">512</limit> --> + <!-- <limit name="max_names_per_connection">512</limit> --> + <!-- <limit name="max_match_rules_per_connection">512</limit> --> + <!-- <limit name="max_replies_per_connection">128</limit> --> + + <!-- Config files are placed here that among other things, punch + holes in the above policy for specific services. --> + <includedir>system.d</includedir> + + <includedir>/etc/dbus-1/system.d</includedir> + + <!-- This is included last so local configuration can override what's + in this standard file --> + <include ignore_missing="yes">/etc/dbus-1/system-local.conf</include> +
Quoted 8 lines
Quoted 6 lines
package/dbus-broker/system.conf new file +3
-1+ <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include> + +</busconfig> --2.20.1
Regards, Norbert
Forgot:
PATCH v5 1/4 package/dbus-broker: new package
Hello;
I tend to test all packages at the beginning with the following defconfig I have:
BR2_aarch64=y
BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y
# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
# BR2_TARGET_GENERIC_GETTY is not set
# BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
# BR2_ENABLE_LOCALE_PURGE is not set
# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
# BR2_PACKAGE_URANDOM_SCRIPTS is not set
# BR2_TARGET_ROOTFS_TAR is not set
I use the Linaro toolchain for two reasons:
1) It's much smaller than the standard Arm AArch64 2019.12
2) It has older headers (4.10) which can cause problems with packages I am testing.
In this case, dbus-broker requires kernel headers >= 4.13, which the linaro toolchain does
not provide
See https://github.com/bus1/dbus-broker/issues/119
As such, I would suggest adding a dependency onBR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13
When testing with the standard Arm AArch64 2019.12 toolchain, dbus-broker built fine.
Thanks!
Adam
Quoted 511 lines · Norbert Lange
Am Sa., 18. Juli 2020 um 16:26 Uhr schrieb Norbert Lange <[email protected]>:
Quoted 494 lines
Am Sa., 18. Juli 2020 um 13:48 Uhr schrieb Yann E. MORIN <[email protected]>:
Quoted 246 lines
From: Norbert Lange <[email protected]>
dbus-broker is an alternate implementation of a dbus dameon. It can be used as a drop-in replacement for the system bus daemon, as well as the session bus daemon.
dbus-broker is (basically, and as far as we're concerned in Buildroot) split in two components:
- the actual message bus daemon, that relays messages across clients
- a launcher, which is responsible for setting various aspects of the bus, like setting the policy et al. and opening the socket(s) the message bus daemon will have to listen on...
The launcher can only be used in a systemd setup (it makes heavy use of systemd facilities), while the message bus is generic. However, the message bus daemon is useless without a launcher. There does not exist a non-systemd launcher, which makes dbus-broker actually a systemd-only package; this can be revisited when/if a non-systemd launcher appears.
There are two cases:
1. original dbus disabled
Here, we install the config files and systemd socket activation units; dbus-broker provides the system and sessions bus daemons.
2. original dbus enabled
In this case, we do not install the config files and systemd socket activation units, or define a user: they all are provided by the original dbus, and we piggy-back on those.
In this situation, the default system and sessions message bus are the original dbus; dbus-broker is not enabled.
However, users may opt-in to use dbus-broker in a few ways:
- at build-time: by providing drop-in units or presets in an overlay or custom skeleton;
- at build-time: by calling systemctl enable/disable from a post-build script;
- at runtime (on a RW filesystem): by calling systemctl enable/disableNote about the user: the path to the system bus socket is a so-called "well-known location": it is expected to be there, by spec. Moving it elsewhere is going to break existing programs. So, the user running the system bus daemon must be able to create that socket.
As we may have two packages providing a system bus daemon, they have to be both able to create the socket, and thus must both be able to write in the directory containing the socket. And since they can be switched at runtime, they must be running as the same user.
We can't just reference the original dbus user, so we duplicate the entry. What is important, is that the user be named 'dbus', as that's what we use in both cases.
Finally, the licensing terms are pretty trivial for dbus-broker itself, but it makes use of third-party code that it inherits as git submodules (that are bundled in the release archive). Thus the licensing is a bit convoluted... The third-party codes claim to be licensed as "Apache-2.0 and LGP-2.1+" in their AUTHORS files, but at the same time claim "**Apache-2.0** OR **LGPL-2.1-or-later**" in their README files. The individual source files (that are used) do not seem to have any licensing header to clarify the situation. So we represent the situation with "Apache-2.0 and/or LGPL-2.1+".
Signed-off-by Norbert Lange <[email protected]>[yann.morin.1998 at free.fr:
- don't select systemd; depend on it instead
- only install config files and systemd units without original dbus
- install a user to run the message bus as
- fix licensing info
- entirely reword and extend the commit log
- add myself to DEVELOPERS as well
]Signed-off-by Yann E. MORIN <[email protected]>---
Changes v4 -> v5 (Yann, after review by Norbert):
- define the user to run as directly in system.conf
- as a consequence, drop the unit drop-in
- add myself to DEVELOPERS as wellChanges v3 -> v4 (Yann, respining after review by Norbert):
- drop the non-systemd case
- drop the launcher option
- reinstateBR2_COREUTILS_HOST_DEPENDENCYand ln --relative
- reinstate the user, explain itChanges v2 -> v3 (Norbert, respinning after Yann):
- add an own config entry for dbus-broker-launch enabled by default if systemd init is used
- undoBR2_COREUTILS_HOST_DEPENDENCY
- undo adding dbus user - never used by this package
- add condtional audit dependency
- cleanup conditional logic a bitChanges v1 -> v2 (Yann):
- make launcher conditional
- don't select systemd; don't depend on it either
- don't install systemd units without systemd
- only install config files and systemd units wihtout original dbus
- rename hooks with meaningful names
- fix licensing info
- entirely reword and extend the commit log--- DEVELOPERS | 2 + package/Config.in | 1 + package/dbus-broker/Config.in | 22 +++++ package/dbus-broker/dbus-broker.hash | 3 + package/dbus-broker/dbus-broker.mk | 77 +++++++++++++++++ package/dbus-broker/dbus.socket | 5 ++ package/dbus-broker/session.conf | 65 ++++++++++++++ package/dbus-broker/system.conf | 123 +++++++++++++++++++++++++++ 8 files changed, 298 insertions(+) create mode 100644 package/dbus-broker/Config.in create mode 100644 package/dbus-broker/dbus-broker.hash create mode 100644 package/dbus-broker/dbus-broker.mk create mode 100644 package/dbus-broker/dbus.socket create mode 100644 package/dbus-broker/session.conf create mode 100644 package/dbus-broker/system.confDEVELOPERS +2
-0@@ -1900,6 +1900,7 @@ F: package/tpm-tools/ F: package/trousers/ N: Norbert Lange <[email protected]> +F: package/dbus-broker/ F: package/tcf-agent/ N: Nylon Chen <[email protected]>@@ -2641,6 +2642,7 @@ F: package/asterisk/ F: package/cegui/ F: package/dahdi-linux/ F: package/dahdi-tools/ +F: package/dbus-broker/ F: package/dtc/ F: package/dtv-scan-tables/ F: package/dvb-apps/package/Config.in +1
-0@@ -434,6 +434,7 @@ endmenu source "package/dahdi-linux/Config.in" source "package/dahdi-tools/Config.in" source "package/dbus/Config.in" + source "package/dbus-broker/Config.in" source "package/dbus-cpp/Config.in" source "package/dbus-glib/Config.in" source "package/dbus-python/Config.in"package/dbus-broker/Config.in new file +22
-0@@ -0,0 +1,22 @@ +config BR2_PACKAGE_DBUS_BROKER + bool "dbus-broker" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_SYSTEMD + select BR2_PACKAGE_EXPAT + help + Linux D-Bus Message Broker. + + The dbus-broker project is an implementation of a message bus + as defined by the D-Bus specification. Its aim is to provide + high performance and reliability, while keeping compatibility + to the D-Bus reference implementation. + + It is exclusively written for Linux systems, and makes use of + many modern features provided by recent linux kernel releases. + + https://github.com/bus1/dbus-broker/wiki + +comment "dbusbroker needs systemd and a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_SYSTEMDpackage/dbus-broker/dbus-broker.hash new file +3
-0@@ -0,0 +1,3 @@ +# Locally calculated +sha256 95adfde56bce898c3b69eee0524732365e802348dd8189a35d5d00c30990dc81 dbus-broker-23.tar.xz +sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSEpackage/dbus-broker/dbus-broker.mk new file +45
-0@@ -0,0 +1,77 @@ +################################################################################ +# +# dbus-broker +# +################################################################################ + +DBUS_BROKER_VERSION = 23 +DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz +DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) + +# For the third-party code, the licensing legla-info is inconsistent between +# the AUTHORS and README, so keep both +DBUS_BROKER_LICENSE = \ + Apache-2.0, \ + Apache-2.0 and/or LGPL-2.1+ (c-dvar, c-ini, c-list, c-rbtree, c-shquote, c-stdaux, c-utf8) +DBUS_BROKER_LICENSE_FILES = \ + LICENSE \ + subprojects/c-dvar/AUTHORS subprojects/c-dvar/README.md \ + subprojects/c-ini/AUTHORS subprojects/c-ini/README.md \ + subprojects/c-list/AUTHORS subprojects/c-list/README.md \ + subprojects/c-rbtree/AUTHORS subprojects/c-rbtree/README.md \ + subprojects/c-shquote/AUTHORS subprojects/c-shquote/README.md \ + subprojects/c-stdaux/AUTHORS subprojects/c-stdaux/README.md \ + subprojects/c-utf8/AUTHORS subprojects/c-utf8/README.md + +DBUS_BROKER_DEPENDENCIES = expat systemd +DBUS_BROKER_CONF_OPTS = -Dlauncher=true + +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17),y) +DBUS_BROKER_CONF_OPTS += -Dlinux-4-17=true +else +DBUS_BROKER_CONF_OPTS += -Dlinux-4-17=false +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +DBUS_BROKER_DEPENDENCIES += audit +DBUS_BROKER_CONF_OPTS += -Daudit=true +else +DBUS_BROKER_CONF_OPTS += -Daudit=false +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +DBUS_BROKER_DEPENDENCIES += libselinux +DBUS_BROKER_CONF_OPTS += -Dselinux=true +elsepackage/dbus-broker/dbus-broker.mk line 55
Quoted 10 lines
package/dbus-broker/dbus-broker.mk new file +10
-0+DBUS_BROKER_CONF_OPTS += -Dselinux=false +endif + +# We must be using the same user as the original dbus, so we can share +# the home directory and create a socket there. As a consequence, the +# username and groupname must be dbus:dbus, and they both need to have +# the same home. +define DBUS_BROKER_USERS + dbus -1 dbus -1 * /var/run/dbus - dbus DBus messagebus user +endefThe basic issue is, that we read the same configuration file. The sockets/dir is owned by root and connection is done as root.
But it's fine as-is, there's always potential for improvement.Quoted 230 lines
package/dbus-broker/dbus-broker.mk new file +22
-0+ +# Only install units for system bus daemon socket if original dbus is not present +# Only install config and service files if original dbus is not present +# +# Note: BR2_COREUTILS_HOST_DEPENDENCY to be able to use ln --relative +ifeq ($(BR2_PACKAGE_DBUS),) +DBUS_BROKER_DEPENDENCIES += $(BR2_COREUTILS_HOST_DEPENDENCY) + +define DBUS_BROKER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/session.conf \ + $(TARGET_DIR)/usr/share/dbus-1/session.conf + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/system.conf \ + $(TARGET_DIR)/usr/share/dbus-1/system.conf + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/dbus.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/dbus.socket + $(HOST_MAKE_ENV) ln -sf --relative \ + $(TARGET_DIR)/usr/lib/systemd/system/dbus.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/sockets.target.wants/dbus.socket +endef +endif # !BR2_PACKAGE_DBUS + +$(eval $(meson-package))package/dbus-broker/dbus.socket new file +5
-0@@ -0,0 +1,5 @@ +[Unit] +Description=D-Bus System Message Bus Socket + +[Socket] +ListenStream=/run/dbus/system_bus_socketpackage/dbus-broker/session.conf new file +65
-0@@ -0,0 +1,65 @@ +<!-- This configuration file controls the per-user-login-session message bus. + Add a session-local.conf and edit that rather than changing this + file directly. --> + +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <!-- Our well-known bus type, don't change this --> + <type>session</type> + + <!-- If we fork, keep the user's original umask to avoid affecting + the behavior of child processes. --> + <keep_umask/> + + <standard_session_servicedirs /> + + <policy context="default"> + <!-- Allow everything to be sent --> + <allow send_destination="*" eavesdrop="true"/> + <!-- Allow everything to be received --> + <allow eavesdrop="true"/> + <!-- Allow anyone to own anything --> + <allow own="*"/> + </policy> + + <!-- Config files are placed here that among other things, + further restrict the above policy for specific services. --> + <includedir>session.d</includedir> + + <includedir>/etc/dbus-1/session.d</includedir> + + <!-- This is included last so local configuration can override what's + in this standard file --> + <include ignore_missing="yes">/etc/dbus-1/session-local.conf</include> + + <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include> + + <!-- For the session bus, override the default relatively-low limits + with essentially infinite limits, since the bus is just running + as the user anyway, using up bus resources is not something we need + to worry about. In some cases, we do set the limits lower than + "all available memory" if exceeding the limit is almost certainly a bug, + having the bus enforce a limit is nicer than a huge memory leak. But the + intent is that these limits should never be hit. --> + + <!-- the memory limits are 1G instead of say 4G because they can't exceed 32-bit signed int max --> + <limit name="max_incoming_bytes">1000000000</limit> + <limit name="max_incoming_unix_fds">250000000</limit> + <limit name="max_outgoing_bytes">1000000000</limit> + <limit name="max_outgoing_unix_fds">250000000</limit> + <limit name="max_message_size">1000000000</limit> + <!-- We do not override max_message_unix_fds here since the in-kernel + limit is also relatively low --> + <limit name="service_start_timeout">120000</limit> + <limit name="auth_timeout">240000</limit> + <limit name="pending_fd_timeout">150000</limit> + <limit name="max_completed_connections">100000</limit> + <limit name="max_incomplete_connections">10000</limit> + <limit name="max_connections_per_user">100000</limit> + <limit name="max_pending_service_starts">10000</limit> + <limit name="max_names_per_connection">50000</limit> + <limit name="max_match_rules_per_connection">50000</limit> + <limit name="max_replies_per_connection">50000</limit> + +</busconfig>package/dbus-broker/system.conf new file +120
-0@@ -0,0 +1,123 @@ +<!-- This configuration file controls the systemwide message bus. + Add a system-local.conf and edit that rather than changing this + file directly. --> + +<!-- Note that there are any number of ways you can hose yourself + security-wise by screwing up this file; in particular, you + probably don't want to listen on any more addresses, add any more + auth mechanisms, run as a different user, etc. --> + +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + + <!-- Our well-known bus type, do not change this --> + <type>system</type> + + <!-- Fork into daemon mode --> + <fork/> + + <!-- Run as special user --> + <user>dbus</user> + + <!-- We use system service launching using a helper --> + <standard_system_servicedirs/> + + <!-- Enable logging to syslog --> + <syslog/> + + <policy context="default"> + <!-- All users can connect to system bus --> + <allow user="*"/> + + <!-- Holes must be punched in service configuration files for + name ownership and sending method calls --> + <deny own="*"/> + <deny send_type="method_call"/> + + <!-- Signals and reply messages (method returns, errors) are allowed + by default --> + <allow send_type="signal"/> + <allow send_requested_reply="true" send_type="method_return"/> + <allow send_requested_reply="true" send_type="error"/> + + <!-- All messages may be received by default --> + <allow receive_type="method_call"/> + <allow receive_type="method_return"/> + <allow receive_type="error"/> + <allow receive_type="signal"/> + + <!-- Allow anyone to talk to the message bus --> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus" /> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Introspectable"/> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Properties"/> + <!-- But disallow some specific bus services --> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus" + send_member="UpdateActivationEnvironment"/> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Debug.Stats"/> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.systemd1.Activator"/> + </policy> + + <!-- Only systemd, which runs as root, may report activation failures. --> + <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.systemd1.Activator"/> + </policy> + + <!-- root may monitor the system bus. --> + <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Monitoring"/> + </policy> + + <!-- If the Stats interface was enabled@compile-time, root may use it. + Copy this into system.local.conf or system.d/*.conf if you want to + enable other privileged users to view statistics and debug info --> + <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Debug.Stats"/> + </policy> + + + <!-- The defaults for these limits are hard-coded in dbus-daemon. + Some clarifications: + Times are in milliseconds (ms); 1000ms = 1 second + 133169152 bytes = 127 MiB + 33554432 bytes = 32 MiB + 150000ms = 2.5 minutes --> + <!-- <limit name="max_incoming_bytes">133169152</limit> --> + <!-- <limit name="max_incoming_unix_fds">64</limit> --> + <!-- <limit name="max_outgoing_bytes">133169152</limit> --> + <!-- <limit name="max_outgoing_unix_fds">64</limit> --> + <!-- <limit name="max_message_size">33554432</limit> --> + <!-- <limit name="max_message_unix_fds">16</limit> --> + <!-- <limit name="service_start_timeout">25000</limit> --> + <!-- <limit name="auth_timeout">5000</limit> --> + <!-- <limit name="pending_fd_timeout">150000</limit> --> + <!-- <limit name="max_completed_connections">2048</limit> --> + <!-- <limit name="max_incomplete_connections">64</limit> --> + <!-- <limit name="max_connections_per_user">256</limit> --> + <!-- <limit name="max_pending_service_starts">512</limit> --> + <!-- <limit name="max_names_per_connection">512</limit> --> + <!-- <limit name="max_match_rules_per_connection">512</limit> --> + <!-- <limit name="max_replies_per_connection">128</limit> --> + + <!-- Config files are placed here that among other things, punch + holes in the above policy for specific services. --> + <includedir>system.d</includedir> + + <includedir>/etc/dbus-1/system.d</includedir> + + <!-- This is included last so local configuration can override what's + in this standard file --> + <include ignore_missing="yes">/etc/dbus-1/system-local.conf</include> +Quoted 8 lines
Quoted 6 lines
package/dbus-broker/system.conf new file +3
-1+ <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include> + +</busconfig> --2.20.1
Regards, Norbert
Forgot:
Reviewed-by Norbert Lange <[email protected]>_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v5 1/4 package/dbus-broker: new package
One more thing:
Quoted 218 lines · Adam Duskett
Hello;
I tend to test all packages at the beginning with the following defconfig I have:
BR2_aarch64=y
BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y
#BR2_TARGET_ENABLE_ROOT_LOGINis not set
#BR2_TARGET_GENERIC_GETTYis not set
#BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RWis not set
#BR2_ENABLE_LOCALE_PURGEis not set
#BR2_PACKAGE_IFUPDOWN_SCRIPTSis not set
#BR2_PACKAGE_URANDOM_SCRIPTSis not set
#BR2_TARGET_ROOTFS_TARis not setI use the Linaro toolchain for two reasons:
1) It's much smaller than the standard Arm AArch64 2019.12
2) It has older headers (4.10) which can cause problems with packages I am testing.In this case, dbus-broker requires kernel headers >= 4.13, which the linaro toolchain does
not provideSee https://github.com/bus1/dbus-broker/issues/119
As such, I would suggest adding a dependency on
BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13When testing with the standard Arm AArch64 2019.12 toolchain, dbus-broker built fine.
Thanks!
AdamQuoted 181 lines · Norbert Lange
Am Sa., 18. Juli 2020 um 16:26 Uhr schrieb Norbert Lange <[email protected]>:
Quoted 179 lines
Am Sa., 18. Juli 2020 um 13:48 Uhr schrieb Yann E. MORIN <[email protected]>:
Quoted 176 lines
From: Norbert Lange <[email protected]>
dbus-broker is an alternate implementation of a dbus dameon. It can be used as a drop-in replacement for the system bus daemon, as well as the session bus daemon.
dbus-broker is (basically, and as far as we're concerned in Buildroot) split in two components:
- the actual message bus daemon, that relays messages across clients
- a launcher, which is responsible for setting various aspects of the bus, like setting the policy et al. and opening the socket(s) the message bus daemon will have to listen on...
The launcher can only be used in a systemd setup (it makes heavy use of systemd facilities), while the message bus is generic. However, the message bus daemon is useless without a launcher. There does not exist a non-systemd launcher, which makes dbus-broker actually a systemd-only package; this can be revisited when/if a non-systemd launcher appears.
There are two cases:
1. original dbus disabled
Here, we install the config files and systemd socket activation units; dbus-broker provides the system and sessions bus daemons.
2. original dbus enabled
In this case, we do not install the config files and systemd socket activation units, or define a user: they all are provided by the original dbus, and we piggy-back on those.
In this situation, the default system and sessions message bus are the original dbus; dbus-broker is not enabled.
However, users may opt-in to use dbus-broker in a few ways:
- at build-time: by providing drop-in units or presets in an overlay or custom skeleton;
- at build-time: by calling systemctl enable/disable from a post-build script;
- at runtime (on a RW filesystem): by calling systemctl enable/disableNote about the user: the path to the system bus socket is a so-called "well-known location": it is expected to be there, by spec. Moving it elsewhere is going to break existing programs. So, the user running the system bus daemon must be able to create that socket.
As we may have two packages providing a system bus daemon, they have to be both able to create the socket, and thus must both be able to write in the directory containing the socket. And since they can be switched at runtime, they must be running as the same user.
We can't just reference the original dbus user, so we duplicate the entry. What is important, is that the user be named 'dbus', as that's what we use in both cases.
Finally, the licensing terms are pretty trivial for dbus-broker itself, but it makes use of third-party code that it inherits as git submodules (that are bundled in the release archive). Thus the licensing is a bit convoluted... The third-party codes claim to be licensed as "Apache-2.0 and LGP-2.1+" in their AUTHORS files, but at the same time claim "**Apache-2.0** OR **LGPL-2.1-or-later**" in their README files. The individual source files (that are used) do not seem to have any licensing header to clarify the situation. So we represent the situation with "Apache-2.0 and/or LGPL-2.1+".
Signed-off-by Norbert Lange <[email protected]>[yann.morin.1998 at free.fr:
- don't select systemd; depend on it instead
- only install config files and systemd units without original dbus
- install a user to run the message bus as
- fix licensing info
- entirely reword and extend the commit log
- add myself to DEVELOPERS as well
]Signed-off-by Yann E. MORIN <[email protected]>---
Changes v4 -> v5 (Yann, after review by Norbert):
- define the user to run as directly in system.conf
- as a consequence, drop the unit drop-in
- add myself to DEVELOPERS as wellChanges v3 -> v4 (Yann, respining after review by Norbert):
- drop the non-systemd case
- drop the launcher option
- reinstateBR2_COREUTILS_HOST_DEPENDENCYand ln --relative
- reinstate the user, explain itChanges v2 -> v3 (Norbert, respinning after Yann):
- add an own config entry for dbus-broker-launch enabled by default if systemd init is used
- undoBR2_COREUTILS_HOST_DEPENDENCY
- undo adding dbus user - never used by this package
- add condtional audit dependency
- cleanup conditional logic a bitChanges v1 -> v2 (Yann):
- make launcher conditional
- don't select systemd; don't depend on it either
- don't install systemd units without systemd
- only install config files and systemd units wihtout original dbus
- rename hooks with meaningful names
- fix licensing info
- entirely reword and extend the commit log--- DEVELOPERS | 2 + package/Config.in | 1 + package/dbus-broker/Config.in | 22 +++++ package/dbus-broker/dbus-broker.hash | 3 + package/dbus-broker/dbus-broker.mk | 77 +++++++++++++++++ package/dbus-broker/dbus.socket | 5 ++ package/dbus-broker/session.conf | 65 ++++++++++++++ package/dbus-broker/system.conf | 123 +++++++++++++++++++++++++++ 8 files changed, 298 insertions(+) create mode 100644 package/dbus-broker/Config.in create mode 100644 package/dbus-broker/dbus-broker.hash create mode 100644 package/dbus-broker/dbus-broker.mk create mode 100644 package/dbus-broker/dbus.socket create mode 100644 package/dbus-broker/session.conf create mode 100644 package/dbus-broker/system.confDEVELOPERS +2
-0@@ -1900,6 +1900,7 @@ F: package/tpm-tools/ F: package/trousers/ N: Norbert Lange <[email protected]> +F: package/dbus-broker/ F: package/tcf-agent/ N: Nylon Chen <[email protected]>@@ -2641,6 +2642,7 @@ F: package/asterisk/ F: package/cegui/ F: package/dahdi-linux/ F: package/dahdi-tools/ +F: package/dbus-broker/ F: package/dtc/ F: package/dtv-scan-tables/ F: package/dvb-apps/package/Config.in +1
-0@@ -434,6 +434,7 @@ endmenu source "package/dahdi-linux/Config.in" source "package/dahdi-tools/Config.in" source "package/dbus/Config.in" + source "package/dbus-broker/Config.in" source "package/dbus-cpp/Config.in" source "package/dbus-glib/Config.in" source "package/dbus-python/Config.in"package/dbus-broker/Config.in new file +12
-0@@ -0,0 +1,22 @@ +config BR2_PACKAGE_DBUS_BROKER + bool "dbus-broker" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_SYSTEMD + select BR2_PACKAGE_EXPAT + help + Linux D-Bus Message Broker. + + The dbus-broker project is an implementation of a message bus + as defined by the D-Bus specification. Its aim is to provide + high performance and reliability, while keeping compatibility
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/Config.in line 20
Quoted 8 lines
package/dbus-broker/Config.in new file +8
-0+ to the D-Bus reference implementation. + + It is exclusively written for Linux systems, and makes use of + many modern features provided by recent linux kernel releases. + + https://github.com/bus1/dbus-broker/wiki + +comment "dbusbroker needs systemd and a toolchain w/ threads"
s/dbusbroker/dbus-broker/g
Quoted 322 lines
Quoted 322 lines
Quoted 307 lines
Quoted 62 lines
package/dbus-broker/Config.in new file +2
-0+ depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_SYSTEMDpackage/dbus-broker/dbus-broker.hash new file +3
-0@@ -0,0 +1,3 @@ +# Locally calculated +sha256 95adfde56bce898c3b69eee0524732365e802348dd8189a35d5d00c30990dc81 dbus-broker-23.tar.xz +sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSEpackage/dbus-broker/dbus-broker.mk new file +45
-0@@ -0,0 +1,77 @@ +################################################################################ +# +# dbus-broker +# +################################################################################ + +DBUS_BROKER_VERSION = 23 +DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz +DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) + +# For the third-party code, the licensing legla-info is inconsistent between +# the AUTHORS and README, so keep both +DBUS_BROKER_LICENSE = \ + Apache-2.0, \ + Apache-2.0 and/or LGPL-2.1+ (c-dvar, c-ini, c-list, c-rbtree, c-shquote, c-stdaux, c-utf8) +DBUS_BROKER_LICENSE_FILES = \ + LICENSE \ + subprojects/c-dvar/AUTHORS subprojects/c-dvar/README.md \ + subprojects/c-ini/AUTHORS subprojects/c-ini/README.md \ + subprojects/c-list/AUTHORS subprojects/c-list/README.md \ + subprojects/c-rbtree/AUTHORS subprojects/c-rbtree/README.md \ + subprojects/c-shquote/AUTHORS subprojects/c-shquote/README.md \ + subprojects/c-stdaux/AUTHORS subprojects/c-stdaux/README.md \ + subprojects/c-utf8/AUTHORS subprojects/c-utf8/README.md + +DBUS_BROKER_DEPENDENCIES = expat systemd +DBUS_BROKER_CONF_OPTS = -Dlauncher=true + +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17),y) +DBUS_BROKER_CONF_OPTS += -Dlinux-4-17=true +else +DBUS_BROKER_CONF_OPTS += -Dlinux-4-17=false +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +DBUS_BROKER_DEPENDENCIES += audit +DBUS_BROKER_CONF_OPTS += -Daudit=true +else +DBUS_BROKER_CONF_OPTS += -Daudit=false +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +DBUS_BROKER_DEPENDENCIES += libselinux +DBUS_BROKER_CONF_OPTS += -Dselinux=true +elsepackage/dbus-broker/dbus-broker.mk line 55
Quoted 10 lines
package/dbus-broker/dbus-broker.mk new file +10
-0+DBUS_BROKER_CONF_OPTS += -Dselinux=false +endif + +# We must be using the same user as the original dbus, so we can share +# the home directory and create a socket there. As a consequence, the +# username and groupname must be dbus:dbus, and they both need to have +# the same home. +define DBUS_BROKER_USERS + dbus -1 dbus -1 * /var/run/dbus - dbus DBus messagebus user +endefThe basic issue is, that we read the same configuration file. The sockets/dir is owned by root and connection is done as root.
But it's fine as-is, there's always potential for improvement.Quoted 230 lines
package/dbus-broker/dbus-broker.mk new file +22
-0+ +# Only install units for system bus daemon socket if original dbus is not present +# Only install config and service files if original dbus is not present +# +# Note: BR2_COREUTILS_HOST_DEPENDENCY to be able to use ln --relative +ifeq ($(BR2_PACKAGE_DBUS),) +DBUS_BROKER_DEPENDENCIES += $(BR2_COREUTILS_HOST_DEPENDENCY) + +define DBUS_BROKER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/session.conf \ + $(TARGET_DIR)/usr/share/dbus-1/session.conf + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/system.conf \ + $(TARGET_DIR)/usr/share/dbus-1/system.conf + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/dbus.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/dbus.socket + $(HOST_MAKE_ENV) ln -sf --relative \ + $(TARGET_DIR)/usr/lib/systemd/system/dbus.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/sockets.target.wants/dbus.socket +endef +endif # !BR2_PACKAGE_DBUS + +$(eval $(meson-package))package/dbus-broker/dbus.socket new file +5
-0@@ -0,0 +1,5 @@ +[Unit] +Description=D-Bus System Message Bus Socket + +[Socket] +ListenStream=/run/dbus/system_bus_socketpackage/dbus-broker/session.conf new file +65
-0@@ -0,0 +1,65 @@ +<!-- This configuration file controls the per-user-login-session message bus. + Add a session-local.conf and edit that rather than changing this + file directly. --> + +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <!-- Our well-known bus type, don't change this --> + <type>session</type> + + <!-- If we fork, keep the user's original umask to avoid affecting + the behavior of child processes. --> + <keep_umask/> + + <standard_session_servicedirs /> + + <policy context="default"> + <!-- Allow everything to be sent --> + <allow send_destination="*" eavesdrop="true"/> + <!-- Allow everything to be received --> + <allow eavesdrop="true"/> + <!-- Allow anyone to own anything --> + <allow own="*"/> + </policy> + + <!-- Config files are placed here that among other things, + further restrict the above policy for specific services. --> + <includedir>session.d</includedir> + + <includedir>/etc/dbus-1/session.d</includedir> + + <!-- This is included last so local configuration can override what's + in this standard file --> + <include ignore_missing="yes">/etc/dbus-1/session-local.conf</include> + + <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include> + + <!-- For the session bus, override the default relatively-low limits + with essentially infinite limits, since the bus is just running + as the user anyway, using up bus resources is not something we need + to worry about. In some cases, we do set the limits lower than + "all available memory" if exceeding the limit is almost certainly a bug, + having the bus enforce a limit is nicer than a huge memory leak. But the + intent is that these limits should never be hit. --> + + <!-- the memory limits are 1G instead of say 4G because they can't exceed 32-bit signed int max --> + <limit name="max_incoming_bytes">1000000000</limit> + <limit name="max_incoming_unix_fds">250000000</limit> + <limit name="max_outgoing_bytes">1000000000</limit> + <limit name="max_outgoing_unix_fds">250000000</limit> + <limit name="max_message_size">1000000000</limit> + <!-- We do not override max_message_unix_fds here since the in-kernel + limit is also relatively low --> + <limit name="service_start_timeout">120000</limit> + <limit name="auth_timeout">240000</limit> + <limit name="pending_fd_timeout">150000</limit> + <limit name="max_completed_connections">100000</limit> + <limit name="max_incomplete_connections">10000</limit> + <limit name="max_connections_per_user">100000</limit> + <limit name="max_pending_service_starts">10000</limit> + <limit name="max_names_per_connection">50000</limit> + <limit name="max_match_rules_per_connection">50000</limit> + <limit name="max_replies_per_connection">50000</limit> + +</busconfig>package/dbus-broker/system.conf new file +120
-0@@ -0,0 +1,123 @@ +<!-- This configuration file controls the systemwide message bus. + Add a system-local.conf and edit that rather than changing this + file directly. --> + +<!-- Note that there are any number of ways you can hose yourself + security-wise by screwing up this file; in particular, you + probably don't want to listen on any more addresses, add any more + auth mechanisms, run as a different user, etc. --> + +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + + <!-- Our well-known bus type, do not change this --> + <type>system</type> + + <!-- Fork into daemon mode --> + <fork/> + + <!-- Run as special user --> + <user>dbus</user> + + <!-- We use system service launching using a helper --> + <standard_system_servicedirs/> + + <!-- Enable logging to syslog --> + <syslog/> + + <policy context="default"> + <!-- All users can connect to system bus --> + <allow user="*"/> + + <!-- Holes must be punched in service configuration files for + name ownership and sending method calls --> + <deny own="*"/> + <deny send_type="method_call"/> + + <!-- Signals and reply messages (method returns, errors) are allowed + by default --> + <allow send_type="signal"/> + <allow send_requested_reply="true" send_type="method_return"/> + <allow send_requested_reply="true" send_type="error"/> + + <!-- All messages may be received by default --> + <allow receive_type="method_call"/> + <allow receive_type="method_return"/> + <allow receive_type="error"/> + <allow receive_type="signal"/> + + <!-- Allow anyone to talk to the message bus --> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus" /> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Introspectable"/> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Properties"/> + <!-- But disallow some specific bus services --> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus" + send_member="UpdateActivationEnvironment"/> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Debug.Stats"/> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.systemd1.Activator"/> + </policy> + + <!-- Only systemd, which runs as root, may report activation failures. --> + <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.systemd1.Activator"/> + </policy> + + <!-- root may monitor the system bus. --> + <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Monitoring"/> + </policy> + + <!-- If the Stats interface was enabled@compile-time, root may use it. + Copy this into system.local.conf or system.d/*.conf if you want to + enable other privileged users to view statistics and debug info --> + <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Debug.Stats"/> + </policy> + + + <!-- The defaults for these limits are hard-coded in dbus-daemon. + Some clarifications: + Times are in milliseconds (ms); 1000ms = 1 second + 133169152 bytes = 127 MiB + 33554432 bytes = 32 MiB + 150000ms = 2.5 minutes --> + <!-- <limit name="max_incoming_bytes">133169152</limit> --> + <!-- <limit name="max_incoming_unix_fds">64</limit> --> + <!-- <limit name="max_outgoing_bytes">133169152</limit> --> + <!-- <limit name="max_outgoing_unix_fds">64</limit> --> + <!-- <limit name="max_message_size">33554432</limit> --> + <!-- <limit name="max_message_unix_fds">16</limit> --> + <!-- <limit name="service_start_timeout">25000</limit> --> + <!-- <limit name="auth_timeout">5000</limit> --> + <!-- <limit name="pending_fd_timeout">150000</limit> --> + <!-- <limit name="max_completed_connections">2048</limit> --> + <!-- <limit name="max_incomplete_connections">64</limit> --> + <!-- <limit name="max_connections_per_user">256</limit> --> + <!-- <limit name="max_pending_service_starts">512</limit> --> + <!-- <limit name="max_names_per_connection">512</limit> --> + <!-- <limit name="max_match_rules_per_connection">512</limit> --> + <!-- <limit name="max_replies_per_connection">128</limit> --> + + <!-- Config files are placed here that among other things, punch + holes in the above policy for specific services. --> + <includedir>system.d</includedir> + + <includedir>/etc/dbus-1/system.d</includedir> + + <!-- This is included last so local configuration can override what's + in this standard file --> + <include ignore_missing="yes">/etc/dbus-1/system-local.conf</include> +Quoted 8 lines
Quoted 6 lines
package/dbus-broker/system.conf new file +3
-1+ <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include> + +</busconfig> --2.20.1
Regards, Norbert
Forgot:
Reviewed-by Norbert Lange <[email protected]>_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v5 1/4 package/dbus-broker: new package
Am Do., 30. Juli 2020 um 18:54 Uhr schrieb Adam Duskett <[email protected]
Quoted 627 lines
:
One more thing:
Quoted 37 lines · Adam Duskett
Hello;
I tend to test all packages at the beginning with the following defconfig I have:
BR2_aarch64=y
BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y
#BR2_TARGET_ENABLE_ROOT_LOGINis not set
#BR2_TARGET_GENERIC_GETTYis not set
#BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RWis not set
#BR2_ENABLE_LOCALE_PURGEis not set
#BR2_PACKAGE_IFUPDOWN_SCRIPTSis not set
#BR2_PACKAGE_URANDOM_SCRIPTSis not set
#BR2_TARGET_ROOTFS_TARis not setI use the Linaro toolchain for two reasons:
1) It's much smaller than the standard Arm AArch64 2019.12
2) It has older headers (4.10) which can cause problems with packages I am testing.In this case, dbus-broker requires kernel headers >= 4.13, which the linaro toolchain does
not provideSee https://github.com/bus1/dbus-broker/issues/119
As such, I would suggest adding a dependency on
BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13When testing with the standard Arm AArch64 2019.12 toolchain, dbus-broker built fine.
Thanks!
AdamOn Sat, Jul 18, 2020 at 7:27 AM Norbert Lange <[email protected]>
Quoted 2 lines · wrote:
Quoted 2 lines
Am Sa., 18. Juli 2020 um 16:26 Uhr schrieb Norbert Lange <
nolange79 at gmail.com>:
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Am Sa., 18. Juli 2020 um 13:48 Uhr schrieb Yann E. MORIN <[email protected]>:
Quoted 4 lines
From: Norbert Lange <[email protected]>
dbus-broker is an alternate implementation of a dbus dameon. It
can be
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
used as a drop-in replacement for the system bus daemon, as well
as the
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
session bus daemon.
dbus-broker is (basically, and as far as we're concerned in
Buildroot)
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
split in two components:
- the actual message bus daemon, that relays messages across
clients
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
- a launcher, which is responsible for setting various aspects
of the
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
bus, like setting the policy et al. and opening the socket(s)
the
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
message bus daemon will have to listen on...
The launcher can only be used in a systemd setup (it makes heavy
use of
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
systemd facilities), while the message bus is generic. However, the message bus daemon is useless without a launcher. There does not
exist a
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
non-systemd launcher, which makes dbus-broker actually a
systemd-only
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
package; this can be revisited when/if a non-systemd launcher
appears.
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
There are two cases:
1. original dbus disabled
Here, we install the config files and systemd socket activation units; dbus-broker provides the system and sessions bus
daemons.
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
2. original dbus enabled
In this case, we do not install the config files and systemd
socket
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
activation units, or define a user: they all are provided by
the
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
original dbus, and we piggy-back on those.
In this situation, the default system and sessions message bus
are
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
the original dbus; dbus-broker is not enabled.
However, users may opt-in to use dbus-broker in a few ways:
- at build-time: by providing drop-in units or presets in an overlay or custom skeleton;
- at build-time: by calling systemctl enable/disable from a post-build script;
- at runtime (on a RW filesystem): by calling systemctl enable/disableNote about the user: the path to the system bus socket is a
so-called
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"well-known location": it is expected to be there, by spec. Moving
it
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
elsewhere is going to break existing programs. So, the user
running the
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
system bus daemon must be able to create that socket.
As we may have two packages providing a system bus daemon, they
have to
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
be both able to create the socket, and thus must both be able to
write
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
in the directory containing the socket. And since they can be
switched
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
at runtime, they must be running as the same user.
We can't just reference the original dbus user, so we duplicate the entry. What is important, is that the user be named 'dbus', as
that's
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
what we use in both cases.
Finally, the licensing terms are pretty trivial for dbus-broker
itself,
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
but it makes use of third-party code that it inherits as git
submodules
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
(that are bundled in the release archive). Thus the licensing is a
bit
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
convoluted... The third-party codes claim to be licensed as
"Apache-2.0
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
and LGP-2.1+" in their AUTHORS files, but at the same time claim "**Apache-2.0** OR **LGPL-2.1-or-later**" in their README files.
The
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
individual source files (that are used) do not seem to have any licensing header to clarify the situation. So we represent the
situation
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
with "Apache-2.0 and/or LGPL-2.1+".
Signed-off-by Norbert Lange <[email protected]>[yann.morin.1998 at free.fr:
- don't select systemd; depend on it instead
- only install config files and systemd units without originaldbus
Quoted 27 lines
Quoted 27 lines
Quoted 27 lines
Quoted 27 lines
- install a user to run the message bus as
- fix licensing info
- entirely reword and extend the commit log
- add myself to DEVELOPERS as well
]Signed-off-by Yann E. MORIN <[email protected]>---
Changes v4 -> v5 (Yann, after review by Norbert):
- define the user to run as directly in system.conf
- as a consequence, drop the unit drop-in
- add myself to DEVELOPERS as wellChanges v3 -> v4 (Yann, respining after review by Norbert):
- drop the non-systemd case
- drop the launcher option
- reinstateBR2_COREUTILS_HOST_DEPENDENCYand ln --relative
- reinstate the user, explain itChanges v2 -> v3 (Norbert, respinning after Yann):
- add an own config entry for dbus-broker-launch enabled by default if systemd init is used
- undoBR2_COREUTILS_HOST_DEPENDENCY
- undo adding dbus user - never used by this package
- add condtional audit dependency
- cleanup conditional logic a bitQuoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Changes v1 -> v2 (Yann):
- make launcher conditional
- don't select systemd; don't depend on it either
- don't install systemd units without systemd
- only install config files and systemd units wihtout originaldbus
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
- rename hooks with meaningful names
- fix licensing info
- entirely reword and extend the commit log
---Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
DEVELOPERS | 2 + package/Config.in | 1 + package/dbus-broker/Config.in | 22 +++++ package/dbus-broker/dbus-broker.hash | 3 + package/dbus-broker/dbus-broker.mk | 77 +++++++++++++++++ package/dbus-broker/dbus.socket | 5 ++ package/dbus-broker/session.conf | 65 ++++++++++++++ package/dbus-broker/system.conf | 123+++++++++++++++++++++++++++
Quoted 33 lines
Quoted 33 lines
Quoted 33 lines
Quoted 33 lines
8 files changed, 298 insertions(+) create mode 100644 package/dbus-broker/Config.in create mode 100644 package/dbus-broker/dbus-broker.hash create mode 100644 package/dbus-broker/dbus-broker.mk create mode 100644 package/dbus-broker/dbus.socket create mode 100644 package/dbus-broker/session.conf create mode 100644 package/dbus-broker/system.confDEVELOPERS +2
-0@@ -1900,6 +1900,7 @@ F: package/tpm-tools/ F: package/trousers/ N: Norbert Lange <[email protected]> +F: package/dbus-broker/ F: package/tcf-agent/ N: Nylon Chen <[email protected]>@@ -2641,6 +2642,7 @@ F: package/asterisk/ F: package/cegui/ F: package/dahdi-linux/ F: package/dahdi-tools/ +F: package/dbus-broker/ F: package/dtc/ F: package/dtv-scan-tables/ F: package/dvb-apps/package/Config.in +0
-0@@ -434,6 +434,7 @@ endmenuQuoted 8 lines
Quoted 8 lines
Quoted 8 lines
Review
Quoted 8 lines
package/Config.in +1
-0source "package/dahdi-linux/Config.in" source "package/dahdi-tools/Config.in" source "package/dbus/Config.in" + source "package/dbus-broker/Config.in" source "package/dbus-cpp/Config.in" source "package/dbus-glib/Config.in" source "package/dbus-python/Config.in"(quoted diff) +0
-0b/package/dbus-broker/Config.in
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
new file mode 100644
index 0000000000..30d8b27280package/dbus-broker/Config.in new file +2
-0@@ -0,0 +1,22 @@ +config BR2_PACKAGE_DBUS_BROKER + bool "dbus-broker"Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/Config.in
Quoted 8 lines
package/dbus-broker/Config.in new file +8
-0+ depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_SYSTEMD + select BR2_PACKAGE_EXPAT + help + Linux D-Bus Message Broker. + + The dbus-broker project is an implementation of amessage bus
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/Config.in line 11
Quoted 1 line
package/dbus-broker/Config.in new file +1
-0+ as defined by the D-Bus specification. Its aim is toprovide
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/Config.in line 12
Quoted 1 line
package/dbus-broker/Config.in new file +1
-0+ high performance and reliability, while keepingcompatibility
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
package/dbus-broker/Config.in
Quoted 3 lines
package/dbus-broker/Config.in new file +3
-0+ to the D-Bus reference implementation. + + It is exclusively written for Linux systems, and makesuse of
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/Config.in line 16
Quoted 1 line
package/dbus-broker/Config.in new file +1
-0+ many modern features provided by recent linux kernelreleases.
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
package/dbus-broker/Config.in line 20
Quoted 4 lines
package/dbus-broker/Config.in new file +4
-0+ + https://github.com/bus1/dbus-broker/wiki + +comment "dbusbroker needs systemd and a toolchain w/ threads"s/dbusbroker/dbus-broker/g
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
package/dbus-broker/Config.in line 22
Quoted 2 lines
package/dbus-broker/Config.in new file +2
-0+ depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS ||!BR2_PACKAGE_SYSTEMD
Quoted 1 line
Quoted 1 line
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +0
-0b/package/dbus-broker/dbus-broker.hash
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
package/dbus-broker/dbus-broker.hash line 2
Quoted 7 lines
new file mode 100644
index 0000000000..b8d631767fpackage/dbus-broker/dbus-broker.hash new file +2
-0@@ -0,0 +1,3 @@ +# Locally calculated +sha256
95adfde56bce898c3b69eee0524732365e802348dd8189a35d5d00c30990dc81dbus-broker-23.tar.xzQuoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/dbus-broker.hash line 3
Quoted 1 line
package/dbus-broker/dbus-broker.hash new file +1
-0+sha256
3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4LICENSEQuoted 1 line
Quoted 1 line
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +0
-0
b/package/dbus-broker/dbus-broker.mkQuoted 6 lines
Quoted 6 lines
Quoted 6 lines
package/dbus-broker/dbus-broker.mk
Quoted 6 lines
new file mode 100644
index 0000000000..8b13c03d72package/dbus-broker/dbus-broker.mk new file +0
-0@@ -0,0 +1,77 @@+################################################################################
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
package/dbus-broker/dbus-broker.mk line 4
Quoted 4 lines
package/dbus-broker/dbus-broker.mk new file +3
-0+# +# dbus-broker +#+################################################################################
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
package/dbus-broker/dbus-broker.mk
Quoted 4 lines
package/dbus-broker/dbus-broker.mk new file +4
-0+ +DBUS_BROKER_VERSION = 23 +DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz +DBUS_BROKER_SITE =https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION)
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
package/dbus-broker/dbus-broker.mk line 9
Quoted 2 lines
package/dbus-broker/dbus-broker.mk new file +2
-0+ +# For the third-party code, the licensing legla-info isinconsistent between
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
package/dbus-broker/dbus-broker.mk
Quoted 4 lines
package/dbus-broker/dbus-broker.mk new file +4
-0+# the AUTHORS and README, so keep both +DBUS_BROKER_LICENSE = \ + Apache-2.0, \ + Apache-2.0 and/or LGPL-2.1+ (c-dvar, c-ini, c-list,c-rbtree, c-shquote, c-stdaux, c-utf8)
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
package/dbus-broker/dbus-broker.mk
Quoted 6 lines
package/dbus-broker/dbus-broker.mk new file +6
-0+DBUS_BROKER_LICENSE_FILES = \ + LICENSE \ + subprojects/c-dvar/AUTHORS subprojects/c-dvar/README.md \ + subprojects/c-ini/AUTHORS subprojects/c-ini/README.md \ + subprojects/c-list/AUTHORS subprojects/c-list/README.md \ + subprojects/c-rbtree/AUTHORS
subprojects/c-rbtree/README.md\Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/dbus-broker.mk line 20
Quoted 1 line
package/dbus-broker/dbus-broker.mk new file +1
-0+ subprojects/c-shquote/AUTHORS
subprojects/c-shquote/README.md\Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/dbus-broker.mk line 21
Quoted 1 line
package/dbus-broker/dbus-broker.mk new file +1
-0+ subprojects/c-stdaux/AUTHORS
subprojects/c-stdaux/README.md\Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
package/dbus-broker/dbus-broker.mk new file +18
-0+ subprojects/c-utf8/AUTHORS subprojects/c-utf8/README.md + +DBUS_BROKER_DEPENDENCIES = expat systemd +DBUS_BROKER_CONF_OPTS = -Dlauncher=true + +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17),y) +DBUS_BROKER_CONF_OPTS += -Dlinux-4-17=true +else +DBUS_BROKER_CONF_OPTS += -Dlinux-4-17=false +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +DBUS_BROKER_DEPENDENCIES += audit +DBUS_BROKER_CONF_OPTS += -Daudit=true +else +DBUS_BROKER_CONF_OPTS += -Daudit=false +endif +Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/dbus-broker.mk
Quoted 8 lines
package/dbus-broker/dbus-broker.mk new file +8
-0+ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +DBUS_BROKER_DEPENDENCIES += libselinux +DBUS_BROKER_CONF_OPTS += -Dselinux=true +else +DBUS_BROKER_CONF_OPTS += -Dselinux=false +endif + +# We must be using the same user as the original dbus, so we canshare
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/dbus-broker.mk line 48
Quoted 1 line
package/dbus-broker/dbus-broker.mk new file +1
-0+# the home directory and create a socket there. As a consequence,the
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/dbus-broker.mk line 49
Quoted 1 line
package/dbus-broker/dbus-broker.mk new file +1
-0+# username and groupname must be dbus:dbus, and they both need tohave
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
package/dbus-broker/dbus-broker.mk line 55
Quoted 4 lines
package/dbus-broker/dbus-broker.mk new file +4
-0+# the same home. +define DBUS_BROKER_USERS + dbus -1 dbus -1 * /var/run/dbus - dbus DBus messagebus user +endefThe basic issue is, that we read the same configuration file. The
sockets/dir is
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
owned by root and connection is done as root.
But it's fine as-is, there's always potential for improvement.package/dbus-broker/dbus-broker.mk line 55
Quoted 2 lines
package/dbus-broker/dbus-broker.mk new file +2
-0+ +# Only install units for system bus daemon socket if originaldbus is not present
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/dbus-broker.mk line 56
Quoted 1 line
package/dbus-broker/dbus-broker.mk new file +1
-0+# Only install config and service files if original dbus is notpresent
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
package/dbus-broker/dbus-broker.mk line 58
Quoted 2 lines
package/dbus-broker/dbus-broker.mk new file +2
-0+# +# Note: BR2_COREUTILS_HOST_DEPENDENCY to be able to use ln--relative
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
package/dbus-broker/dbus-broker.mk new file +5
-0+ifeq ($(BR2_PACKAGE_DBUS),) +DBUS_BROKER_DEPENDENCIES += $(BR2_COREUTILS_HOST_DEPENDENCY) + +define DBUS_BROKER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/session.conf \Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/dbus-broker.mk line 76
Quoted 8 lines
package/dbus-broker/dbus-broker.mk new file +8
-0+ $(TARGET_DIR)/usr/share/dbus-1/session.conf + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/system.conf \ + $(TARGET_DIR)/usr/share/dbus-1/system.conf + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/dbus.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/dbus.socket + $(HOST_MAKE_ENV) ln -sf --relative \ + $(TARGET_DIR)/usr/lib/systemd/system/dbus.socket \ +$(TARGET_DIR)/usr/lib/systemd/system/sockets.target.wants/dbus.socket
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Review
Quoted 5 lines
package/dbus-broker/dbus-broker.mk new file +4
-0+endef +endif # !BR2_PACKAGE_DBUS + +$(eval $(meson-package))(quoted diff) +0
-0b/package/dbus-broker/dbus.socket
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Review
Quoted 11 lines
new file mode 100644
index 0000000000..5c373cf450package/dbus-broker/dbus.socket new file +5
-0@@ -0,0 +1,5 @@ +[Unit] +Description=D-Bus System Message Bus Socket + +[Socket] +ListenStream=/run/dbus/system_bus_socket(quoted diff) +0
-0
b/package/dbus-broker/session.confQuoted 6 lines
Quoted 6 lines
Quoted 6 lines
package/dbus-broker/session.conf line 1
Quoted 6 lines
new file mode 100644
index 0000000000..e4758fa218package/dbus-broker/session.conf new file +1
-0@@ -0,0 +1,65 @@ +<!-- This configuration file controls the per-user-login-sessionmessage bus.
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/session.conf line 2
Quoted 1 line
package/dbus-broker/session.conf new file +1
-0+ Add a session-local.conf and edit that rather than changingthis
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
package/dbus-broker/session.conf
Quoted 3 lines
package/dbus-broker/session.conf new file +3
-0+ file directly. --> + +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus BusConfiguration 1.0//EN"
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
package/dbus-broker/session.conf
Quoted 6 lines
package/dbus-broker/session.conf new file +6
-0+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <!-- Our well-known bus type, don't change this --> + <type>session</type> + + <!-- If we fork, keep the user's original umask to avoidaffecting
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/session.conf new file +8
-0+ the behavior of child processes. --> + <keep_umask/> + + <standard_session_servicedirs /> + + <policy context="default"> + <!-- Allow everything to be sent --> + <allow send_destination="*" eavesdrop="true"/>Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/session.conf
Quoted 8 lines
package/dbus-broker/session.conf new file +8
-0+ <!-- Allow everything to be received --> + <allow eavesdrop="true"/> + <!-- Allow anyone to own anything --> + <allow own="*"/> + </policy> + + <!-- Config files are placed here that among other things, + further restrict the above policy for specific services.-->
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
package/dbus-broker/session.conf
Quoted 5 lines
package/dbus-broker/session.conf new file +5
-0+ <includedir>session.d</includedir> + + <includedir>/etc/dbus-1/session.d</includedir> + + <!-- This is included last so local configuration can overridewhat's
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
package/dbus-broker/session.conf line 34
Quoted 2 lines
package/dbus-broker/session.conf new file +2
-0+ in this standard file --> + <includeignore_missing="yes">/etc/dbus-1/session-local.conf</include>
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
package/dbus-broker/session.conf line 36
Quoted 2 lines
package/dbus-broker/session.conf new file +2
-0+ + <include if_selinux_enabled="yes"selinux_root_relative="yes">contexts/dbus_contexts</include>
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
package/dbus-broker/session.conf line 38
Quoted 2 lines
package/dbus-broker/session.conf new file +2
-0+ + <!-- For the session bus, override the default relatively-lowlimits
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/session.conf line 39
Quoted 1 line
package/dbus-broker/session.conf new file +1
-0+ with essentially infinite limits, since the bus is justrunning
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/session.conf line 40
Quoted 1 line
package/dbus-broker/session.conf new file +1
-0+ as the user anyway, using up bus resources is notsomething we need
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/session.conf line 41
Quoted 1 line
package/dbus-broker/session.conf new file +1
-0+ to worry about. In some cases, we do set the limits lowerthan
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/session.conf line 42
Quoted 1 line
package/dbus-broker/session.conf new file +1
-0+ "all available memory" if exceeding the limit is almostcertainly a bug,
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/session.conf line 43
Quoted 1 line
package/dbus-broker/session.conf new file +1
-0+ having the bus enforce a limit is nicer than a huge memoryleak. But the
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
package/dbus-broker/session.conf
Quoted 3 lines
package/dbus-broker/session.conf new file +3
-0+ intent is that these limits should never be hit. --> + + <!-- the memory limits are 1G instead of say 4G because theycan't exceed 32-bit signed int max -->
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
package/dbus-broker/session.conf
Quoted 6 lines
package/dbus-broker/session.conf new file +6
-0+ <limit name="max_incoming_bytes">1000000000</limit> + <limit name="max_incoming_unix_fds">250000000</limit> + <limit name="max_outgoing_bytes">1000000000</limit> + <limit name="max_outgoing_unix_fds">250000000</limit> + <limit name="max_message_size">1000000000</limit> + <!-- We do not override max_message_unix_fds here since thein-kernel
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
package/dbus-broker/session.conf new file +6
-0+ limit is also relatively low --> + <limit name="service_start_timeout">120000</limit> + <limit name="auth_timeout">240000</limit> + <limit name="pending_fd_timeout">150000</limit> + <limit name="max_completed_connections">100000</limit> + <limit name="max_incomplete_connections">10000</limit>Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Review
Quoted 8 lines
package/dbus-broker/session.conf new file +7
-0+ <limit name="max_connections_per_user">100000</limit> + <limit name="max_pending_service_starts">10000</limit> + <limit name="max_names_per_connection">50000</limit> + <limit name="max_match_rules_per_connection">50000</limit> + <limit name="max_replies_per_connection">50000</limit> + +</busconfig>(quoted diff) +0
-0
b/package/dbus-broker/system.confQuoted 7 lines
Quoted 7 lines
Quoted 7 lines
package/dbus-broker/system.conf line 2
Quoted 7 lines
new file mode 100644
index 0000000000..4b17fbd90epackage/dbus-broker/system.conf new file +2
-0@@ -0,0 +1,123 @@ +<!-- This configuration file controls the systemwide message bus. + Add a system-local.conf and edit that rather than changingthis
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
package/dbus-broker/system.conf
Quoted 5 lines
package/dbus-broker/system.conf new file +5
-0+ file directly. --> + +<!-- Note that there are any number of ways you can hose yourself + security-wise by screwing up this file; in particular, you + probably don't want to listen on any more addresses, add anymore
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
package/dbus-broker/system.conf
Quoted 3 lines
package/dbus-broker/system.conf new file +3
-0+ auth mechanisms, run as a different user, etc. --> + +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus BusConfiguration 1.0//EN"
Quoted 20 lines
Quoted 20 lines
Quoted 20 lines
Quoted 20 lines
package/dbus-broker/system.conf new file +20
-0+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + + <!-- Our well-known bus type, do not change this --> + <type>system</type> + + <!-- Fork into daemon mode --> + <fork/> + + <!-- Run as special user --> + <user>dbus</user> + + <!-- We use system service launching using a helper --> + <standard_system_servicedirs/> + + <!-- Enable logging to syslog --> + <syslog/> + + <policy context="default"> + <!-- All users can connect to system bus -->Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/system.conf
Quoted 8 lines
package/dbus-broker/system.conf new file +8
-0+ <allow user="*"/> + + <!-- Holes must be punched in service configuration files for + name ownership and sending method calls --> + <deny own="*"/> + <deny send_type="method_call"/> + + <!-- Signals and reply messages (method returns, errors) areallowed
Quoted 21 lines
Quoted 21 lines
Quoted 21 lines
Quoted 21 lines
package/dbus-broker/system.conf new file +21
-0+ by default --> + <allow send_type="signal"/> + <allow send_requested_reply="true" send_type="method_return"/> + <allow send_requested_reply="true" send_type="error"/> + + <!-- All messages may be received by default --> + <allow receive_type="method_call"/> + <allow receive_type="method_return"/> + <allow receive_type="error"/> + <allow receive_type="signal"/> + + <!-- Allow anyone to talk to the message bus --> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus" /> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Introspectable"/> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Properties"/> + <!-- But disallow some specific bus services --> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus"Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/system.conf
Quoted 8 lines
package/dbus-broker/system.conf new file +8
-0+ send_member="UpdateActivationEnvironment"/> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Debug.Stats"/> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.systemd1.Activator"/> + </policy> + + <!-- Only systemd, which runs as root, may report activationfailures. -->
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
package/dbus-broker/system.conf new file +4
-0+ <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.systemd1.Activator"/> + </policy>Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/system.conf
Quoted 8 lines
package/dbus-broker/system.conf new file +8
-0+ + <!-- root may monitor the system bus. --> + <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Monitoring"/> + </policy> + + <!-- If the Stats interface was enabled@compile-time, rootmay use it.
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/system.conf line 80
Quoted 1 line
package/dbus-broker/system.conf new file +1
-0+ Copy this into system.local.conf or system.d/*.conf if youwant to
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/system.conf line 81
Quoted 1 line
package/dbus-broker/system.conf new file +1
-0+ enable other privileged users to view statistics and debuginfo -->
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
package/dbus-broker/system.conf
Quoted 7 lines
package/dbus-broker/system.conf new file +7
-0+ <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Debug.Stats"/> + </policy> + + + <!-- The defaults for these limits are hard-coded indbus-daemon.
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
package/dbus-broker/system.conf new file +12
-0+ Some clarifications: + Times are in milliseconds (ms); 1000ms = 1 second + 133169152 bytes = 127 MiB + 33554432 bytes = 32 MiB + 150000ms = 2.5 minutes --> + <!-- <limit name="max_incoming_bytes">133169152</limit> --> + <!-- <limit name="max_incoming_unix_fds">64</limit> --> + <!-- <limit name="max_outgoing_bytes">133169152</limit> --> + <!-- <limit name="max_outgoing_unix_fds">64</limit> --> + <!-- <limit name="max_message_size">33554432</limit> --> + <!-- <limit name="max_message_unix_fds">16</limit> --> + <!-- <limit name="service_start_timeout">25000</limit> -->Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/system.conf
Quoted 8 lines
package/dbus-broker/system.conf new file +8
-0+ <!-- <limit name="auth_timeout">5000</limit> --> + <!-- <limit name="pending_fd_timeout">150000</limit> --> + <!-- <limit name="max_completed_connections">2048</limit> --> + <!-- <limit name="max_incomplete_connections">64</limit> --> + <!-- <limit name="max_connections_per_user">256</limit> --> + <!-- <limit name="max_pending_service_starts">512</limit> --> + <!-- <limit name="max_names_per_connection">512</limit> --> + <!-- <limit name="max_match_rules_per_connection">512</limit>-->
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
package/dbus-broker/system.conf
Quoted 9 lines
package/dbus-broker/system.conf new file +9
-0+ <!-- <limit name="max_replies_per_connection">128</limit> --> + + <!-- Config files are placed here that among other things, punch + holes in the above policy for specific services. --> + <includedir>system.d</includedir> + + <includedir>/etc/dbus-1/system.d</includedir> + + <!-- This is included last so local configuration can overridewhat's
Quoted 20 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
package/dbus-broker/system.conf line 119
Quoted 2 lines
package/dbus-broker/system.conf new file +2
-0+ in this standard file --> + <includeignore_missing="yes">/etc/dbus-1/system-local.conf</include>
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
package/dbus-broker/system.conf line 121
Quoted 2 lines
package/dbus-broker/system.conf new file +2
-0+ + <include if_selinux_enabled="yes"selinux_root_relative="yes">contexts/dbus_contexts</include>
Quoted 14 lines
Quoted 14 lines
Quoted 7 lines
Quoted 5 lines
package/dbus-broker/system.conf new file +2
-1+ +</busconfig> --2.20.1
Regards, Norbert
Forgot:
Reviewed-by Norbert Lange <[email protected]>_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Ping,
where are we with this series, seemed like this is good to go? (new upstream release btw)
Norbert
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200928/3147df50/attachment.html>
PATCH v5 1/4 package/dbus-broker: new package
Am Mo., 28. Sept. 2020 um 15:59 Uhr schrieb Norbert Lange < [email protected]>:
Quoted 367 lines
Am Do., 30. Juli 2020 um 18:54 Uhr schrieb Adam Duskett < aduskett at gmail.com>:
Quoted 362 lines
One more thing:
Quoted 37 lines · Adam Duskett
Hello;
I tend to test all packages at the beginning with the following defconfig I have:
BR2_aarch64=y
BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y
#BR2_TARGET_ENABLE_ROOT_LOGINis not set
#BR2_TARGET_GENERIC_GETTYis not set
#BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RWis not set
#BR2_ENABLE_LOCALE_PURGEis not set
#BR2_PACKAGE_IFUPDOWN_SCRIPTSis not set
#BR2_PACKAGE_URANDOM_SCRIPTSis not set
#BR2_TARGET_ROOTFS_TARis not setI use the Linaro toolchain for two reasons:
1) It's much smaller than the standard Arm AArch64 2019.12
2) It has older headers (4.10) which can cause problems with packages I am testing.In this case, dbus-broker requires kernel headers >= 4.13, which the linaro toolchain does
not provideSee https://github.com/bus1/dbus-broker/issues/119
As such, I would suggest adding a dependency on
BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13When testing with the standard Arm AArch64 2019.12 toolchain, dbus-broker built fine.
Thanks!
AdamOn Sat, Jul 18, 2020 at 7:27 AM Norbert Lange <[email protected]>
Quoted 2 lines · wrote:
Quoted 2 lines
Am Sa., 18. Juli 2020 um 16:26 Uhr schrieb Norbert Lange <
nolange79 at gmail.com>:
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Am Sa., 18. Juli 2020 um 13:48 Uhr schrieb Yann E. MORIN <[email protected]>:
Quoted 4 lines
From: Norbert Lange <[email protected]>
dbus-broker is an alternate implementation of a dbus dameon. It
can be
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
used as a drop-in replacement for the system bus daemon, as well
as the
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
session bus daemon.
dbus-broker is (basically, and as far as we're concerned in
Buildroot)
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
split in two components:
- the actual message bus daemon, that relays messages across
clients
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
- a launcher, which is responsible for setting various aspects
of the
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
bus, like setting the policy et al. and opening the socket(s)
the
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
message bus daemon will have to listen on...
The launcher can only be used in a systemd setup (it makes heavy
use of
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
systemd facilities), while the message bus is generic. However,
the
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
message bus daemon is useless without a launcher. There does not
exist a
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
non-systemd launcher, which makes dbus-broker actually a
systemd-only
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
package; this can be revisited when/if a non-systemd launcher
appears.
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
There are two cases:
1. original dbus disabled
Here, we install the config files and systemd socket
activation
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
units; dbus-broker provides the system and sessions bus
daemons.
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
2. original dbus enabled
In this case, we do not install the config files and systemd
socket
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
activation units, or define a user: they all are provided by
the
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
original dbus, and we piggy-back on those.
In this situation, the default system and sessions message
bus are
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
the original dbus; dbus-broker is not enabled.
However, users may opt-in to use dbus-broker in a few ways:
- at build-time: by providing drop-in units or presets in an overlay or custom skeleton;
- at build-time: by calling systemctl enable/disable from a post-build script;
- at runtime (on a RW filesystem): by calling systemctl enable/disableNote about the user: the path to the system bus socket is a
so-called
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"well-known location": it is expected to be there, by spec.
Moving it
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
elsewhere is going to break existing programs. So, the user
running the
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
system bus daemon must be able to create that socket.
As we may have two packages providing a system bus daemon, they
have to
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
be both able to create the socket, and thus must both be able to
write
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
in the directory containing the socket. And since they can be
switched
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
at runtime, they must be running as the same user.
We can't just reference the original dbus user, so we duplicate
the
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
entry. What is important, is that the user be named 'dbus', as
that's
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
what we use in both cases.
Finally, the licensing terms are pretty trivial for dbus-broker
itself,
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
but it makes use of third-party code that it inherits as git
submodules
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
(that are bundled in the release archive). Thus the licensing is
a bit
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
convoluted... The third-party codes claim to be licensed as
"Apache-2.0
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
and LGP-2.1+" in their AUTHORS files, but at the same time claim "**Apache-2.0** OR **LGPL-2.1-or-later**" in their README files.
The
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
individual source files (that are used) do not seem to have any licensing header to clarify the situation. So we represent the
situation
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
with "Apache-2.0 and/or LGPL-2.1+".
Signed-off-by Norbert Lange <[email protected]>[yann.morin.1998 at free.fr:
- don't select systemd; depend on it instead
- only install config files and systemd units without originaldbus
Quoted 27 lines
Quoted 27 lines
Quoted 27 lines
Quoted 27 lines
- install a user to run the message bus as
- fix licensing info
- entirely reword and extend the commit log
- add myself to DEVELOPERS as well
]Signed-off-by Yann E. MORIN <[email protected]>---
Changes v4 -> v5 (Yann, after review by Norbert):
- define the user to run as directly in system.conf
- as a consequence, drop the unit drop-in
- add myself to DEVELOPERS as wellChanges v3 -> v4 (Yann, respining after review by Norbert):
- drop the non-systemd case
- drop the launcher option
- reinstateBR2_COREUTILS_HOST_DEPENDENCYand ln --relative
- reinstate the user, explain itChanges v2 -> v3 (Norbert, respinning after Yann):
- add an own config entry for dbus-broker-launch enabled by default if systemd init is used
- undoBR2_COREUTILS_HOST_DEPENDENCY
- undo adding dbus user - never used by this package
- add condtional audit dependency
- cleanup conditional logic a bitQuoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Changes v1 -> v2 (Yann):
- make launcher conditional
- don't select systemd; don't depend on it either
- don't install systemd units without systemd
- only install config files and systemd units wihtout originaldbus
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
- rename hooks with meaningful names
- fix licensing info
- entirely reword and extend the commit log
---Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
DEVELOPERS | 2 + package/Config.in | 1 + package/dbus-broker/Config.in | 22 +++++ package/dbus-broker/dbus-broker.hash | 3 + package/dbus-broker/dbus-broker.mk | 77 +++++++++++++++++ package/dbus-broker/dbus.socket | 5 ++ package/dbus-broker/session.conf | 65 ++++++++++++++ package/dbus-broker/system.conf | 123+++++++++++++++++++++++++++
Quoted 33 lines
Quoted 33 lines
Quoted 33 lines
Quoted 33 lines
8 files changed, 298 insertions(+) create mode 100644 package/dbus-broker/Config.in create mode 100644 package/dbus-broker/dbus-broker.hash create mode 100644 package/dbus-broker/dbus-broker.mk create mode 100644 package/dbus-broker/dbus.socket create mode 100644 package/dbus-broker/session.conf create mode 100644 package/dbus-broker/system.confDEVELOPERS +2
-0@@ -1900,6 +1900,7 @@ F: package/tpm-tools/ F: package/trousers/ N: Norbert Lange <[email protected]> +F: package/dbus-broker/ F: package/tcf-agent/ N: Nylon Chen <[email protected]>@@ -2641,6 +2642,7 @@ F: package/asterisk/ F: package/cegui/ F: package/dahdi-linux/ F: package/dahdi-tools/ +F: package/dbus-broker/ F: package/dtc/ F: package/dtv-scan-tables/ F: package/dvb-apps/package/Config.in +0
-0@@ -434,6 +434,7 @@ endmenuQuoted 8 lines
Quoted 8 lines
Quoted 8 lines
Review
Quoted 8 lines
package/Config.in +1
-0source "package/dahdi-linux/Config.in" source "package/dahdi-tools/Config.in" source "package/dbus/Config.in" + source "package/dbus-broker/Config.in" source "package/dbus-cpp/Config.in" source "package/dbus-glib/Config.in" source "package/dbus-python/Config.in"(quoted diff) +0
-0b/package/dbus-broker/Config.in
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
new file mode 100644
index 0000000000..30d8b27280package/dbus-broker/Config.in new file +2
-0@@ -0,0 +1,22 @@ +config BR2_PACKAGE_DBUS_BROKER + bool "dbus-broker"Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/Config.in
Quoted 8 lines
package/dbus-broker/Config.in new file +8
-0+ depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_SYSTEMD + select BR2_PACKAGE_EXPAT + help + Linux D-Bus Message Broker. + + The dbus-broker project is an implementation of amessage bus
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/Config.in line 11
Quoted 1 line
package/dbus-broker/Config.in new file +1
-0+ as defined by the D-Bus specification. Its aim is toprovide
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/Config.in line 12
Quoted 1 line
package/dbus-broker/Config.in new file +1
-0+ high performance and reliability, while keepingcompatibility
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
package/dbus-broker/Config.in
Quoted 3 lines
package/dbus-broker/Config.in new file +3
-0+ to the D-Bus reference implementation. + + It is exclusively written for Linux systems, and makesuse of
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/Config.in line 16
Quoted 1 line
package/dbus-broker/Config.in new file +1
-0+ many modern features provided by recent linux kernelreleases.
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
package/dbus-broker/Config.in line 20
Quoted 4 lines
package/dbus-broker/Config.in new file +4
-0+ + https://github.com/bus1/dbus-broker/wiki + +comment "dbusbroker needs systemd and a toolchain w/ threads"s/dbusbroker/dbus-broker/g
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
package/dbus-broker/Config.in line 22
Quoted 2 lines
package/dbus-broker/Config.in new file +2
-0+ depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS ||!BR2_PACKAGE_SYSTEMD
Quoted 1 line
Quoted 1 line
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +0
-0b/package/dbus-broker/dbus-broker.hash
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
package/dbus-broker/dbus-broker.hash line 2
Quoted 7 lines
new file mode 100644
index 0000000000..b8d631767fpackage/dbus-broker/dbus-broker.hash new file +2
-0@@ -0,0 +1,3 @@ +# Locally calculated +sha256
95adfde56bce898c3b69eee0524732365e802348dd8189a35d5d00c30990dc81dbus-broker-23.tar.xzQuoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/dbus-broker.hash line 3
Quoted 1 line
package/dbus-broker/dbus-broker.hash new file +1
-0+sha256
3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4LICENSEQuoted 1 line
Quoted 1 line
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +0
-0
b/package/dbus-broker/dbus-broker.mkQuoted 6 lines
Quoted 6 lines
Quoted 6 lines
package/dbus-broker/dbus-broker.mk
Quoted 6 lines
new file mode 100644
index 0000000000..8b13c03d72package/dbus-broker/dbus-broker.mk new file +0
-0@@ -0,0 +1,77 @@+################################################################################
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
package/dbus-broker/dbus-broker.mk line 4
Quoted 4 lines
package/dbus-broker/dbus-broker.mk new file +3
-0+# +# dbus-broker +#+################################################################################
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
package/dbus-broker/dbus-broker.mk
Quoted 4 lines
package/dbus-broker/dbus-broker.mk new file +4
-0+ +DBUS_BROKER_VERSION = 23 +DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz +DBUS_BROKER_SITE =https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION)
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
package/dbus-broker/dbus-broker.mk line 9
Quoted 2 lines
package/dbus-broker/dbus-broker.mk new file +2
-0+ +# For the third-party code, the licensing legla-info isinconsistent between
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
package/dbus-broker/dbus-broker.mk
Quoted 4 lines
package/dbus-broker/dbus-broker.mk new file +4
-0+# the AUTHORS and README, so keep both +DBUS_BROKER_LICENSE = \ + Apache-2.0, \ + Apache-2.0 and/or LGPL-2.1+ (c-dvar, c-ini, c-list,c-rbtree, c-shquote, c-stdaux, c-utf8)
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
package/dbus-broker/dbus-broker.mk
Quoted 6 lines
package/dbus-broker/dbus-broker.mk new file +6
-0+DBUS_BROKER_LICENSE_FILES = \ + LICENSE \ + subprojects/c-dvar/AUTHORS subprojects/c-dvar/README.md \ + subprojects/c-ini/AUTHORS subprojects/c-ini/README.md \ + subprojects/c-list/AUTHORS subprojects/c-list/README.md \ + subprojects/c-rbtree/AUTHORS
subprojects/c-rbtree/README.md\Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/dbus-broker.mk line 20
Quoted 1 line
package/dbus-broker/dbus-broker.mk new file +1
-0+ subprojects/c-shquote/AUTHORS
subprojects/c-shquote/README.md\Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/dbus-broker.mk line 21
Quoted 1 line
package/dbus-broker/dbus-broker.mk new file +1
-0+ subprojects/c-stdaux/AUTHORS
subprojects/c-stdaux/README.md\Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
package/dbus-broker/dbus-broker.mk new file +18
-0+ subprojects/c-utf8/AUTHORS subprojects/c-utf8/README.md + +DBUS_BROKER_DEPENDENCIES = expat systemd +DBUS_BROKER_CONF_OPTS = -Dlauncher=true + +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17),y) +DBUS_BROKER_CONF_OPTS += -Dlinux-4-17=true +else +DBUS_BROKER_CONF_OPTS += -Dlinux-4-17=false +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +DBUS_BROKER_DEPENDENCIES += audit +DBUS_BROKER_CONF_OPTS += -Daudit=true +else +DBUS_BROKER_CONF_OPTS += -Daudit=false +endif +Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/dbus-broker.mk
Quoted 8 lines
package/dbus-broker/dbus-broker.mk new file +8
-0+ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +DBUS_BROKER_DEPENDENCIES += libselinux +DBUS_BROKER_CONF_OPTS += -Dselinux=true +else +DBUS_BROKER_CONF_OPTS += -Dselinux=false +endif + +# We must be using the same user as the original dbus, so we canshare
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/dbus-broker.mk line 48
Quoted 1 line
package/dbus-broker/dbus-broker.mk new file +1
-0+# the home directory and create a socket there. As aconsequence, the
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/dbus-broker.mk line 49
Quoted 1 line
package/dbus-broker/dbus-broker.mk new file +1
-0+# username and groupname must be dbus:dbus, and they both needto have
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
package/dbus-broker/dbus-broker.mk
Quoted 3 lines
package/dbus-broker/dbus-broker.mk new file +3
-0+# the same home. +define DBUS_BROKER_USERS + dbus -1 dbus -1 * /var/run/dbus - dbus DBus messagebususer
use /run/dbus
Quoted 292 lines
Quoted 270 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
+endef
The basic issue is, that we read the same configuration file. The
sockets/dir is
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
owned by root and connection is done as root.
But it's fine as-is, there's always potential for improvement.package/dbus-broker/dbus-broker.mk line 54
Quoted 2 lines
package/dbus-broker/dbus-broker.mk new file +2
-0+ +# Only install units for system bus daemon socket if originaldbus is not present
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/dbus-broker.mk line 55
Quoted 1 line
package/dbus-broker/dbus-broker.mk new file +1
-0+# Only install config and service files if original dbus is notpresent
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
package/dbus-broker/dbus-broker.mk line 57
Quoted 2 lines
package/dbus-broker/dbus-broker.mk new file +2
-0+# +# Note: BR2_COREUTILS_HOST_DEPENDENCY to be able to use ln--relative
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
package/dbus-broker/dbus-broker.mk new file +5
-0+ifeq ($(BR2_PACKAGE_DBUS),) +DBUS_BROKER_DEPENDENCIES += $(BR2_COREUTILS_HOST_DEPENDENCY) + +define DBUS_BROKER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/session.conf \Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/dbus-broker.mk line 76
Quoted 8 lines
package/dbus-broker/dbus-broker.mk new file +8
-0+ $(TARGET_DIR)/usr/share/dbus-1/session.conf + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/system.conf \ + $(TARGET_DIR)/usr/share/dbus-1/system.conf + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/dbus.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/dbus.socket + $(HOST_MAKE_ENV) ln -sf --relative \ + $(TARGET_DIR)/usr/lib/systemd/system/dbus.socket \ +$(TARGET_DIR)/usr/lib/systemd/system/sockets.target.wants/dbus.socket
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Review
Quoted 5 lines
package/dbus-broker/dbus-broker.mk new file +4
-0+endef +endif # !BR2_PACKAGE_DBUS + +$(eval $(meson-package))(quoted diff) +0
-0b/package/dbus-broker/dbus.socket
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Review
Quoted 11 lines
new file mode 100644
index 0000000000..5c373cf450package/dbus-broker/dbus.socket new file +5
-0@@ -0,0 +1,5 @@ +[Unit] +Description=D-Bus System Message Bus Socket + +[Socket] +ListenStream=/run/dbus/system_bus_socket(quoted diff) +0
-0
b/package/dbus-broker/session.confQuoted 6 lines
Quoted 6 lines
Quoted 6 lines
package/dbus-broker/session.conf line 1
Quoted 6 lines
new file mode 100644
index 0000000000..e4758fa218package/dbus-broker/session.conf new file +1
-0@@ -0,0 +1,65 @@ +<!-- This configuration file controls the per-user-login-sessionmessage bus.
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/session.conf line 2
Quoted 1 line
package/dbus-broker/session.conf new file +1
-0+ Add a session-local.conf and edit that rather than changingthis
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
package/dbus-broker/session.conf
Quoted 3 lines
package/dbus-broker/session.conf new file +3
-0+ file directly. --> + +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus BusConfiguration 1.0//EN"
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
package/dbus-broker/session.conf
Quoted 6 lines
package/dbus-broker/session.conf new file +6
-0+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <!-- Our well-known bus type, don't change this --> + <type>session</type> + + <!-- If we fork, keep the user's original umask to avoidaffecting
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/session.conf new file +8
-0+ the behavior of child processes. --> + <keep_umask/> + + <standard_session_servicedirs /> + + <policy context="default"> + <!-- Allow everything to be sent --> + <allow send_destination="*" eavesdrop="true"/>Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/session.conf
Quoted 8 lines
package/dbus-broker/session.conf new file +8
-0+ <!-- Allow everything to be received --> + <allow eavesdrop="true"/> + <!-- Allow anyone to own anything --> + <allow own="*"/> + </policy> + + <!-- Config files are placed here that among other things, + further restrict the above policy for specific services.-->
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
package/dbus-broker/session.conf
Quoted 5 lines
package/dbus-broker/session.conf new file +5
-0+ <includedir>session.d</includedir> + + <includedir>/etc/dbus-1/session.d</includedir> + + <!-- This is included last so local configuration can overridewhat's
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
package/dbus-broker/session.conf line 34
Quoted 2 lines
package/dbus-broker/session.conf new file +2
-0+ in this standard file --> + <includeignore_missing="yes">/etc/dbus-1/session-local.conf</include>
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
package/dbus-broker/session.conf line 36
Quoted 2 lines
package/dbus-broker/session.conf new file +2
-0+ + <include if_selinux_enabled="yes"selinux_root_relative="yes">contexts/dbus_contexts</include>
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
package/dbus-broker/session.conf line 38
Quoted 2 lines
package/dbus-broker/session.conf new file +2
-0+ + <!-- For the session bus, override the default relatively-lowlimits
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/session.conf line 39
Quoted 1 line
package/dbus-broker/session.conf new file +1
-0+ with essentially infinite limits, since the bus is justrunning
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/session.conf line 40
Quoted 1 line
package/dbus-broker/session.conf new file +1
-0+ as the user anyway, using up bus resources is notsomething we need
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/session.conf line 41
Quoted 1 line
package/dbus-broker/session.conf new file +1
-0+ to worry about. In some cases, we do set the limits lowerthan
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/session.conf line 42
Quoted 1 line
package/dbus-broker/session.conf new file +1
-0+ "all available memory" if exceeding the limit is almostcertainly a bug,
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/session.conf line 43
Quoted 1 line
package/dbus-broker/session.conf new file +1
-0+ having the bus enforce a limit is nicer than a hugememory leak. But the
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
package/dbus-broker/session.conf
Quoted 3 lines
package/dbus-broker/session.conf new file +3
-0+ intent is that these limits should never be hit. --> + + <!-- the memory limits are 1G instead of say 4G because theycan't exceed 32-bit signed int max -->
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
package/dbus-broker/session.conf
Quoted 6 lines
package/dbus-broker/session.conf new file +6
-0+ <limit name="max_incoming_bytes">1000000000</limit> + <limit name="max_incoming_unix_fds">250000000</limit> + <limit name="max_outgoing_bytes">1000000000</limit> + <limit name="max_outgoing_unix_fds">250000000</limit> + <limit name="max_message_size">1000000000</limit> + <!-- We do not override max_message_unix_fds here since thein-kernel
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
package/dbus-broker/session.conf new file +6
-0+ limit is also relatively low --> + <limit name="service_start_timeout">120000</limit> + <limit name="auth_timeout">240000</limit> + <limit name="pending_fd_timeout">150000</limit> + <limit name="max_completed_connections">100000</limit> + <limit name="max_incomplete_connections">10000</limit>Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Review
Quoted 8 lines
package/dbus-broker/session.conf new file +7
-0+ <limit name="max_connections_per_user">100000</limit> + <limit name="max_pending_service_starts">10000</limit> + <limit name="max_names_per_connection">50000</limit> + <limit name="max_match_rules_per_connection">50000</limit> + <limit name="max_replies_per_connection">50000</limit> + +</busconfig>(quoted diff) +0
-0
b/package/dbus-broker/system.confQuoted 7 lines
Quoted 7 lines
Quoted 7 lines
package/dbus-broker/system.conf line 2
Quoted 7 lines
new file mode 100644
index 0000000000..4b17fbd90epackage/dbus-broker/system.conf new file +2
-0@@ -0,0 +1,123 @@ +<!-- This configuration file controls the systemwide message bus. + Add a system-local.conf and edit that rather than changingthis
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
package/dbus-broker/system.conf
Quoted 5 lines
package/dbus-broker/system.conf new file +5
-0+ file directly. --> + +<!-- Note that there are any number of ways you can hose yourself + security-wise by screwing up this file; in particular, you + probably don't want to listen on any more addresses, addany more
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
package/dbus-broker/system.conf
Quoted 3 lines
package/dbus-broker/system.conf new file +3
-0+ auth mechanisms, run as a different user, etc. --> + +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus BusConfiguration 1.0//EN"
Quoted 20 lines
Quoted 20 lines
Quoted 20 lines
Quoted 20 lines
package/dbus-broker/system.conf new file +20
-0+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + + <!-- Our well-known bus type, do not change this --> + <type>system</type> + + <!-- Fork into daemon mode --> + <fork/> + + <!-- Run as special user --> + <user>dbus</user> + + <!-- We use system service launching using a helper --> + <standard_system_servicedirs/> + + <!-- Enable logging to syslog --> + <syslog/> + + <policy context="default"> + <!-- All users can connect to system bus -->Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/system.conf
Quoted 8 lines
package/dbus-broker/system.conf new file +8
-0+ <allow user="*"/> + + <!-- Holes must be punched in service configuration files for + name ownership and sending method calls --> + <deny own="*"/> + <deny send_type="method_call"/> + + <!-- Signals and reply messages (method returns, errors) areallowed
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
package/dbus-broker/system.conf
Quoted 3 lines
package/dbus-broker/system.conf new file +3
-0+ by default --> + <allow send_type="signal"/> + <allow send_requested_reply="true"send_type="method_return"/>
Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
package/dbus-broker/system.conf new file +18
-0+ <allow send_requested_reply="true" send_type="error"/> + + <!-- All messages may be received by default --> + <allow receive_type="method_call"/> + <allow receive_type="method_return"/> + <allow receive_type="error"/> + <allow receive_type="signal"/> + + <!-- Allow anyone to talk to the message bus --> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus" /> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Introspectable"/> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Properties"/> + <!-- But disallow some specific bus services --> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus"Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/system.conf
Quoted 8 lines
package/dbus-broker/system.conf new file +8
-0+ send_member="UpdateActivationEnvironment"/> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Debug.Stats"/> + <deny send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.systemd1.Activator"/> + </policy> + + <!-- Only systemd, which runs as root, may report activationfailures. -->
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
package/dbus-broker/system.conf new file +4
-0+ <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.systemd1.Activator"/> + </policy>Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/system.conf
Quoted 8 lines
package/dbus-broker/system.conf new file +8
-0+ + <!-- root may monitor the system bus. --> + <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Monitoring"/> + </policy> + + <!-- If the Stats interface was enabled@compile-time, rootmay use it.
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/system.conf line 80
Quoted 1 line
package/dbus-broker/system.conf new file +1
-0+ Copy this into system.local.conf or system.d/*.conf ifyou want to
Quoted 1 line
Quoted 1 line
Quoted 1 line
package/dbus-broker/system.conf line 81
Quoted 1 line
package/dbus-broker/system.conf new file +1
-0+ enable other privileged users to view statistics anddebug info -->
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
package/dbus-broker/system.conf
Quoted 7 lines
package/dbus-broker/system.conf new file +7
-0+ <policy user="root"> + <allow send_destination="org.freedesktop.DBus" + send_interface="org.freedesktop.DBus.Debug.Stats"/> + </policy> + + + <!-- The defaults for these limits are hard-coded indbus-daemon.
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
package/dbus-broker/system.conf new file +12
-0+ Some clarifications: + Times are in milliseconds (ms); 1000ms = 1 second + 133169152 bytes = 127 MiB + 33554432 bytes = 32 MiB + 150000ms = 2.5 minutes --> + <!-- <limit name="max_incoming_bytes">133169152</limit> --> + <!-- <limit name="max_incoming_unix_fds">64</limit> --> + <!-- <limit name="max_outgoing_bytes">133169152</limit> --> + <!-- <limit name="max_outgoing_unix_fds">64</limit> --> + <!-- <limit name="max_message_size">33554432</limit> --> + <!-- <limit name="max_message_unix_fds">16</limit> --> + <!-- <limit name="service_start_timeout">25000</limit> -->Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
package/dbus-broker/system.conf
Quoted 8 lines
package/dbus-broker/system.conf new file +8
-0+ <!-- <limit name="auth_timeout">5000</limit> --> + <!-- <limit name="pending_fd_timeout">150000</limit> --> + <!-- <limit name="max_completed_connections">2048</limit> --> + <!-- <limit name="max_incomplete_connections">64</limit> --> + <!-- <limit name="max_connections_per_user">256</limit> --> + <!-- <limit name="max_pending_service_starts">512</limit> --> + <!-- <limit name="max_names_per_connection">512</limit> --> + <!-- <limit name="max_match_rules_per_connection">512</limit>-->
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
package/dbus-broker/system.conf
Quoted 3 lines
package/dbus-broker/system.conf new file +3
-0+ <!-- <limit name="max_replies_per_connection">128</limit> --> + + <!-- Config files are placed here that among other things,punch
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
package/dbus-broker/system.conf
Quoted 6 lines
package/dbus-broker/system.conf new file +6
-0+ holes in the above policy for specific services. --> + <includedir>system.d</includedir> + + <includedir>/etc/dbus-1/system.d</includedir> + + <!-- This is included last so local configuration can overridewhat's
Quoted 20 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
package/dbus-broker/system.conf line 119
Quoted 2 lines
package/dbus-broker/system.conf new file +2
-0+ in this standard file --> + <includeignore_missing="yes">/etc/dbus-1/system-local.conf</include>
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
package/dbus-broker/system.conf line 121
Quoted 2 lines
package/dbus-broker/system.conf new file +2
-0+ + <include if_selinux_enabled="yes"selinux_root_relative="yes">contexts/dbus_contexts</include>
Quoted 14 lines
Quoted 14 lines
Quoted 7 lines
Quoted 5 lines
package/dbus-broker/system.conf new file +2
-1+ +</busconfig> --2.20.1
Regards, Norbert
Forgot:
Reviewed-by Norbert Lange <[email protected]>_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Quoted 7 lines
Ping,
where are we with this series, seemed like this is good to go? (new upstream release btw)
Norbert
FYI, with nss-systemd plugin working, it's possible to remove the dbus user/group
from the system configuration. Place this in the service file:
User=dbus
Group=dbus
DynamicUser=true
ExecStart=!/usr/bin/dbus-broker-launch --scope system --audit ExecReload=!/usr/bin/busctl call org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus ReloadConfig
Norbert
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200928/9f65a306/attachment.html>
PATCH v5 2/4 package/systemd: do not force dbus if dbus-broker is available
In reply to Yann E. MORINdbus-broker fits the bill as a message bus daemon, so only enable the original dbus if dbus-broker is not enabled.
--- package/systemd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/systemd/Config.in +1 -1
@@ -25,7 +25,7 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd select BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_DBUS # runtime dependency only + select BR2_PACKAGE_DBUS if !BR2_PACKAGE_DBUS_BROKER # runtime select BR2_PACKAGE_LIBCAP select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
Signature · 1 line
2.20.1
PATCH v5 2/4 package/systemd: do not force dbus if dbus-broker is available
Am Sa., 18. Juli 2020 um 13:48 Uhr schrieb Yann E. MORIN <[email protected]>:
Quoted 24 lines
dbus-broker fits the bill as a message bus daemon, so only enable the original dbus if dbus-broker is not enabled.
Signed-off-by Yann E. MORIN <[email protected]>Cc Norbert Lange <[email protected]>--- package/systemd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/systemd/Config.in +1
-2@@ -25,7 +25,7 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd select BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_DBUS # runtime dependency only + select BR2_PACKAGE_DBUS if !BR2_PACKAGE_DBUS_BROKER # runtime select BR2_PACKAGE_LIBCAP select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBBLKID --
Quoted 2 lines
2.20.1
PATCH v5 3/4 support/testsuite: de-duplicate the systemd runtime tests
In reply to Yann E. MORINOf all the systemd init tests, only one does some additional tests, and for just this lone wolf, we duplicate the test function.
--- support/testing/tests/init/test_systemd.py | 32 ++++++++-------------- 1 file changed, 12 insertions(+), 20 deletions(-)
support/testing/tests/init/test_systemd.py +12 -20
@@ -21,8 +21,9 @@ class InitSystemSystemdBase(InitSystemBase): # BR2_TARGET_ROOTFS_TAR is not set """.format(infra.filepath("conf/binfmt-misc-kernel-fragment.config")) - def check_init(self): - super(InitSystemSystemdBase, self).check_init("/lib/systemd/systemd") + def check_systemd(self, fs): + self.start_emulator(fs, "zImage", "vexpress-v2p-ca9") + self.check_init("/lib/systemd/systemd") # Test all units are OK output, _ = self.emulator.run("systemctl --no-pager --failed --no-legend")
@@ -36,6 +37,9 @@ class InitSystemSystemdBase(InitSystemBase): output, _ = self.emulator.run("journalctl --no-pager --lines 1 --quiet") self.assertEqual(len(output), 1) + # Check the network is up + self.check_network("eth0") + class TestInitSystemSystemdRoNetworkd(InitSystemSystemdBase): config = InitSystemSystemdBase.config + \
@@ -47,9 +51,7 @@ class TestInitSystemSystemdRoNetworkd(InitSystemSystemdBase): """.format(infra.filepath("tests/init/systemd-factory")) def test_run(self): - self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("squashfs") # This one must be executed on the target, to check that # the factory feature works as expected
@@ -66,9 +68,7 @@ class TestInitSystemSystemdRwNetworkd(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("ext2") class TestInitSystemSystemdRoIfupdown(InitSystemSystemdBase):
@@ -81,9 +81,7 @@ class TestInitSystemSystemdRoIfupdown(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("squashfs") class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase):
@@ -96,9 +94,7 @@ class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("ext2") class TestInitSystemSystemdRoFull(InitSystemSystemdBase):
@@ -127,9 +123,7 @@ class TestInitSystemSystemdRoFull(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("squashfs") class TestInitSystemSystemdRwFull(InitSystemSystemdBase):
@@ -157,6 +151,4 @@ class TestInitSystemSystemdRwFull(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("ext2")
Signature · 1 line
2.20.1
PATCH v5 4/4 support/run-test: add test for systemd using dbus-broker
In reply to Yann E. MORINAdd four new tests for systemd (rw and ro in each case):
- use dbus-broker instead of the original dbus
- use the original dbus, with dbus-broker installed
The first two extend the existing IfUpDown test cases by just enabling dbus-broker; the second ones extend this further, by explicitly enabling the original dbus.
For one of the tests, we overload the test_run() function to test that the dbus-broker daemon is indeed running as root. We need not replicate that check in the other dbus-broker-only test, and it does not make sense to test that in tests that have the original dbus enabled.
Presence of the original dbus and dbus-broker on the same system is
valid: the original dbus is used as the default system bus daemon. We do not test switching between the two at runtime, though as this is really too corner-case specific. We just test to ensure the original dbus system bus daemon is not impacted by the presence of dbus-broker.
Note: the 'full' test-case enables all systemd options, and some of them do pull the original dbus package, so we can't use that to test the integration of dbus-broker; instead, we extend the ifupdown case, which does not enable the original dbus.
--- .gitlab-ci.yml | 4 +++ support/testing/tests/init/test_systemd.py | 37 ++++++++++++++++++++++ 2 files changed, 41 insertions(+)
.gitlab-ci.yml +4 -0
@@ -399,9 +399,13 @@ tests.init.test_openrc.TestInitSystemOpenrcRoFull: { extends: .runtime_test } tests.init.test_openrc.TestInitSystemOpenrcRwFull: { extends: .runtime_test } tests.init.test_systemd.TestInitSystemSystemdRoFull: { extends: .runtime_test } tests.init.test_systemd.TestInitSystemSystemdRoIfupdown: { extends: .runtime_test } +tests.init.test_systemd.TestInitSystemSystemdRoIfupdownDbusbroker: { extends: .runtime_test } +tests.init.test_systemd.TestInitSystemSystemdRoIfupdownDbusbrokerDbus: { extends: .runtime_test } tests.init.test_systemd.TestInitSystemSystemdRoNetworkd: { extends: .runtime_test } tests.init.test_systemd.TestInitSystemSystemdRwFull: { extends: .runtime_test } tests.init.test_systemd.TestInitSystemSystemdRwIfupdown: { extends: .runtime_test } +tests.init.test_systemd.TestInitSystemSystemdRwIfupdownDbusbroker: { extends: .runtime_test } +tests.init.test_systemd.TestInitSystemSystemdRwIfupdownDbusbrokerDbus: { extends: .runtime_test } tests.init.test_systemd.TestInitSystemSystemdRwNetworkd: { extends: .runtime_test } tests.package.test_atop.TestAtop: { extends: .runtime_test } tests.package.test_crudini.TestCrudiniPy2: { extends: .runtime_test }
support/testing/tests/init/test_systemd.py +37 -0
@@ -84,6 +84,29 @@ class TestInitSystemSystemdRoIfupdown(InitSystemSystemdBase): self.check_systemd("squashfs") +class TestInitSystemSystemdRoIfupdownDbusbroker(TestInitSystemSystemdRoIfupdown): + config = TestInitSystemSystemdRoIfupdown.config + \ + """ + BR2_PACKAGE_DBUS_BROKER=y + """ + + def test_run(self): + # Parent class' test_run() method does exactly that, no more: + self.check_systemd("squashfs") + + # Check that the dbus-broker daemon is running as non-root + cmd = "find /proc/$(pidof dbus-broker) -maxdepth 1 -name exe -user dbus" + out, _ = self.emulator.run(cmd) + self.assertEqual(len(out), 1) + + +class TestInitSystemSystemdRoIfupdownDbusbrokerDbus(TestInitSystemSystemdRoIfupdownDbusbroker): + config = TestInitSystemSystemdRoIfupdownDbusbroker.config + \ + """ + BR2_PACKAGE_DBUS=y + """ + + class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase): config = InitSystemSystemdBase.config + \ """
@@ -97,6 +120,20 @@ class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase): self.check_systemd("ext2") +class TestInitSystemSystemdRwIfupdownDbusbroker(TestInitSystemSystemdRwIfupdown): + config = TestInitSystemSystemdRwIfupdown.config + \ + """ + BR2_PACKAGE_DBUS_BROKER=y + """ + + +class TestInitSystemSystemdRwIfupdownDbusbrokerDbus(TestInitSystemSystemdRwIfupdownDbusbroker): + config = TestInitSystemSystemdRwIfupdownDbusbroker.config + \ + """ + BR2_PACKAGE_DBUS=y + """ + + class TestInitSystemSystemdRoFull(InitSystemSystemdBase): config = InitSystemSystemdBase.config + \ """
Signature · 1 line
2.20.1