X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dbus%2Fdbus-server-socket.c;h=8e31da9d59f6f43a9bba9d5e92405c675ad601f2;hb=818e62f15f30f284f4cfddf5725972975b97ce52;hp=0cd2bb6cd97463f931feafb5d172f6fef75384d0;hpb=d229e579a314c6b893e0a92730f0bf644b4eabcd;p=platform%2Fupstream%2Fdbus.git diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c index 0cd2bb6..8e31da9 100644 --- a/dbus/dbus-server-socket.c +++ b/dbus/dbus-server-socket.c @@ -4,7 +4,7 @@ * 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; @@ -51,6 +54,7 @@ struct DBusServerSocket 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 @@ -58,7 +62,7 @@ socket_finalize (DBusServer *server) { DBusServerSocket *socket_server = (DBusServerSocket*) server; int i; - + _dbus_server_finalize_base (server); for (i = 0 ; i < socket_server->n_fds ; i++) @@ -67,10 +71,13 @@ socket_finalize (DBusServer *server) _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); } @@ -83,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); @@ -109,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. */ @@ -132,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); @@ -153,14 +160,15 @@ socket_handle_watch (DBusWatch *watch, void *data) { DBusServer *server = data; -#ifndef DBUS_DISABLE_ASSERT DBusServerSocket *socket_server = data; + +#ifndef DBUS_DISABLE_ASSERT int i; dbus_bool_t found = FALSE; #endif SERVER_LOCK (server); - + #ifndef DBUS_DISABLE_ASSERT for (i = 0 ; i < socket_server->n_fds ; i++) { @@ -171,20 +179,23 @@ socket_handle_watch (DBusWatch *watch, #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_socket (watch); - client_fd = _dbus_accept (listen_fd); - + 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 (_dbus_get_is_errno_eagain_or_ewouldblock ()) _dbus_verbose ("No client available to accept after all\n"); else @@ -195,8 +206,6 @@ socket_handle_watch (DBusWatch *watch, } 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"); } @@ -210,7 +219,7 @@ socket_handle_watch (DBusWatch *watch, return TRUE; } - + static void socket_disconnect (DBusServer *server) { @@ -218,13 +227,14 @@ socket_disconnect (DBusServer *server) int i; HAVE_LOCK_CHECK (server); - + for (i = 0 ; i < socket_server->n_fds ; i++) { 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; } @@ -240,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); } @@ -259,22 +272,26 @@ static const DBusServerVTable socket_vtable = { * @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 *fds, int n_fds, - const DBusString *address) + const DBusString *address, + DBusNonceFile *noncefile) { DBusServerSocket *socket_server; DBusServer *server; int i; - + socket_server = dbus_new0 (DBusServerSocket, 1); if (socket_server == NULL) return NULL; + socket_server->noncefile = noncefile; + socket_server->fds = dbus_new (int, n_fds); if (!socket_server->fds) goto failed_0; @@ -307,7 +324,7 @@ _dbus_server_new_for_socket (int *fds, server = (DBusServer*)socket_server; SERVER_LOCK (server); - + for (i = 0 ; i < n_fds ; i++) { if (!_dbus_server_add_watch (&socket_server->base, @@ -325,7 +342,7 @@ _dbus_server_new_for_socket (int *fds, } SERVER_UNLOCK (server); - + return (DBusServer*) socket_server; failed_2: @@ -361,8 +378,9 @@ _dbus_server_new_for_socket (int *fds, * @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 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* @@ -370,7 +388,8 @@ _dbus_server_new_for_tcp_socket (const char *host, const char *bind, const char *port, const char *family, - DBusError *error) + DBusError *error, + dbus_bool_t use_nonce) { DBusServer *server; int *listen_fds = NULL; @@ -378,9 +397,12 @@ _dbus_server_new_for_tcp_socket (const char *host, 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); @@ -413,11 +435,8 @@ _dbus_server_new_for_tcp_socket (const char *host, goto failed_1; } - for (i = 0 ; i < nlisten_fds ; i++) - _dbus_fd_set_close_on_exec (listen_fds[i]); - _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 (&address, _dbus_string_get_const_data(&port_str))) @@ -432,12 +451,33 @@ _dbus_server_new_for_tcp_socket (const char *host, dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); goto failed_2; } - - server = _dbus_server_new_for_socket (listen_fds, nlisten_fds, &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); - goto failed_2; + goto failed_4; } _dbus_string_free (&port_str); @@ -446,6 +486,12 @@ _dbus_server_new_for_tcp_socket (const char *host, 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); @@ -462,15 +508,15 @@ _dbus_server_new_for_tcp_socket (const char *host, /** * 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, @@ -480,10 +526,10 @@ _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; const char *port; @@ -496,7 +542,7 @@ _dbus_server_listen_socket (DBusAddressEntry *entry, family = dbus_address_entry_get_value (entry, "family"); *server_p = _dbus_server_new_for_tcp_socket (host, bind, port, - family, error); + family, error, strcmp (method, "nonce-tcp") == 0 ? TRUE : FALSE); if (*server_p) { @@ -520,10 +566,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,