Don't create a sub-directory for the socket when running as root

[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / bridge.c

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index 1ee9ba9..9880639 100644 (file)
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -56,6 +56,8 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data);
 
 SpiBridge *spi_global_app_data = NULL;
 
+static gboolean inited = FALSE;
+
 /*---------------------------------------------------------------------------*/
 
 static void
@@ -268,7 +270,6 @@ register_application (SpiBridge * app)
   DBusMessageIter iter;
   DBusError error;
   DBusPendingCall *pending;
-  const int max_addr_length = 128; /* should be long enough */
 
   dbus_error_init (&error);
 
@@ -296,16 +297,24 @@ 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|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());
-#else
-  app->app_bus_addr [0] = '\0';
+  if (getuid () != 0)
+  {
+    app->app_tmp_dir = g_build_filename (g_get_user_runtime_dir (),
+                                         "at-spi2-XXXXXX", NULL);
+    if (!g_mkdtemp (app->app_tmp_dir))
+    {
+      g_free (app->app_tmp_dir);
+      app->app_tmp_dir = NULL;
+      return FALSE;
+    }
+  }
+
+  if (app->app_tmp_dir)
+    app->app_bus_addr = g_strdup_printf ("unix:path=%s/socket", app->app_tmp_dir);
+  else
+    app->app_bus_addr = g_strdup_printf ("unix:path=%s/at-spi2-socket-%d",
+                                         g_get_user_runtime_dir (), getpid ());
 #endif
 
   return TRUE;
@@ -336,6 +345,20 @@ deregister_application (SpiBridge * app)
   dbus_connection_send (app->bus, message, NULL);
   if (message)
     dbus_message_unref (message);
+
+  if (app->app_bus_addr)
+  {
+    unlink (app->app_bus_addr);
+    g_free (app->app_bus_addr);
+    app->app_bus_addr = NULL;
+  }
+
+  if (app->app_tmp_dir)
+  {
+    rmdir (app->app_tmp_dir);
+    g_free (app->app_tmp_dir);
+    app->app_tmp_dir = NULL;
+  }
 }
 
 /*---------------------------------------------------------------------------*/
@@ -462,8 +485,8 @@ install_plug_hooks ()
   socket_class->embed = socket_embed_hook;
 }
 
-static uint
-get_ancestral_uid (uint pid)
+static guint
+get_ancestral_uid (guint pid)
 {
   FILE *fp;
   char buf [80];
@@ -523,6 +546,9 @@ setup_bus (void)
   DBusServer *server;
   DBusError err;
 
+  if (!spi_global_app_data->app_bus_addr)
+    return -1;
+
   dbus_error_init(&err);
   server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err);
   if (server == NULL)
@@ -699,6 +725,27 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data)
 }
 
 /*
+ * Checks the status of the environment variables
+ *
+ * At this moment it only checks NO_AT_BRIDGE
+ *
+ * Returns TRUE if there isn't anything on the environment preventing
+ * you to load the bridge, FALSE otherwise
+ */
+static gboolean
+check_envvar (void)
+{
+  const gchar *envvar;
+
+  envvar = g_getenv ("NO_AT_BRIDGE");
+
+  if (envvar && atoi (envvar) == 1)
+    return FALSE;
+  else
+    return TRUE;
+}
+
+/*
  * spi_app_init
  *
  * The following needs to be initialized.
@@ -710,21 +757,24 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data)
  *
  */
 int
-adaptor_init (gint * argc, gchar ** argv[])
+atk_bridge_adaptor_init (gint * argc, gchar ** argv[])
 {
   GOptionContext *opt;
   GError *err = NULL;
   DBusError error;
   AtkObject *root;
-  static gboolean inited = FALSE;
+  gboolean load_bridge;
+  DRoutePath *treepath, *accpath;
 
-  if (inited)
+  load_bridge = check_envvar ();
+  if (inited && !load_bridge)
+    g_warning ("ATK Bridge is disabled but a11y has already been enabled.");
+
+  if (inited || !load_bridge)
     return 0;
 
   inited = TRUE;
 
-  DRoutePath *treepath, *accpath;
-
   root = atk_get_root ();
   g_warn_if_fail (root);
   if (!root)
@@ -831,7 +881,8 @@ adaptor_init (gint * argc, gchar ** argv[])
                            spi_global_app_data->bus);
 
   /* Register methods to send D-Bus signals on certain ATK events */
-  spi_atk_register_event_listeners ();
+  if (clients)
+    spi_atk_register_event_listeners ();
 
   /* Set up filter and match rules to catch signals */
   dbus_bus_add_match (spi_global_app_data->bus, "type='signal', interface='org.a11y.atspi.Registry', sender='org.a11y.atspi.Registry'", NULL);
@@ -851,11 +902,13 @@ adaptor_init (gint * argc, gchar ** argv[])
 }
 
 void
-adaptor_cleanup (void)
+atk_bridge_adaptor_cleanup (void)
 {
   GList *l;
   GSList *ls;
 
+  g_return_if_fail (inited);
+
   if (!spi_global_app_data)
       return;
 
@@ -899,6 +952,8 @@ adaptor_cleanup (void)
 
   g_free (spi_global_app_data);
   spi_global_app_data = NULL;
+
+  inited = FALSE;
 }
 
 /*---------------------------------------------------------------------------*/
@@ -917,7 +972,7 @@ spi_atk_add_client (const char *bus_name)
     if (!g_strcmp0 (l->data, bus_name))
       return;
   }
-  if (!clients && spi_global_app_data->events_initialized)
+  if (!clients)
     spi_atk_register_event_listeners ();
   clients = g_slist_append (clients, g_strdup (bus_name));
   match = g_strdup_printf (name_match_tmpl, bus_name);