From 2abdb13ebe737e39653b79fecd93477e156b9db1 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 18 Jan 2005 22:20:38 +0000 Subject: 2005-01-18 Havoc Pennington * rename dbus-daemon-1 to dbus-daemon throughout --- ChangeLog | 4 + bus/Makefile.am | 14 +- bus/dbus-daemon-1.1.in | 575 ------------------------------------------------- bus/dbus-daemon.1.in | 575 +++++++++++++++++++++++++++++++++++++++++++++++++ bus/main.c | 2 +- bus/messagebus.in | 6 +- bus/rc.messagebus.in | 12 +- configure.in | 2 +- doc/TODO | 6 - test/glib/run-test.sh | 2 +- tools/dbus-launch.1 | 6 +- tools/dbus-launch.c | 6 +- 12 files changed, 604 insertions(+), 606 deletions(-) delete mode 100644 bus/dbus-daemon-1.1.in create mode 100644 bus/dbus-daemon.1.in diff --git a/ChangeLog b/ChangeLog index d64f8c26..1a9bcfcf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-01-18 Havoc Pennington + + * rename dbus-daemon-1 to dbus-daemon throughout + 2005-01-18 Havoc Pennington * Throughout, grand renaming to strip out the use of "service", diff --git a/bus/Makefile.am b/bus/Makefile.am index f6e03d77..b6480856 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -2,7 +2,7 @@ configdir=$(sysconfdir)/dbus-1 INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) \ - -DDAEMON_NAME=\"dbus-daemon-1\" -DDBUS_COMPILATION \ + -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION \ -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ -DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\" @@ -16,7 +16,7 @@ config_DATA= \ session.conf \ system.conf -bin_PROGRAMS=dbus-daemon-1 +bin_PROGRAMS=dbus-daemon if DBUS_USE_LIBXML XML_SOURCES=config-loader-libxml.c @@ -56,11 +56,11 @@ BUS_SOURCES= \ utils.h \ $(XML_SOURCES) -dbus_daemon_1_SOURCES= \ +dbus_daemon_SOURCES= \ $(BUS_SOURCES) \ main.c -dbus_daemon_1_LDADD= \ +dbus_daemon_LDADD= \ $(EFENCE) \ $(DBUS_BUS_LIBS) \ $(top_builddir)/dbus/libdbus-convenience.la @@ -108,7 +108,7 @@ initd_SCRIPTS= \ endif ## Red Hat end - + ## Slackware start if DBUS_INIT_SCRIPTS_SLACKWARE @@ -120,8 +120,8 @@ initd_SCRIPTS= \ endif ## Slackware end -MAN_IN_FILES=dbus-daemon-1.1.in -man_MANS = dbus-daemon-1.1 +MAN_IN_FILES=dbus-daemon.1.in +man_MANS = dbus-daemon.1 #### Extra dist diff --git a/bus/dbus-daemon-1.1.in b/bus/dbus-daemon-1.1.in deleted file mode 100644 index c38ca68a..00000000 --- a/bus/dbus-daemon-1.1.in +++ /dev/null @@ -1,575 +0,0 @@ -.\" -.\" dbus-daemon-1 manual page. -.\" Copyright (C) 2003 Red Hat, Inc. -.\" -.TH dbus-daemon-1 1 -.SH NAME -dbus-daemon-1 \- Message bus daemon -.SH SYNOPSIS -.PP -.B dbus-daemon-1 -dbus-daemon-1 [\-\-version] [\-\-session] [\-\-system] [\-\-config-file=FILE] -[\-\-print-address[=DESCRIPTOR]] [\-\-print-pid[=DESCRIPTOR]] [\-\-fork] - -.SH DESCRIPTION - -\fIdbus-daemon-1\fP is the D-BUS message bus daemon. See -http://www.freedesktop.org/software/dbus/ for more information about -the big picture. D-BUS is first a library that provides one-to-one -communication between any two applications; \fIdbus-daemon-1\fP is an -application that uses this library to implement a message bus -daemon. Multiple programs connect to the message bus daemon and can -exchange messages with one another. - -.PP -There are two standard message bus instances: the systemwide message bus -(installed on many systems as the "messagebus" init service) and the -per-user-login-session message bus (started each time a user logs in). -\fIdbus-daemon-1\fP is used for both of these instances, but with -a different configuration file. - -.PP -The \-\-session option is equivalent to -"\-\-config-file=@EXPANDED_SYSCONFDIR@/dbus-1/session.conf" and the \-\-system -option is equivalent to -"\-\-config-file=@EXPANDED_SYSCONFDIR@/dbus-1/system.conf". By creating -additional configuration files and using the \-\-config-file option, -additional special-purpose message bus daemons could be created. - -.PP -The systemwide daemon is normally launched by an init script, -standardly called simply "messagebus". - -.PP -The systemwide daemon is largely used for broadcasting system events, -such as changes to the printer queue, or adding/removing devices. - -.PP -The per-session daemon is used for various interprocess communication -among desktop applications (however, it is not tied to X or the GUI -in any way). - -.PP -SIGHUP will cause the D-BUS daemon to PARTIALLY reload its -configuration file. Some configuration changes would require kicking -all apps off the bus; so they will only take effect if you restart the -daemon. Policy changes should take effect with SIGHUP. - -.SH OPTIONS -The following options are supported: -.TP -.I "--config-file=FILE" -Use the given configuration file. -.TP -.I "--fork" -Force the message bus to fork and become a daemon, even if -the configuration file does not specify that it should. -In most contexts the configuration file already gets this -right, though. -.TP -.I "--print-address[=DESCRIPTOR]" -Print the address of the message bus to standard output, or -to the given file descriptor. This is used by programs that -launch the message bus. -.TP -.I "--print-pid[=DESCRIPTOR]" -Print the process ID of the message bus to standard output, or -to the given file descriptor. This is used by programs that -launch the message bus. -.TP -.I "--session" -Use the standard configuration file for the per-login-session message -bus. -.TP -.I "--system" -Use the standard configuration file for the systemwide message bus. -.TP -.I "--version" -Print the version of the daemon. - -.SH CONFIGURATION FILE - -A message bus daemon has a configuration file that specializes it -for a particular application. For example, one configuration -file might set up the message bus to be a systemwide message bus, -while another might set it up to be a per-user-login-session bus. - -.PP -The configuration file also establishes resource limits, security -parameters, and so forth. - -.PP -The configuration file is not part of any interoperability -specification and its backward compatibility is not guaranteed; this -document is documentation, not specification. - -.PP -The standard systemwide and per-session message bus setups are -configured in the files "@EXPANDED_SYSCONFDIR@/dbus-1/system.conf" and -"@EXPANDED_SYSCONFDIR@/dbus-1/session.conf". These files normally - a system-local.conf or session-local.conf; you can put local -overrides in those files to avoid modifying the primary configuration -files. - -.PP -The configuration file is an XML document. It must have the following -doctype declaration: -.nf - - - -.fi - -.PP -The following elements may be present in the configuration file. - -.TP -.I "" - -.PP -Root element. - -.TP -.I "" - -.PP -The well-known type of the message bus. Currently known values are -"system" and "session"; if other values are set, they should be -either added to the D-BUS specification, or namespaced. The last - element "wins" (previous values are ignored). - -.PP -Example: session - -.TP -.I "" - -.PP -Include a file filename.conf at this point. If the -filename is relative, it is located relative to the configuration file -doing the including. - -.PP - has an optional attribute "ignore_missing=(yes|no)" -which defaults to "no" if not provided. This attribute -controls whether it's a fatal error for the included file -to be absent. - -.TP -.I "" - -.PP -Include all files in foo.d at this -point. Files in the directory are included in undefined order. -Only files ending in ".conf" are included. - -.PP -This is intended to allow extension of the system bus by particular -packages. For example, if CUPS wants to be able to send out -notification of printer queue changes, it could install a file to -@EXPANDED_SYSCONFDIR@/dbus-1/system.d that allowed all apps to receive -this message and allowed the printer daemon user to send it. - -.TP -.I "" - -.PP -The user account the daemon should run as, as either a username or a -UID. If the daemon cannot change to this UID on startup, it will exit. -If this element is not present, the daemon will not change or care -about its UID. - -.PP -The last entry in the file "wins", the others are ignored. - -.PP -The user is changed after the bus has completed initialization. So -sockets etc. will be created before changing user, but no data will be -read from clients before changing user. This means that sockets -and PID files can be created in a location that requires root -privileges for writing. - -.TP -.I "" - -.PP -If present, the bus daemon becomes a real daemon (forks -into the background, etc.). This is generally used -rather than the \-\-fork command line option. - -.TP -.I "" - -.PP -Add an address that the bus should listen on. The -address is in the standard D-BUS format that contains -a transport name plus possible parameters/options. - -.PP -Example: unix:path=/tmp/foo - -.PP -If there are multiple elements, then the bus listens -on multiple addresses. The bus will pass its address to -started services or other interested parties with -the last address given in first. That is, -apps will try to connect to the last address first. - -.TP -.I "" - -.PP -Lists permitted authorization mechanisms. If this element doesn't -exist, then all known mechanisms are allowed. If there are multiple - elements, all the listed mechanisms are allowed. The order in -which mechanisms are listed is not meaningful. - -.PP -Example: EXTERNAL - -.PP -Example: DBUS_COOKIE_SHA1 - -.TP -.I "" - -.PP -Adds a directory to scan for .service files. Directories are -scanned starting with the last to appear in the config file -(the first .service file found that provides a particular -service will be used). - -.PP -Service files tell the bus how to automatically start a program. -They are primarily used with the per-user-session bus, -not the systemwide bus. - -.TP -.I "" - -.PP - establishes a resource limit. For example: -.nf - 64 - 512 -.fi - -.PP -The name attribute is mandatory. -Available limit names are: -.nf - "max_incoming_bytes" : total size in bytes of messages - incoming from a single connection - "max_outgoing_bytes" : total size in bytes of messages - queued up for a single connection - "max_message_size" : max size of a single message in - bytes - "service_start_timeout" : milliseconds (thousandths) until - a started service has to connect - "auth_timeout" : milliseconds (thousandths) a - connection is given to - authenticate - "max_completed_connections" : max number of authenticated connections - "max_incomplete_connections" : max number of unauthenticated - connections - "max_connections_per_user" : max number of completed connections from - the same user - "max_pending_service_starts" : max number of service launches in - progress at the same time - "max_names_per_connection" : max number of names a single - connection can own - "max_match_rules_per_connection": max number of match rules for a single - connection - "max_replies_per_connection" : max number of pending method - replies per connection - (number of calls-in-progress) - "reply_timeout" : milliseconds (thousandths) - until a method call times out -.fi - -.PP -The max incoming/outgoing queue sizes allow a new message to be queued -if one byte remains below the max. So you can in fact exceed the max -by max_message_size. - -.PP -max_completed_connections divided by max_connections_per_user is the -number of users that can work together to DOS all other users by using -up all connections. - -.TP -.I "" - -.PP -The element defines a policy to be applied to a particular -set of connections to the bus. A policy is made up of - and elements. - -.PP -The element has one of three attributes: -.nf - context="(default|mandatory)" - user="username or userid" - group="group name or gid" -.fi - -.PP - -Policies are applied to a connection as follows: -.nf - - all context="default" policies are applied - - all group="connection's user's group" policies are applied - in undefined order - - all user="connection's auth user" policies are applied - in undefined order - - all context="mandatory" policies are applied -.fi - -.PP -Policies applied later will override those applied earlier, -when the policies overlap. Multiple policies with the same -user/group/context are applied in the order they appear -in the config file. - -.TP -.I "" -.I "" - -.PP -A element appears below a element and prohibits some -action. The element makes an exception to previous -statements, and works just like but with the inverse meaning. - -.PP -The possible attributes of these elements are: -.nf - send_interface="interface_name" - send_member="method_or_signal_name" - send_error="error_name" - send_destination="name" - send_type="method_call" | "method_return" | "signal" | "error" - send_path="/path/name" - - receive_interface="interface_name" - receive_member="method_or_signal_name" - receive_error="error_name" - receive_sender="name" - receive_type="method_call" | "method_return" | "signal" | "error" - receive_path="/path/name" - - send_requested_reply="true" | "false" - receive_requested_reply="true" | "false" - - eavesdrop="true" | "false" - - own="name" - user="username" - group="groupname" -.fi - -.PP -Examples: -.nf - - - - - - - -.fi - -.PP -The element's attributes determine whether the deny "matches" a -particular action. If it matches, the action is denied (unless later -rules in the config file allow it). - -.PP -send_destination and receive_sender rules mean that messages may not be -sent to or received from the *owner* of the given name, not that -they may not be sent *to that name*. That is, if a connection -owns services A, B, C, and sending to A is denied, sending to B or C -will not work either. - -.PP -The other send_* and receive_* attributes are purely textual/by-value -matches against the given field in the message header. - -.PP -"Eavesdropping" occurs when an application receives a message that -was explicitly addressed to a name the application does not own. -Eavesdropping thus only applies to messages that are addressed to -services (i.e. it does not apply to signals). - -.PP -For , eavesdrop="true" indicates that the rule matches even -when eavesdropping. eavesdrop="false" is the default and means that -the rule only allows messages to go to their specified recipient. -For , eavesdrop="true" indicates that the rule matches -only when eavesdropping. eavesdrop="false" is the default for -also, but here it means that the rule applies always, even when -not eavesdropping. The eavesdrop attribute can only be combined with -receive rules (with receive_* attributes). - - -.PP -The [send|receive]_requested_reply attribute works similarly to the eavesdrop -attribute. It controls whether the or matches a reply -that is expected (corresponds to a previous method call message). -This attribute only makes sense for reply messages (errors and method -returns), and is ignored for other message types. - -.PP -For , [send|receive]_requested_reply="true" is the default and indicates that -only requested replies are allowed by the -rule. [send|receive]_requested_reply="false" means that the rule allows any reply -even if unexpected. - -.PP -For , [send|receive]_requested_reply="false" is the default but indicates that -the rule matches only when the reply was not -requested. [send|receive]_requested_reply="true" indicates that the rule applies -always, regardless of pending reply state. - -.PP -user and group denials mean that the given user or group may -not connect to the message bus. - -.PP -For "name", "username", "groupname", etc. -the character "*" can be substituted, meaning "any." Complex globs -like "foo.bar.*" aren't allowed for now because they'd be work to -implement and maybe encourage sloppy security anyway. - -.PP -It does not make sense to deny a user or group inside a -for a user or group; user/group denials can only be inside -context="default" or context="mandatory" policies. - -.PP -A single rule may specify combinations of attributes such as -send_destination and send_interface and send_type. In this case, the -denial applies only if both attributes match the message being denied. -e.g. would -deny messages with the given interface AND the given bus name. -To get an OR effect you specify multiple rules. - -.PP -You can't include both send_ and receive_ attributes on the same -rule, since "whether the message can be sent" and "whether it can be -received" are evaluated separately. - -.PP -Be careful with send_interface/receive_interface, because the -interface field in messages is optional. - -.TP -.I "" - -.PP -The element contains settings related to Security Enhanced Linux. -More details below. - -.TP -.I "" - -.PP -An element appears below an element and -creates a mapping. Right now only one kind of association is possible: -.nf - -.fi - -.PP -This means that if a connection asks to own the name -"org.freedesktop.Foobar" then the source context will be the context -of the connection and the target context will be "foo_t" - see the -short discussion of SELinux below. - -.PP -Note, the context here is the target context when requesting a name, -NOT the context of the connection owning the name. - -.PP -There's currently no way to set a default for owning any name, if -we add this syntax it will look like: -.nf - -.fi -If you find a reason this is useful, let the developers know. -Right now the default will be the security context of the bus itself. - -.PP -If two elements specify the same name, the element -appearing later in the configuration file will be used. - -.SH SELinux - -.PP -See http://www.nsa.gov/selinux/ for full details on SELinux. Some useful excerpts: - -.IP "" 8 -Every subject (process) and object (e.g. file, socket, IPC object, -etc) in the system is assigned a collection of security attributes, -known as a security context. A security context contains all of the -security attributes associated with a particular subject or object -that are relevant to the security policy. - -.IP "" 8 -In order to better encapsulate security contexts and to provide -greater efficiency, the policy enforcement code of SELinux typically -handles security identifiers (SIDs) rather than security contexts. A -SID is an integer that is mapped by the security server to a security -context at runtime. - -.IP "" 8 -When a security decision is required, the policy enforcement code -passes a pair of SIDs (typically the SID of a subject and the SID of -an object, but sometimes a pair of subject SIDs or a pair of object -SIDs), and an object security class to the security server. The object -security class indicates the kind of object, e.g. a process, a regular -file, a directory, a TCP socket, etc. - -.IP "" 8 -Access decisions specify whether or not a permission is granted for a -given pair of SIDs and class. Each object class has a set of -associated permissions defined to control operations on objects with -that class. - -.PP -D-BUS performs SELinux security checks in two places. - -.PP -First, any time a message is routed from one connection to another -connection, the bus daemon will check permissions with the security context of -the first connection as source, security context of the second connection -as target, object class "dbus" and requested permission "send_msg". - -.PP -If a security context is not available for a connection -(impossible when using UNIX domain sockets), then the target -context used is the context of the bus daemon itself. -There is currently no way to change this default, because we're -assuming that only UNIX domain sockets will be used to -connect to the systemwide bus. If this changes, we'll -probably add a way to set the default connection context. - -.PP -Second, any time a connection asks to own a name, -the bus daemon will check permissions with the security -context of the connection as source, the security context specified -for the name with an element as target, object -class "dbus" and requested permission "acquire_svc". - -.PP -If the name has no security context associated in the -configuration file, the security context of the bus daemon -itself will be used. - -.SH AUTHOR -See http://www.freedesktop.org/software/dbus/doc/AUTHORS - -.SH BUGS -Please send bug reports to the D-BUS mailing list or bug tracker, -see http://www.freedesktop.org/software/dbus/ diff --git a/bus/dbus-daemon.1.in b/bus/dbus-daemon.1.in new file mode 100644 index 00000000..902ff374 --- /dev/null +++ b/bus/dbus-daemon.1.in @@ -0,0 +1,575 @@ +.\" +.\" dbus-daemon manual page. +.\" Copyright (C) 2003 Red Hat, Inc. +.\" +.TH dbus-daemon 1 +.SH NAME +dbus-daemon \- Message bus daemon +.SH SYNOPSIS +.PP +.B dbus-daemon +dbus-daemon [\-\-version] [\-\-session] [\-\-system] [\-\-config-file=FILE] +[\-\-print-address[=DESCRIPTOR]] [\-\-print-pid[=DESCRIPTOR]] [\-\-fork] + +.SH DESCRIPTION + +\fIdbus-daemon\fP is the D-BUS message bus daemon. See +http://www.freedesktop.org/software/dbus/ for more information about +the big picture. D-BUS is first a library that provides one-to-one +communication between any two applications; \fIdbus-daemon\fP is an +application that uses this library to implement a message bus +daemon. Multiple programs connect to the message bus daemon and can +exchange messages with one another. + +.PP +There are two standard message bus instances: the systemwide message bus +(installed on many systems as the "messagebus" init service) and the +per-user-login-session message bus (started each time a user logs in). +\fIdbus-daemon\fP is used for both of these instances, but with +a different configuration file. + +.PP +The \-\-session option is equivalent to +"\-\-config-file=@EXPANDED_SYSCONFDIR@/dbus-1/session.conf" and the \-\-system +option is equivalent to +"\-\-config-file=@EXPANDED_SYSCONFDIR@/dbus-1/system.conf". By creating +additional configuration files and using the \-\-config-file option, +additional special-purpose message bus daemons could be created. + +.PP +The systemwide daemon is normally launched by an init script, +standardly called simply "messagebus". + +.PP +The systemwide daemon is largely used for broadcasting system events, +such as changes to the printer queue, or adding/removing devices. + +.PP +The per-session daemon is used for various interprocess communication +among desktop applications (however, it is not tied to X or the GUI +in any way). + +.PP +SIGHUP will cause the D-BUS daemon to PARTIALLY reload its +configuration file. Some configuration changes would require kicking +all apps off the bus; so they will only take effect if you restart the +daemon. Policy changes should take effect with SIGHUP. + +.SH OPTIONS +The following options are supported: +.TP +.I "--config-file=FILE" +Use the given configuration file. +.TP +.I "--fork" +Force the message bus to fork and become a daemon, even if +the configuration file does not specify that it should. +In most contexts the configuration file already gets this +right, though. +.TP +.I "--print-address[=DESCRIPTOR]" +Print the address of the message bus to standard output, or +to the given file descriptor. This is used by programs that +launch the message bus. +.TP +.I "--print-pid[=DESCRIPTOR]" +Print the process ID of the message bus to standard output, or +to the given file descriptor. This is used by programs that +launch the message bus. +.TP +.I "--session" +Use the standard configuration file for the per-login-session message +bus. +.TP +.I "--system" +Use the standard configuration file for the systemwide message bus. +.TP +.I "--version" +Print the version of the daemon. + +.SH CONFIGURATION FILE + +A message bus daemon has a configuration file that specializes it +for a particular application. For example, one configuration +file might set up the message bus to be a systemwide message bus, +while another might set it up to be a per-user-login-session bus. + +.PP +The configuration file also establishes resource limits, security +parameters, and so forth. + +.PP +The configuration file is not part of any interoperability +specification and its backward compatibility is not guaranteed; this +document is documentation, not specification. + +.PP +The standard systemwide and per-session message bus setups are +configured in the files "@EXPANDED_SYSCONFDIR@/dbus-1/system.conf" and +"@EXPANDED_SYSCONFDIR@/dbus-1/session.conf". These files normally + a system-local.conf or session-local.conf; you can put local +overrides in those files to avoid modifying the primary configuration +files. + +.PP +The configuration file is an XML document. It must have the following +doctype declaration: +.nf + + + +.fi + +.PP +The following elements may be present in the configuration file. + +.TP +.I "" + +.PP +Root element. + +.TP +.I "" + +.PP +The well-known type of the message bus. Currently known values are +"system" and "session"; if other values are set, they should be +either added to the D-BUS specification, or namespaced. The last + element "wins" (previous values are ignored). + +.PP +Example: session + +.TP +.I "" + +.PP +Include a file filename.conf at this point. If the +filename is relative, it is located relative to the configuration file +doing the including. + +.PP + has an optional attribute "ignore_missing=(yes|no)" +which defaults to "no" if not provided. This attribute +controls whether it's a fatal error for the included file +to be absent. + +.TP +.I "" + +.PP +Include all files in foo.d at this +point. Files in the directory are included in undefined order. +Only files ending in ".conf" are included. + +.PP +This is intended to allow extension of the system bus by particular +packages. For example, if CUPS wants to be able to send out +notification of printer queue changes, it could install a file to +@EXPANDED_SYSCONFDIR@/dbus-1/system.d that allowed all apps to receive +this message and allowed the printer daemon user to send it. + +.TP +.I "" + +.PP +The user account the daemon should run as, as either a username or a +UID. If the daemon cannot change to this UID on startup, it will exit. +If this element is not present, the daemon will not change or care +about its UID. + +.PP +The last entry in the file "wins", the others are ignored. + +.PP +The user is changed after the bus has completed initialization. So +sockets etc. will be created before changing user, but no data will be +read from clients before changing user. This means that sockets +and PID files can be created in a location that requires root +privileges for writing. + +.TP +.I "" + +.PP +If present, the bus daemon becomes a real daemon (forks +into the background, etc.). This is generally used +rather than the \-\-fork command line option. + +.TP +.I "" + +.PP +Add an address that the bus should listen on. The +address is in the standard D-BUS format that contains +a transport name plus possible parameters/options. + +.PP +Example: unix:path=/tmp/foo + +.PP +If there are multiple elements, then the bus listens +on multiple addresses. The bus will pass its address to +started services or other interested parties with +the last address given in first. That is, +apps will try to connect to the last address first. + +.TP +.I "" + +.PP +Lists permitted authorization mechanisms. If this element doesn't +exist, then all known mechanisms are allowed. If there are multiple + elements, all the listed mechanisms are allowed. The order in +which mechanisms are listed is not meaningful. + +.PP +Example: EXTERNAL + +.PP +Example: DBUS_COOKIE_SHA1 + +.TP +.I "" + +.PP +Adds a directory to scan for .service files. Directories are +scanned starting with the last to appear in the config file +(the first .service file found that provides a particular +service will be used). + +.PP +Service files tell the bus how to automatically start a program. +They are primarily used with the per-user-session bus, +not the systemwide bus. + +.TP +.I "" + +.PP + establishes a resource limit. For example: +.nf + 64 + 512 +.fi + +.PP +The name attribute is mandatory. +Available limit names are: +.nf + "max_incoming_bytes" : total size in bytes of messages + incoming from a single connection + "max_outgoing_bytes" : total size in bytes of messages + queued up for a single connection + "max_message_size" : max size of a single message in + bytes + "service_start_timeout" : milliseconds (thousandths) until + a started service has to connect + "auth_timeout" : milliseconds (thousandths) a + connection is given to + authenticate + "max_completed_connections" : max number of authenticated connections + "max_incomplete_connections" : max number of unauthenticated + connections + "max_connections_per_user" : max number of completed connections from + the same user + "max_pending_service_starts" : max number of service launches in + progress at the same time + "max_names_per_connection" : max number of names a single + connection can own + "max_match_rules_per_connection": max number of match rules for a single + connection + "max_replies_per_connection" : max number of pending method + replies per connection + (number of calls-in-progress) + "reply_timeout" : milliseconds (thousandths) + until a method call times out +.fi + +.PP +The max incoming/outgoing queue sizes allow a new message to be queued +if one byte remains below the max. So you can in fact exceed the max +by max_message_size. + +.PP +max_completed_connections divided by max_connections_per_user is the +number of users that can work together to DOS all other users by using +up all connections. + +.TP +.I "" + +.PP +The element defines a policy to be applied to a particular +set of connections to the bus. A policy is made up of + and elements. + +.PP +The element has one of three attributes: +.nf + context="(default|mandatory)" + user="username or userid" + group="group name or gid" +.fi + +.PP + +Policies are applied to a connection as follows: +.nf + - all context="default" policies are applied + - all group="connection's user's group" policies are applied + in undefined order + - all user="connection's auth user" policies are applied + in undefined order + - all context="mandatory" policies are applied +.fi + +.PP +Policies applied later will override those applied earlier, +when the policies overlap. Multiple policies with the same +user/group/context are applied in the order they appear +in the config file. + +.TP +.I "" +.I "" + +.PP +A element appears below a element and prohibits some +action. The element makes an exception to previous +statements, and works just like but with the inverse meaning. + +.PP +The possible attributes of these elements are: +.nf + send_interface="interface_name" + send_member="method_or_signal_name" + send_error="error_name" + send_destination="name" + send_type="method_call" | "method_return" | "signal" | "error" + send_path="/path/name" + + receive_interface="interface_name" + receive_member="method_or_signal_name" + receive_error="error_name" + receive_sender="name" + receive_type="method_call" | "method_return" | "signal" | "error" + receive_path="/path/name" + + send_requested_reply="true" | "false" + receive_requested_reply="true" | "false" + + eavesdrop="true" | "false" + + own="name" + user="username" + group="groupname" +.fi + +.PP +Examples: +.nf + + + + + + + +.fi + +.PP +The element's attributes determine whether the deny "matches" a +particular action. If it matches, the action is denied (unless later +rules in the config file allow it). + +.PP +send_destination and receive_sender rules mean that messages may not be +sent to or received from the *owner* of the given name, not that +they may not be sent *to that name*. That is, if a connection +owns services A, B, C, and sending to A is denied, sending to B or C +will not work either. + +.PP +The other send_* and receive_* attributes are purely textual/by-value +matches against the given field in the message header. + +.PP +"Eavesdropping" occurs when an application receives a message that +was explicitly addressed to a name the application does not own. +Eavesdropping thus only applies to messages that are addressed to +services (i.e. it does not apply to signals). + +.PP +For , eavesdrop="true" indicates that the rule matches even +when eavesdropping. eavesdrop="false" is the default and means that +the rule only allows messages to go to their specified recipient. +For , eavesdrop="true" indicates that the rule matches +only when eavesdropping. eavesdrop="false" is the default for +also, but here it means that the rule applies always, even when +not eavesdropping. The eavesdrop attribute can only be combined with +receive rules (with receive_* attributes). + + +.PP +The [send|receive]_requested_reply attribute works similarly to the eavesdrop +attribute. It controls whether the or matches a reply +that is expected (corresponds to a previous method call message). +This attribute only makes sense for reply messages (errors and method +returns), and is ignored for other message types. + +.PP +For , [send|receive]_requested_reply="true" is the default and indicates that +only requested replies are allowed by the +rule. [send|receive]_requested_reply="false" means that the rule allows any reply +even if unexpected. + +.PP +For , [send|receive]_requested_reply="false" is the default but indicates that +the rule matches only when the reply was not +requested. [send|receive]_requested_reply="true" indicates that the rule applies +always, regardless of pending reply state. + +.PP +user and group denials mean that the given user or group may +not connect to the message bus. + +.PP +For "name", "username", "groupname", etc. +the character "*" can be substituted, meaning "any." Complex globs +like "foo.bar.*" aren't allowed for now because they'd be work to +implement and maybe encourage sloppy security anyway. + +.PP +It does not make sense to deny a user or group inside a +for a user or group; user/group denials can only be inside +context="default" or context="mandatory" policies. + +.PP +A single rule may specify combinations of attributes such as +send_destination and send_interface and send_type. In this case, the +denial applies only if both attributes match the message being denied. +e.g. would +deny messages with the given interface AND the given bus name. +To get an OR effect you specify multiple rules. + +.PP +You can't include both send_ and receive_ attributes on the same +rule, since "whether the message can be sent" and "whether it can be +received" are evaluated separately. + +.PP +Be careful with send_interface/receive_interface, because the +interface field in messages is optional. + +.TP +.I "" + +.PP +The element contains settings related to Security Enhanced Linux. +More details below. + +.TP +.I "" + +.PP +An element appears below an element and +creates a mapping. Right now only one kind of association is possible: +.nf + +.fi + +.PP +This means that if a connection asks to own the name +"org.freedesktop.Foobar" then the source context will be the context +of the connection and the target context will be "foo_t" - see the +short discussion of SELinux below. + +.PP +Note, the context here is the target context when requesting a name, +NOT the context of the connection owning the name. + +.PP +There's currently no way to set a default for owning any name, if +we add this syntax it will look like: +.nf + +.fi +If you find a reason this is useful, let the developers know. +Right now the default will be the security context of the bus itself. + +.PP +If two elements specify the same name, the element +appearing later in the configuration file will be used. + +.SH SELinux + +.PP +See http://www.nsa.gov/selinux/ for full details on SELinux. Some useful excerpts: + +.IP "" 8 +Every subject (process) and object (e.g. file, socket, IPC object, +etc) in the system is assigned a collection of security attributes, +known as a security context. A security context contains all of the +security attributes associated with a particular subject or object +that are relevant to the security policy. + +.IP "" 8 +In order to better encapsulate security contexts and to provide +greater efficiency, the policy enforcement code of SELinux typically +handles security identifiers (SIDs) rather than security contexts. A +SID is an integer that is mapped by the security server to a security +context at runtime. + +.IP "" 8 +When a security decision is required, the policy enforcement code +passes a pair of SIDs (typically the SID of a subject and the SID of +an object, but sometimes a pair of subject SIDs or a pair of object +SIDs), and an object security class to the security server. The object +security class indicates the kind of object, e.g. a process, a regular +file, a directory, a TCP socket, etc. + +.IP "" 8 +Access decisions specify whether or not a permission is granted for a +given pair of SIDs and class. Each object class has a set of +associated permissions defined to control operations on objects with +that class. + +.PP +D-BUS performs SELinux security checks in two places. + +.PP +First, any time a message is routed from one connection to another +connection, the bus daemon will check permissions with the security context of +the first connection as source, security context of the second connection +as target, object class "dbus" and requested permission "send_msg". + +.PP +If a security context is not available for a connection +(impossible when using UNIX domain sockets), then the target +context used is the context of the bus daemon itself. +There is currently no way to change this default, because we're +assuming that only UNIX domain sockets will be used to +connect to the systemwide bus. If this changes, we'll +probably add a way to set the default connection context. + +.PP +Second, any time a connection asks to own a name, +the bus daemon will check permissions with the security +context of the connection as source, the security context specified +for the name with an element as target, object +class "dbus" and requested permission "acquire_svc". + +.PP +If the name has no security context associated in the +configuration file, the security context of the bus daemon +itself will be used. + +.SH AUTHOR +See http://www.freedesktop.org/software/dbus/doc/AUTHORS + +.SH BUGS +Please send bug reports to the D-BUS mailing list or bug tracker, +see http://www.freedesktop.org/software/dbus/ diff --git a/bus/main.c b/bus/main.c index 40ec9a07..f4b188a9 100644 --- a/bus/main.c +++ b/bus/main.c @@ -62,7 +62,7 @@ signal_handler (int sig) static void usage (void) { - fprintf (stderr, "dbus-daemon-1 [--version] [--session] [--system] [--config-file=FILE] [--print-address[=DESCRIPTOR]] [--print-pid[=DESCRIPTOR]] [--fork] [--nofork]\n"); + fprintf (stderr, DAEMON_NAME " [--version] [--session] [--system] [--config-file=FILE] [--print-address[=DESCRIPTOR]] [--print-pid[=DESCRIPTOR]] [--fork] [--nofork]\n"); exit (1); } diff --git a/bus/messagebus.in b/bus/messagebus.in index 7a358764..55fef0fb 100755 --- a/bus/messagebus.in +++ b/bus/messagebus.in @@ -6,18 +6,18 @@ # description: This is a daemon which broadcasts notifications of system events \ # and other messages. See http://www.freedesktop.org/software/dbus/ # -# processname: dbus-daemon-1 +# processname: dbus-daemon # pidfile: @DBUS_SYSTEM_PID_FILE@ # # Sanity checks. -[ -x @EXPANDED_BINDIR@/dbus-daemon-1 ] || exit 0 +[ -x @EXPANDED_BINDIR@/dbus-daemon ] || exit 0 # Source function library. . @EXPANDED_SYSCONFDIR@/rc.d/init.d/functions # so we can rearrange this easily -processname=dbus-daemon-1 +processname=dbus-daemon servicename=messagebus RETVAL=0 diff --git a/bus/rc.messagebus.in b/bus/rc.messagebus.in index 4214a9f4..46a3076d 100644 --- a/bus/rc.messagebus.in +++ b/bus/rc.messagebus.in @@ -6,26 +6,26 @@ # description: This is a daemon which broadcasts notifications of system events \ # and other messages. See http://www.freedesktop.org/software/dbus/ # -# processname: dbus-daemon-1 +# processname: dbus-daemon # pidfile: @DBUS_SYSTEM_PID_FILE@ # # Sanity checks. -#[ -x @EXPANDED_BINDIR@/dbus-daemon-1 ] || exit 0 +#[ -x @EXPANDED_BINDIR@/dbus-daemon ] || exit 0 # Source function library. #. @EXPANDED_SYSCONFDIR@/rc.d/init.d/functions # so we can rearrange this easily -#processname=dbus-daemon-1 +#processname=dbus-daemon #servicename=messagebus #RETVAL=0 start() { echo "Starting system message bus" - if [ -x @EXPANDED_BINDIR@/dbus-daemon-1 ];then - @EXPANDED_BINDIR@/dbus-daemon-1 --system + if [ -x @EXPANDED_BINDIR@/dbus-daemon ];then + @EXPANDED_BINDIR@/dbus-daemon --system fi #daemon --check $servicename $processname --system #RETVAL=$? @@ -39,7 +39,7 @@ stop() { ## we don't want to kill all the per-user $processname, we want ## to use the pid file *only*; because we use the fake nonexistent ## program name "$servicename" that should be safe-ish - killall dbus-daemon-1 + killall dbus-daemon #RETVAL=$? #echo #if [ $RETVAL -eq 0 ]; then diff --git a/configure.in b/configure.in index ffac0272..95ab6d1e 100644 --- a/configure.in +++ b/configure.in @@ -1141,7 +1141,7 @@ bus/system.conf bus/session.conf bus/messagebus bus/rc.messagebus -bus/dbus-daemon-1.1 +bus/dbus-daemon.1 Makefile dbus/Makefile glib/Makefile diff --git a/doc/TODO b/doc/TODO index eac3e50b..f7a064a0 100644 --- a/doc/TODO +++ b/doc/TODO @@ -74,14 +74,8 @@ Important for 1.0 GLib Bindings Might as Well for 1.0 === - - Probably no point in a version number in the daemon name - (s/dbus-daemon-1/dbus-daemon/) - - add dbus_message_has_path(), maybe has_member/interface - - dbus_message_iter_init_array_iterator has "iter" and "iterator" - in the same function name - - connection_open/connection_disconnect lacks symmetry, open/close or connect/disconnect diff --git a/test/glib/run-test.sh b/test/glib/run-test.sh index 473946a9..eddea5f8 100755 --- a/test/glib/run-test.sh +++ b/test/glib/run-test.sh @@ -43,7 +43,7 @@ export MALLOC_CHECK_=2 unset DBUS_SESSION_BUS_ADDRESS unset DBUS_SESSION_BUS_PID -echo "Using daemon "`type dbus-daemon-1` +echo "Using daemon "`type dbus-daemon` eval `$DBUS_TOP_BUILDDIR/tools/dbus-launch --sh-syntax --config-file=$CONFIG_FILE` diff --git a/tools/dbus-launch.1 b/tools/dbus-launch.1 index 771dcb2c..33f0d239 100644 --- a/tools/dbus-launch.1 +++ b/tools/dbus-launch.1 @@ -11,7 +11,7 @@ dbus-launch \- Utility to start a message bus from a shell script .SH DESCRIPTION -The \fIdbus-launch\fP command is used to start \fIdbus-daemon-1\fP +The \fIdbus-launch\fP command is used to start \fIdbus-daemon\fP from a shell script. It would normally be called from a user's login scripts. Unlike the daemon itself, \fIdbus-launch\fP exits, so backticks or the $() construct can be used to read information from @@ -40,7 +40,7 @@ know which shell your script is written in. .PP See http://www.freedesktop.org/software/dbus/ for more information -about D-BUS. See also the man page for \fIdbus-daemon-1\fP. +about D-BUS. See also the man page for \fIdbus-daemon\fP. .PP Here is an example of how to use \fIdbus-launch\fP with an @@ -76,7 +76,7 @@ Choose \-\-csh-syntax or \-\-sh-syntax based on the SHELL environment variable. .TP .I "--config-file=FILENAME" Pass \-\-config-file=FILENAME to the bus daemon, instead of passing it -the \-\-session argument. See the man page for dbus-daemon-1 +the \-\-session argument. See the man page for dbus-daemon .TP .I "--csh-syntax" diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c index 01d1a9f9..e24651a5 100644 --- a/tools/dbus-launch.c +++ b/tools/dbus-launch.c @@ -756,7 +756,7 @@ main (int argc, char **argv) verbose ("=== Bus exec process created\n"); /* Now we are the bus process (well, almost; - * dbus-daemon-1 itself forks again) + * dbus-daemon itself forks again) */ close (bus_pid_to_launcher_pipe[READ_END]); close (bus_address_to_launcher_pipe[READ_END]); @@ -771,8 +771,8 @@ main (int argc, char **argv) verbose ("Calling exec()\n"); - execlp ("dbus-daemon-1", - "dbus-daemon-1", + execlp ("dbus-daemon", + "dbus-daemon", "--fork", "--print-pid", write_pid_fd_as_string, "--print-address", write_address_fd_as_string, -- cgit v1.2.3