X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=atk-adaptor%2Fbridge.c;h=51b12bc3beb73b95d91fa2463be247f8d73c37d3;hp=398ebdaa16edf9308a966b04df54798c92624971;hb=00ba99d6f1c1352bc40cf33b4db28d8d221695a2;hpb=344deddcec79cb4611010a7c8655755f5d05350e diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index 398ebda..51b12bc 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -22,8 +22,8 @@ * Boston, MA 02111-1307, USA. */ +#define _GNU_SOURCE #include "config.h" -#include "dbus/dbus-glib-lowlevel.h" #include #include @@ -37,11 +37,14 @@ #include #include +#include +#include #include "bridge.h" #include "event.h" #include "adaptors.h" #include "object.h" +#include "common/spi-stateset.h" #include "accessible-register.h" #include "accessible-leasing.h" @@ -53,8 +56,6 @@ SpiBridge *spi_global_app_data = NULL; -static const AtkMisc *atk_misc = NULL; - /*static Display *bridge_display = NULL;*/ /*---------------------------------------------------------------------------*/ @@ -98,82 +99,13 @@ spi_display_name (void) /*---------------------------------------------------------------------------*/ -/* - * Gets the IOR from the XDisplay. - * Not currently used in D-Bus version, but something similar - * may be employed in the future for accessing the registry daemon - * bus name. - */ - -static DBusConnection * -spi_atk_bridge_get_bus (void) -{ - Atom AT_SPI_BUS; - Atom actual_type; - Display *bridge_display; - int actual_format; - unsigned char *data = NULL; - unsigned long nitems; - unsigned long leftover; - - DBusConnection *bus = NULL; - DBusError error; - - bridge_display = XOpenDisplay (spi_display_name ()); - if (!bridge_display) - { - g_warning ("AT_SPI: Could not get the display\n"); - return NULL; - } - - AT_SPI_BUS = XInternAtom (bridge_display, "AT_SPI_BUS", False); - XGetWindowProperty (bridge_display, - XDefaultRootWindow (bridge_display), - AT_SPI_BUS, 0L, - (long) BUFSIZ, False, - (Atom) 31, &actual_type, &actual_format, - &nitems, &leftover, &data); - - dbus_error_init (&error); - - if (data == NULL) - { - g_warning - ("AT-SPI: Accessibility bus not found - Using session bus.\n"); - bus = dbus_bus_get (DBUS_BUS_SESSION, &error); - if (!bus) - { - g_warning ("AT-SPI: Couldn't connect to bus: %s\n", error.message); - return NULL; - } - } - else - { - bus = dbus_connection_open (data, &error); - if (!bus) - { - g_warning ("AT-SPI: Couldn't connect to bus: %s\n", error.message); - return NULL; - } - else - { - if (!dbus_bus_register (bus, &error)) - { - g_warning ("AT-SPI: Couldn't register with bus: %s\n", error.message); - return NULL; - } - } - } - - return bus; -} - static void set_reply (DBusPendingCall *pending, void *user_data) { void **replyptr = (void **)user_data; *replyptr = dbus_pending_call_steal_reply (pending); + dbus_pending_call_unref (pending); } /*---------------------------------------------------------------------------*/ @@ -227,10 +159,7 @@ get_registered_event_listeners (SpiBridge *app) } dbus_message_iter_init (reply, &iter); dbus_message_iter_recurse (&iter, &iter_array); - /* TODO: This is bad. Need to determine that the array is non-empty, - so that we don't initially read a value rom it in that case, but using - a deprecated function. */ - if (dbus_message_iter_get_array_len (&iter_array) > 0) do + while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) { char *bus_name, *event; dbus_message_iter_recurse (&iter_array, &iter_struct); @@ -238,8 +167,8 @@ get_registered_event_listeners (SpiBridge *app) dbus_message_iter_next (&iter_struct); dbus_message_iter_get_basic (&iter_struct, &event); add_event (bus_name, event); + dbus_message_iter_next (&iter_array); } - while (dbus_message_iter_next (&iter_array)); dbus_message_unref (reply); } @@ -250,7 +179,8 @@ register_reply (DBusPendingCall *pending, void *user_data) SpiBridge *app = user_data; DBusMessage *message; - reply = dbus_pending_call_steal_reply (pending); + reply = dbus_pending_call_steal_reply (pending); + dbus_pending_call_unref (pending); if (reply) { gchar *app_name, *obj_path; @@ -306,7 +236,8 @@ register_application (SpiBridge * app) dbus_message_iter_init_append (message, &iter); spi_object_append_reference (&iter, app->root); - if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1)) + if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1) + || !pending) { return FALSE; } @@ -316,13 +247,16 @@ register_application (SpiBridge * app) if (message) dbus_message_unref (message); -/* could this be better, we accept some amount of race in getting the temp name*/ -/* make sure the directory exists */ -mkdir("/tmp/at-spi2/", S_IRWXU); -app->app_bus_addr = g_malloc(max_addr_length * sizeof(char)); + /* could this be better, we accept some amount of race in getting the temp name*/ + /* make sure the directory exists */ + mkdir ("/tmp/at-spi2/", S_IRWXU|S_IRWXG|S_IRWXO|S_ISVTX); + chmod ("/tmp/at-spi2/", S_IRWXU|S_IRWXG|S_IRWXO|S_ISVTX); + app->app_bus_addr = g_malloc(max_addr_length * sizeof(char)); #ifndef DISABLE_P2P -sprintf(app->app_bus_addr, "unix:path=/tmp/at-spi2/socket-%d-%d", getpid(), -rand()); + sprintf (app->app_bus_addr, "unix:path=/tmp/at-spi2/socket-%d-%d", getpid(), + rand()); +#else + app->app_bus_addr [0] = '\0'; #endif return TRUE; @@ -501,13 +435,56 @@ install_plug_hooks () socket_class->embed = socket_embed_hook; } +static uint +get_ancestral_uid (uint pid) +{ + FILE *fp; + char buf [80]; + int ppid = 0; + int uid = 0; + gboolean got_ppid = 0; + gboolean got_uid = 0; + + sprintf (buf, "/proc/%d/status", pid); + fp = fopen (buf, "r"); + if (!fp) + return 0; + while ((!got_ppid || !got_uid) && fgets (buf, sizeof (buf), fp)) + { + if (sscanf (buf, "PPid:\t%d", &ppid) == 1) + got_ppid = TRUE; + else if (sscanf (buf, "Uid:\t%d", &uid) == 1) + got_uid = TRUE; + } + fclose (fp); + + if (!got_ppid || !got_uid) + return 0; + if (uid != 0) + return uid; + if (ppid == 0 || ppid == 1) + return 0; + return get_ancestral_uid (ppid); +} + +static dbus_bool_t +user_check (DBusConnection *bus, unsigned long uid) +{ + if (uid == getuid () || uid == geteuid ()) + return TRUE; + if (getuid () == 0) + return get_ancestral_uid (getpid ()) == uid; + return FALSE; +} + static void new_connection_cb (DBusServer *server, DBusConnection *con, void *data) { GList *new_list; + dbus_connection_set_unix_user_function (con, user_check, NULL, NULL); dbus_connection_ref(con); - dbus_connection_setup_with_g_main(con, NULL); + atspi_dbus_connection_setup_with_g_main(con, NULL); droute_intercept_dbus (con); droute_context_register (spi_global_app_data->droute, con); @@ -525,12 +502,17 @@ setup_bus (void) dbus_error_init(&err); server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err); - - /* is there a better way to handle this */ if (server == NULL) + { + g_warning (_("atk-bridge: Couldn't listen on dbus server: %s"), err.message); + dbus_error_init (&err); + spi_global_app_data->app_bus_addr [0] = '\0'; + g_main_context_unref (spi_global_app_data->main_context); + spi_global_app_data->main_context = NULL; return -1; + } - dbus_server_setup_with_g_main(server, NULL); + atspi_dbus_server_setup_with_g_main(server, NULL); dbus_server_set_new_connection_function(server, new_connection_cb, NULL, NULL); spi_global_app_data->server = server; @@ -607,6 +589,8 @@ remove_events (const char *bus_name, const char *event) list = list->next; } } + + g_strfreev (remove_data); } static void @@ -689,15 +673,15 @@ adaptor_init (gint * argc, gchar ** argv[]) g_option_context_set_ignore_unknown_options (opt, TRUE); if (!g_option_context_parse (opt, argc, argv, &err)) g_warning ("AT-SPI Option parsing failed: %s\n", err->message); + g_option_context_free (opt); /* Allocate global data and do ATK initializations */ spi_global_app_data = g_new0 (SpiBridge, 1); - atk_misc = atk_misc_get_instance (); spi_global_app_data->root = g_object_ref (root); /* Set up D-Bus connection and register bus name */ dbus_error_init (&error); - spi_global_app_data->bus = spi_atk_bridge_get_bus (); + spi_global_app_data->bus = atspi_get_a11y_bus (); if (!spi_global_app_data->bus) { g_free (spi_global_app_data); @@ -723,7 +707,7 @@ adaptor_init (gint * argc, gchar ** argv[]) spi_global_app_data->main_context = g_main_context_new (); - dbus_connection_setup_with_g_main (spi_global_app_data->bus, NULL); + atspi_dbus_connection_setup_with_g_main (spi_global_app_data->bus, NULL); /* Hook our plug-and socket functions */ install_plug_hooks (); @@ -796,8 +780,6 @@ adaptor_init (gint * argc, gchar ** argv[]) setup_bus(); - g_atexit (exit_func); - return 0; }