X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dbus%2Fdbus-server-socket.c;h=ae4b602e8c506c13080ea4de231a379b1272c6b9;hb=b5d36dc27d1905d4d46ad7f0097f0ea0e0776adb;hp=5c11e145bc46824cb4265f8240d2fe08d660265b;hpb=a2129f7cccaf0265fffe0da79ca0510b6e01131b;p=platform%2Fupstream%2Fdbus.git diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c index 5c11e14..ae4b602 100644 --- a/dbus/dbus-server-socket.c +++ b/dbus/dbus-server-socket.c @@ -1,10 +1,10 @@ -/* -*- mode: C; c-file-style: "gnu" -*- */ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ /* dbus-server-socket.c Server implementation for sockets * * Copyright (C) 2002, 2003, 2004, 2006 Red Hat Inc. * * Licensed under the Academic Free License version 2.1 - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -14,17 +14,20 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ +#include #include "dbus-internals.h" #include "dbus-server-socket.h" #include "dbus-transport-socket.h" #include "dbus-connection-internal.h" +#include "dbus-memory.h" +#include "dbus-nonce.h" #include "dbus-string.h" /** @@ -35,7 +38,7 @@ * @{ */ /** - * + * * Opaque object representing a Socket server implementation. */ typedef struct DBusServerSocket DBusServerSocket; @@ -47,25 +50,34 @@ typedef struct DBusServerSocket DBusServerSocket; struct DBusServerSocket { DBusServer base; /**< Parent class members. */ - int fd; /**< File descriptor or -1 if disconnected. */ - DBusWatch *watch; /**< File descriptor watch. */ + int n_fds; /**< Number of active file handles */ + int *fds; /**< File descriptor or -1 if disconnected. */ + DBusWatch **watch; /**< File descriptor watch. */ char *socket_name; /**< Name of domain socket, to unlink if appropriate */ + DBusNonceFile *noncefile; /**< Nonce file used to authenticate clients */ }; static void socket_finalize (DBusServer *server) { DBusServerSocket *socket_server = (DBusServerSocket*) server; - + int i; + _dbus_server_finalize_base (server); - if (socket_server->watch) - { - _dbus_watch_unref (socket_server->watch); - socket_server->watch = NULL; - } - + for (i = 0 ; i < socket_server->n_fds ; i++) + if (socket_server->watch[i]) + { + _dbus_watch_unref (socket_server->watch[i]); + socket_server->watch[i] = NULL; + } + + dbus_free (socket_server->fds); + dbus_free (socket_server->watch); dbus_free (socket_server->socket_name); + if (socket_server->noncefile) + _dbus_noncefile_delete (socket_server->noncefile, NULL); + dbus_free (socket_server->noncefile); dbus_free (server); } @@ -78,18 +90,18 @@ handle_new_client_fd_and_unlock (DBusServer *server, DBusTransport *transport; DBusNewConnectionFunction new_connection_function; void *new_connection_data; - + _dbus_verbose ("Creating new client connection with fd %d\n", client_fd); HAVE_LOCK_CHECK (server); - + if (!_dbus_set_fd_nonblocking (client_fd, NULL)) { SERVER_UNLOCK (server); return TRUE; } - - transport = _dbus_transport_new_for_socket (client_fd, &server->guid_hex, NULL); + + transport = _dbus_transport_new_for_socket (client_fd, &server->guid_hex, FALSE); if (transport == NULL) { _dbus_close_socket (client_fd, NULL); @@ -104,21 +116,21 @@ handle_new_client_fd_and_unlock (DBusServer *server, SERVER_UNLOCK (server); return FALSE; } - + /* note that client_fd is now owned by the transport, and will be * closed on transport disconnection/finalization */ - + connection = _dbus_connection_new_for_transport (transport); _dbus_transport_unref (transport); transport = NULL; /* now under the connection lock */ - + if (connection == NULL) { SERVER_UNLOCK (server); return FALSE; } - + /* See if someone wants to handle this new connection, self-referencing * for paranoia. */ @@ -127,14 +139,14 @@ handle_new_client_fd_and_unlock (DBusServer *server, _dbus_server_ref_unlocked (server); SERVER_UNLOCK (server); - + if (new_connection_function) { (* new_connection_function) (server, connection, new_connection_data); } dbus_server_unref (server); - + /* If no one grabbed a reference, the connection will die. */ _dbus_connection_close_if_only_one_ref (connection); dbus_connection_unref (connection); @@ -150,37 +162,50 @@ socket_handle_watch (DBusWatch *watch, DBusServer *server = data; DBusServerSocket *socket_server = data; +#ifndef DBUS_DISABLE_ASSERT + int i; + dbus_bool_t found = FALSE; +#endif + SERVER_LOCK (server); - - _dbus_assert (watch == socket_server->watch); + +#ifndef DBUS_DISABLE_ASSERT + for (i = 0 ; i < socket_server->n_fds ; i++) + { + if (socket_server->watch[i] == watch) + found = TRUE; + } + _dbus_assert (found); +#endif _dbus_verbose ("Handling client connection, flags 0x%x\n", flags); - + if (flags & DBUS_WATCH_READABLE) { int client_fd; int listen_fd; - - listen_fd = dbus_watch_get_fd (watch); - client_fd = _dbus_accept (listen_fd); - + listen_fd = dbus_watch_get_socket (watch); + + if (socket_server->noncefile) + client_fd = _dbus_accept_with_noncefile (listen_fd, socket_server->noncefile); + else + client_fd = _dbus_accept (listen_fd); + if (client_fd < 0) { /* EINTR handled for us */ - - if (errno == EAGAIN || errno == EWOULDBLOCK) + + if (_dbus_get_is_errno_eagain_or_ewouldblock ()) _dbus_verbose ("No client available to accept after all\n"); else _dbus_verbose ("Failed to accept a client connection: %s\n", - _dbus_strerror (errno)); + _dbus_strerror_from_errno ()); SERVER_UNLOCK (server); } else { - _dbus_fd_set_close_on_exec (client_fd); - if (!handle_new_client_fd_and_unlock (server, client_fd)) _dbus_verbose ("Rejected client connection due to lack of memory\n"); } @@ -194,24 +219,29 @@ socket_handle_watch (DBusWatch *watch, return TRUE; } - + static void socket_disconnect (DBusServer *server) { DBusServerSocket *socket_server = (DBusServerSocket*) server; + int i; HAVE_LOCK_CHECK (server); - - if (socket_server->watch) + + for (i = 0 ; i < socket_server->n_fds ; i++) { - _dbus_server_remove_watch (server, - socket_server->watch); - _dbus_watch_unref (socket_server->watch); - socket_server->watch = NULL; + if (socket_server->watch[i]) + { + _dbus_server_remove_watch (server, + socket_server->watch[i]); + _dbus_watch_invalidate (socket_server->watch[i]); + _dbus_watch_unref (socket_server->watch[i]); + socket_server->watch[i] = NULL; + } + + _dbus_close_socket (socket_server->fds[i], NULL); + socket_server->fds[i] = -1; } - - _dbus_close_socket (socket_server->fd, NULL); - socket_server->fd = -1; if (socket_server->socket_name != NULL) { @@ -220,6 +250,9 @@ socket_disconnect (DBusServer *server) _dbus_delete_file (&tmp, NULL); } + if (server->published_address) + _dbus_daemon_unpublish_session_bus_address(); + HAVE_LOCK_CHECK (server); } @@ -236,141 +269,255 @@ static const DBusServerVTable socket_vtable = { * been successfully invoked on it. The server will use accept() to * accept new client connections. * - * @param fd the file descriptor. + * @param fds list of file descriptors. + * @param n_fds number of file descriptors * @param address the server's address + * @param noncefile to be used for authentication (NULL if not needed) * @returns the new server, or #NULL if no memory. - * + * */ DBusServer* -_dbus_server_new_for_socket (int fd, - const DBusString *address) +_dbus_server_new_for_socket (int *fds, + int n_fds, + const DBusString *address, + DBusNonceFile *noncefile) { DBusServerSocket *socket_server; DBusServer *server; - DBusWatch *watch; - + int i; + socket_server = dbus_new0 (DBusServerSocket, 1); if (socket_server == NULL) return NULL; - - watch = _dbus_watch_new (fd, - DBUS_WATCH_READABLE, - TRUE, - socket_handle_watch, socket_server, - NULL); - if (watch == NULL) + + socket_server->noncefile = noncefile; + + socket_server->fds = dbus_new (int, n_fds); + if (!socket_server->fds) + goto failed_0; + + socket_server->watch = dbus_new0 (DBusWatch *, n_fds); + if (!socket_server->watch) + goto failed_1; + + for (i = 0 ; i < n_fds ; i++) { - dbus_free (socket_server); - return NULL; + DBusWatch *watch; + + watch = _dbus_watch_new (fds[i], + DBUS_WATCH_READABLE, + TRUE, + socket_handle_watch, socket_server, + NULL); + if (watch == NULL) + goto failed_2; + + socket_server->n_fds++; + socket_server->fds[i] = fds[i]; + socket_server->watch[i] = watch; } - + if (!_dbus_server_init_base (&socket_server->base, &socket_vtable, address)) - { - _dbus_watch_unref (watch); - dbus_free (socket_server); - return NULL; - } + goto failed_2; - server = (DBusServer*) socket_server; + server = (DBusServer*)socket_server; SERVER_LOCK (server); - - if (!_dbus_server_add_watch (&socket_server->base, - watch)) + + for (i = 0 ; i < n_fds ; i++) { - SERVER_UNLOCK (server); - _dbus_server_finalize_base (&socket_server->base); - _dbus_watch_unref (watch); - dbus_free (socket_server); - return NULL; + if (!_dbus_server_add_watch (&socket_server->base, + socket_server->watch[i])) + { + int j; + for (j = 0 ; j < i ; j++) + _dbus_server_remove_watch (server, + socket_server->watch[j]); + + SERVER_UNLOCK (server); + _dbus_server_finalize_base (&socket_server->base); + goto failed_2; + } } - - socket_server->fd = fd; - socket_server->watch = watch; SERVER_UNLOCK (server); - + + _dbus_server_trace_ref (&socket_server->base, 0, 1, "new_for_socket"); return (DBusServer*) socket_server; + + failed_2: + for (i = 0 ; i < n_fds ; i++) + { + if (socket_server->watch[i] != NULL) + { + _dbus_watch_unref (socket_server->watch[i]); + socket_server->watch[i] = NULL; + } + } + dbus_free (socket_server->watch); + + failed_1: + dbus_free (socket_server->fds); + + failed_0: + dbus_free (socket_server); + return NULL; } /** - * Creates a new server listening on the given hostname and port. - * If the hostname is NULL, listens on localhost. + * Creates a new server listening on TCP. + * If host is NULL, it will default to localhost. + * If bind is NULL, it will default to the value for the host + * parameter, and if that is NULL, then localhost + * If bind is a hostname, it will be resolved and will listen + * on all returned addresses. + * If family is NULL, hostname resolution will try all address + * families, otherwise it can be ipv4 or ipv6 to restrict the + * addresses considered. * - * @param host the hostname to listen on. - * @param port the port to listen on. + * @param host the hostname to report for the listen address + * @param bind the hostname to listen on + * @param port the port to listen on or 0 to let the OS choose + * @param family * @param error location to store reason for failure. + * @param use_nonce whether to use a nonce for low-level authentication (nonce-tcp transport) or not (tcp transport) * @returns the new server, or #NULL on failure. */ DBusServer* _dbus_server_new_for_tcp_socket (const char *host, - dbus_uint32_t port, - DBusError *error) + const char *bind, + const char *port, + const char *family, + DBusError *error, + dbus_bool_t use_nonce) { DBusServer *server; - int listen_fd; + int *listen_fds = NULL; + int nlisten_fds = 0, i; DBusString address; DBusString host_str; + DBusString port_str; + DBusNonceFile *noncefile; _DBUS_ASSERT_ERROR_IS_CLEAR (error); + noncefile = NULL; + if (!_dbus_string_init (&address)) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); return NULL; } + if (!_dbus_string_init (&port_str)) + { + dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); + goto failed_0; + } + if (host == NULL) host = "localhost"; + if (port == NULL) + port = "0"; + + if (bind == NULL) + bind = host; + else if (strcmp (bind, "*") == 0) + bind = NULL; + + nlisten_fds =_dbus_listen_tcp_socket (bind, port, family, + &port_str, + &listen_fds, error); + if (nlisten_fds <= 0) + { + _DBUS_ASSERT_ERROR_IS_SET(error); + goto failed_1; + } + _dbus_string_init_const (&host_str, host); - if (!_dbus_string_append (&address, "tcp:host=") || + if (!_dbus_string_append (&address, use_nonce ? "nonce-tcp:host=" : "tcp:host=") || !_dbus_address_append_escaped (&address, &host_str) || !_dbus_string_append (&address, ",port=") || - !_dbus_string_append_int (&address, port)) + !_dbus_string_append (&address, _dbus_string_get_const_data(&port_str))) { - _dbus_string_free (&address); dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); - return NULL; + goto failed_2; } - - listen_fd = _dbus_listen_tcp_socket (host, port, error); - _dbus_fd_set_close_on_exec (listen_fd); - - if (listen_fd < 0) + if (family && + (!_dbus_string_append (&address, ",family=") || + !_dbus_string_append (&address, family))) { - _dbus_string_free (&address); - return NULL; + dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); + goto failed_2; } - - server = _dbus_server_new_for_socket (listen_fd, &address); + + if (use_nonce) + { + noncefile = dbus_new0 (DBusNonceFile, 1); + if (noncefile == NULL) + { + dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); + goto failed_2; + } + + if (!_dbus_noncefile_create (noncefile, error)) + goto failed_3; + + if (!_dbus_string_append (&address, ",noncefile=") || + !_dbus_address_append_escaped (&address, _dbus_noncefile_get_path (noncefile))) + { + dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); + goto failed_4; + } + + } + + server = _dbus_server_new_for_socket (listen_fds, nlisten_fds, &address, noncefile); if (server == NULL) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); - _dbus_close_socket (listen_fd, NULL); - _dbus_string_free (&address); - return NULL; + goto failed_4; } + _dbus_string_free (&port_str); _dbus_string_free (&address); - + dbus_free(listen_fds); + return server; + failed_4: + _dbus_noncefile_delete (noncefile, NULL); + + failed_3: + dbus_free (noncefile); + + failed_2: + for (i = 0 ; i < nlisten_fds ; i++) + _dbus_close_socket (listen_fds[i], NULL); + dbus_free(listen_fds); + + failed_1: + _dbus_string_free (&port_str); + failed_0: + _dbus_string_free (&address); + + return NULL; } /** * Tries to interpret the address entry for various socket-related - * addresses (well, currently only tcp). - * + * addresses (well, currently only tcp and nonce-tcp). + * * Sets error if the result is not OK. - * + * * @param entry an address entry * @param server_p a new DBusServer, or #NULL on failure. * @param error location to store rationale for failure on bad address * @returns the outcome - * + * */ DBusServerListenResult _dbus_server_listen_socket (DBusAddressEntry *entry, @@ -380,35 +527,23 @@ _dbus_server_listen_socket (DBusAddressEntry *entry, const char *method; *server_p = NULL; - + method = dbus_address_entry_get_method (entry); - - if (strcmp (method, "tcp") == 0) + + if (strcmp (method, "tcp") == 0 || strcmp (method, "nonce-tcp") == 0) { - const char *host = dbus_address_entry_get_value (entry, "host"); - const char *port = dbus_address_entry_get_value (entry, "port"); - DBusString str; - long lport; - dbus_bool_t sresult; - - if (port == NULL) - { - _dbus_set_bad_address(error, "tcp", "port", NULL); - return DBUS_SERVER_LISTEN_BAD_ADDRESS; - } + const char *host; + const char *port; + const char *bind; + const char *family; - _dbus_string_init_const (&str, port); - sresult = _dbus_string_parse_int (&str, 0, &lport, NULL); - _dbus_string_free (&str); - - if (sresult == FALSE || lport <= 0 || lport > 65535) - { - _dbus_set_bad_address(error, NULL, NULL, - "Port is not an integer between 0 and 65535"); - return DBUS_SERVER_LISTEN_BAD_ADDRESS; - } - - *server_p = _dbus_server_new_for_tcp_socket (host, lport, error); + host = dbus_address_entry_get_value (entry, "host"); + bind = dbus_address_entry_get_value (entry, "bind"); + port = dbus_address_entry_get_value (entry, "port"); + family = dbus_address_entry_get_value (entry, "family"); + + *server_p = _dbus_server_new_for_tcp_socket (host, bind, port, + family, error, strcmp (method, "nonce-tcp") == 0 ? TRUE : FALSE); if (*server_p) { @@ -432,10 +567,10 @@ _dbus_server_listen_socket (DBusAddressEntry *entry, * This is a bad hack since it's really unix domain socket * specific. Also, the function weirdly adopts ownership * of the passed-in string. - * + * * @param server a socket server * @param filename socket filename to report/delete - * + * */ void _dbus_server_socket_own_filename (DBusServer *server,