#include <stdio.h>
#ifdef HAVE_ERRNO_H
-#include <errno.h>
+# include <errno.h>
#endif
-dbus_bool_t
-_dbus_check_nonce (int fd, const DBusString *nonce, DBusError *error)
+static dbus_bool_t
+do_check_nonce (int fd, const DBusString *nonce, DBusError *error)
{
DBusString buffer;
DBusString p;
return TRUE;
}
+static int
+accept_with_nonce (int listen_fd, const DBusString *nonce)
+{
+
+}
+
int
-_dbus_accept_with_nonce (int listen_fd, const DBusString *nonce)
+_dbus_accept_with_noncefile (int listen_fd, const DBusNonceFile *noncefile)
{
- _dbus_assert (nonce != NULL);
int fd;
+ DBusString nonce;
+
+ _dbus_assert (noncefile != NULL);
+ _dbus_string_init (&nonce);
+ //PENDING(kdab): set better errors
+ if (_dbus_read_nonce (_dbus_noncefile_get_path(noncefile), &nonce, NULL) != TRUE)
+ return -1;
fd = _dbus_accept (listen_fd);
if (_dbus_socket_is_invalid (fd))
return fd;
- if (_dbus_check_nonce(fd, nonce, NULL) != TRUE) {
+ if (do_check_nonce(fd, &nonce, NULL) != TRUE) {
_dbus_verbose ("nonce check failed. Closing socket.\n");
_dbus_close_socket(fd, NULL);
return -1;
return fd;
}
-int
-_dbus_accept_with_noncefile (int listen_fd, const DBusString *noncefile)
-{
- _dbus_assert (noncefile != NULL);
- DBusString nonce;
- _dbus_string_init (&nonce);
- //PENDING(kdab): set better errors
- if (_dbus_read_nonce (noncefile, &nonce, NULL) != TRUE)
- return -1;
- return _dbus_accept_with_nonce (listen_fd, &nonce);
-}
-
dbus_bool_t
_dbus_generate_noncefilename (DBusString *buf, DBusError *error)
{
return FALSE;
}
-dbus_bool_t
-_dbus_generate_and_write_nonce (const DBusString *filename, DBusError *error)
+static dbus_bool_t
+generate_and_write_nonce (const DBusString *filename, DBusError *error)
{
DBusString nonce;
dbus_bool_t ret;
return FALSE;
}
- ret = _dbus_string_save_to_file (filename, &nonce, error);
+ ret = _dbus_string_save_to_file (&nonce, filename, error);
_dbus_string_free (&nonce);
return TRUE;
}
+static dbus_bool_t
+do_noncefile_create (DBusNonceFile *noncefile,
+ DBusError *error,
+ dbus_bool_t use_subdir)
+{
+ dbus_bool_t ret;
+ DBusString randomStr;
+
+ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
+
+ _dbus_assert (noncefile);
+
+ if (!_dbus_string_init (&randomStr))
+ {
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+ goto on_error;
+ }
+
+ if (!_dbus_generate_random_ascii (&randomStr, 8))
+ {
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+ goto on_error;
+ }
+
+ if (!_dbus_string_init (&noncefile->dir)
+ || !_dbus_string_append (&noncefile->dir, _dbus_get_tmpdir()))
+ {
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+ goto on_error;
+ }
+ if (use_subdir)
+ {
+ if (!_dbus_string_append (&noncefile->dir, DBUS_DIR_SEPARATOR "dbus_nonce-")
+ || !_dbus_string_append (&noncefile->dir, _dbus_string_get_const_data (&randomStr)) )
+ {
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+ goto on_error;
+ }
+ if (!_dbus_string_init (&noncefile->path)
+ || !_dbus_string_copy (&noncefile->dir, 0, &noncefile->path, 0)
+ || !_dbus_string_append (&noncefile->dir, DBUS_DIR_SEPARATOR "nonce"))
+ {
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+ goto on_error;
+ }
+ if (!_dbus_create_directory (&noncefile->dir, error))
+ {
+ goto on_error;
+ }
+
+ }
+ else
+ {
+ if (!_dbus_string_init (&noncefile->path)
+ || !_dbus_string_copy (&noncefile->dir, 0, &noncefile->path, 0)
+ || !_dbus_string_append (&noncefile->path, DBUS_DIR_SEPARATOR "dbus_nonce-")
+ || !_dbus_string_append (&noncefile->path, _dbus_string_get_const_data (&randomStr)))
+ {
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+ goto on_error;
+ }
+
+ }
+
+ if (!generate_and_write_nonce (&noncefile->path, error))
+ {
+ if (use_subdir)
+ _dbus_delete_directory (&noncefile->dir, NULL); //we ignore possible errors deleting the dir and return the write error instead
+ goto on_error;
+ }
+
+ _dbus_string_free (&randomStr);
+
+ return TRUE;
+ on_error:
+ if (use_subdir)
+ _dbus_delete_directory (&noncefile->dir, NULL);
+ _dbus_string_free (&noncefile->dir);
+ _dbus_string_free (&noncefile->path);
+ _dbus_string_free (&randomStr);
+ return FALSE;
+}
+
+#ifdef DBUS_WIN
+dbus_bool_t
+_dbus_noncefile_create (DBusNonceFile *noncefile,
+ DBusError *error)
+{
+ return do_noncefile_create (noncefile, error, /*use_subdir=*/FALSE);
+}
+
+dbus_bool_t
+_dbus_noncefile_delete (DBusNonceFile *noncefile,
+ DBusError *error)
+{
+ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
+
+ _dbus_delete_file (&noncefile->path, error);
+ _dbus_string_free (&noncefile->dir);
+ _dbus_string_free (&noncefile->path);
+}
+
+#else
+dbus_bool_t
+_dbus_noncefile_create (DBusNonceFile *noncefile,
+ DBusError *error)
+{
+ return do_noncefile_create (noncefile, error, /*use_subdir=*/TRUE);
+}
+
+dbus_bool_t
+_dbus_noncefile_delete (DBusNonceFile *noncefile,
+ DBusError *error)
+{
+ _DBUS_ASSERT_ERROR_IS_CLEAR (error);
+
+ _dbus_delete_directory (&noncefile->dir, error);
+ _dbus_string_free (&noncefile->dir);
+ _dbus_string_free (&noncefile->path);
+}
+#endif
+
+
+const DBusString*
+_dbus_noncefile_get_path (const DBusNonceFile *noncefile)
+{
+ _dbus_assert (noncefile);
+ return &noncefile->path;
+}
+
+dbus_bool_t
+_dbus_noncefile_check_nonce (int fd,
+ const DBusNonceFile *noncefile,
+ DBusError* error)
+{
+ return do_check_nonce (fd, _dbus_noncefile_get_path (noncefile), error);
+}
+
+
/** @} end of nonce */
* 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
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "dbus-server-socket.h"
#include "dbus-transport-socket.h"
#include "dbus-connection-internal.h"
+#include "dbus-nonce.h"
#include "dbus-string.h"
/**
* @{
*/
/**
- *
+ *
* Opaque object representing a Socket server implementation.
*/
typedef struct DBusServerSocket 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 */
- DBusString noncefile; /**< Nonce file used to authenticate clients */
+ DBusNonceFile *noncefile; /**< Nonce file used to authenticate clients */
};
static void
{
DBusServerSocket *socket_server = (DBusServerSocket*) server;
int i;
-
+
_dbus_server_finalize_base (server);
for (i = 0 ; i < socket_server->n_fds ; 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 (_dbus_string_get_length(&socket_server->noncefile) > 0)
- {
- _dbus_delete_file(&socket_server->noncefile, NULL);
- }
- _dbus_string_free (&socket_server->noncefile);
+ _dbus_noncefile_delete (socket_server->noncefile, NULL); //PENDING(kdab) review error ignore
+ dbus_free (socket_server->noncefile);
dbus_free (server);
}
DBusNewConnectionFunction new_connection_function;
DBusServerSocket* socket_server;
void *new_connection_data;
-
+
socket_server = (DBusServerSocket*)server;
_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);
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.
*/
_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);
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++)
{
#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_with_noncefile (listen_fd, &socket_server->noncefile);
-
+ client_fd = _dbus_accept_with_noncefile (listen_fd, socket_server->noncefile);
+
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
return TRUE;
}
-
+
static void
socket_disconnect (DBusServer *server)
{
int i;
HAVE_LOCK_CHECK (server);
-
+
for (i = 0 ; i < socket_server->n_fds ; i++)
{
if (socket_server->watch[i])
* @param fds list of file descriptors.
* @param n_fds number of file descriptors
* @param address the server's address
- * @param noncefile the noncefile to use, NULL if without nonce
+ * @param use_nonce whether to create and use a nonce for authentication
* @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 *noncefile)
+ 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;
&socket_vtable, address))
goto failed_2;
- if (!_dbus_string_init (&socket_server->noncefile))
- goto failed_2;
-
- if (noncefile && !_dbus_string_copy (noncefile, 0, &socket_server->noncefile, 0))
- goto failed_3;
-
server = (DBusServer*)socket_server;
SERVER_LOCK (server);
-
+
for (i = 0 ; i < n_fds ; i++)
{
if (!_dbus_server_add_watch (&socket_server->base,
}
SERVER_UNLOCK (server);
-
+
return (DBusServer*) socket_server;
failed_3:
- _dbus_string_free (&socket_server->noncefile);
+ _dbus_noncefile_delete (socket_server->noncefile, NULL);
+ _dbus_free (socket_server->noncefile );
failed_2:
for (i = 0 ; i < n_fds ; i++)
{
* @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*
DBusString address;
DBusString host_str;
DBusString port_str;
- DBusString noncefile;
+ DBusNonceFile *noncefile;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
+ noncefile = NULL;
+
if (!_dbus_string_init (&address))
{
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
goto failed_2;
}
-
- if (!_dbus_string_init (&noncefile))
- {
- dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
- goto failed_2;
- }
if (use_nonce)
{
- if (!_dbus_generate_noncefilename (&noncefile))
+ noncefile = dbus_new0 (DBusNonceFile, 1);
+ if (noncefile == NULL)
{
- dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
goto failed_2;
}
- if (_dbus_string_get_length(&noncefile) == 0 ||
- !_dbus_string_append (&address, ",noncefile=") ||
- !_dbus_address_append_escaped (&address, &noncefile))
- {
- dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+ if (!_dbus_noncefile_create (noncefile, NULL))
goto failed_2;
- }
- if (!_dbus_generate_and_write_nonce (&noncefile, error))
+ if (!_dbus_string_append (&address, ",noncefile=") ||
+ !_dbus_address_append_escaped (&address, _dbus_noncefile_get_path (noncefile)))
{
goto failed_2;
}
+
}
- server = _dbus_server_new_for_socket (listen_fds, nlisten_fds, &address, &noncefile);
+ server = _dbus_server_new_for_socket (listen_fds, nlisten_fds, &address, noncefile);
if (server == NULL)
{
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
for (i = 0 ; i < nlisten_fds ; i++)
_dbus_close_socket (listen_fds[i], NULL);
dbus_free(listen_fds);
- _dbus_string_free (&noncefile);
failed_1:
_dbus_string_free (&port_str);
/**
* Tries to interpret the address entry for various socket-related
* 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,
const char *method;
*server_p = NULL;
-
+
method = dbus_address_entry_get_method (entry);
-
+
if (strcmp (method, "tcp") == 0 || strcmp (method, "nonce-tcp") == 0)
{
const char *host;
* 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,
projects / platform / upstream / dbus.git / commitdiff