Nuke the PolicyKit extension as that is now deprecated
authorDavid Zeuthen <davidz@redhat.com>
Tue, 15 Mar 2011 16:24:18 +0000 (12:24 -0400)
committerDavid Zeuthen <davidz@redhat.com>
Tue, 15 Mar 2011 16:24:18 +0000 (12:24 -0400)
Ideally we'd use the replacement interface but it's not a very big
deal to not have this. We'll revisit this in udisks version 2
(e.g. the work going on in the udisks-gdbus branch).

Signed-off-by: David Zeuthen <davidz@redhat.com>
configure.ac
po/POTFILES.in
src/Makefile.am
src/daemon.c
src/polkit-action-lookup.c [deleted file]

index afe95c5..62cc35d 100644 (file)
@@ -155,10 +155,6 @@ PKG_CHECK_MODULES(POLKIT_GOBJECT_1, [polkit-gobject-1 >= 0.97])
 AC_SUBST(POLKIT_GOBJECT_1_CFLAGS)
 AC_SUBST(POLKIT_GOBJECT_1_LIBS)
 
-PKG_CHECK_MODULES(POLKIT_BACKEND_1, [polkit-backend-1 >= 0.97])
-AC_SUBST(POLKIT_BACKEND_1_CFLAGS)
-AC_SUBST(POLKIT_BACKEND_1_LIBS)
-
 PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8])
 AC_SUBST(LIBPARTED_CFLAGS)
 AC_SUBST(LIBPARTED_LIBS)
index 26f71a6..d1ecbda 100644 (file)
@@ -2,4 +2,3 @@
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
 policy/org.freedesktop.udisks.policy.in
-src/polkit-action-lookup.c
index 0c16381..629492f 100644 (file)
@@ -93,30 +93,6 @@ udisks_daemon_LDADD =                                        \
 
 # ----------------------------------------------------------------------------------------------------
 
-polkitmodulesdir = $(libdir)/polkit-1/extensions
-polkitmodules_LTLIBRARIES = libudisks-action-lookup.la
-
-libudisks_action_lookup_la_SOURCES =                                   \
-       polkit-action-lookup.c                                          \
-        $(NULL)
-
-libudisks_action_lookup_la_CFLAGS =                                    \
-        -DPOLKIT_BACKEND_I_KNOW_API_IS_SUBJECT_TO_CHANGE                \
-        -DG_LOG_DOMAIN=\"UDisks-Action-Lookup\"                        \
-       $(POLKIT_BACKEND_1_CFLAGS)                                      \
-        $(NULL)
-
-libudisks_action_lookup_la_LDFLAGS =                                   \
-       -export_dynamic -avoid-version -module -no-undefined            \
-       -export-symbols-regex '^g_io_module_(load|unload)'              \
-       $(POLKIT_BACKEND_1_LIBS)                                        \
-        $(NULL)
-
-libudisks_action_lookup_la_LIBADD =                                    \
-        $(NULL)
-
-# ----------------------------------------------------------------------------------------------------
-
 CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST =                                           \
index 075db22..6072502 100644 (file)
@@ -2259,63 +2259,7 @@ daemon_local_check_auth (Daemon *daemon,
   else if (action_id != NULL)
     {
       PolkitSubject *subject;
-      PolkitDetails *details;
       PolkitCheckAuthorizationFlags flags;
-      gchar partition_number_buf[32];
-
-      /* Set details - see polkit-action-lookup.c for where
-       * these key/value pairs are used
-       */
-      details = polkit_details_new ();
-      if (operation != NULL)
-        {
-          polkit_details_insert (details, "operation", (gpointer) operation);
-        }
-      if (device != NULL)
-        {
-          Device *drive;
-
-          polkit_details_insert (details, "unix-device", device->priv->device_file);
-          if (device->priv->device_file_by_id->len > 0)
-            polkit_details_insert (details, "unix-device-by-id", device->priv->device_file_by_id->pdata[0]);
-          if (device->priv->device_file_by_path->len > 0)
-            polkit_details_insert (details, "unix-device-by-path", device->priv->device_file_by_path->pdata[0]);
-
-          if (device->priv->device_is_drive)
-            {
-              drive = device;
-            }
-          else if (device->priv->device_is_partition)
-            {
-              polkit_details_insert (details, "is-partition", "1");
-              g_snprintf (partition_number_buf, sizeof partition_number_buf, "%d", device->priv->partition_number);
-              polkit_details_insert (details, "partition-number", partition_number_buf);
-              drive = daemon_local_find_by_object_path (device->priv->daemon, device->priv->partition_slave);
-            }
-          else
-            {
-              drive = NULL;
-            }
-
-          if (drive != NULL)
-            {
-              polkit_details_insert (details, "drive-unix-device", drive->priv->device_file);
-              if (drive->priv->device_file_by_id->len > 0)
-                polkit_details_insert (details, "drive-unix-device-by-id", drive->priv->device_file_by_id->pdata[0]);
-              if (drive->priv->device_file_by_path->len > 0)
-                polkit_details_insert (details, "drive-unix-device-by-path", drive->priv->device_file_by_path->pdata[0]);
-              if (drive->priv->drive_vendor != NULL)
-                polkit_details_insert (details, "drive-vendor", drive->priv->drive_vendor);
-              if (drive->priv->drive_model != NULL)
-                polkit_details_insert (details, "drive-model", drive->priv->drive_model);
-              if (drive->priv->drive_revision != NULL)
-                polkit_details_insert (details, "drive-revision", drive->priv->drive_revision);
-              if (drive->priv->drive_serial != NULL)
-                polkit_details_insert (details, "drive-serial", drive->priv->drive_serial);
-              if (drive->priv->drive_connection_interface != NULL)
-                polkit_details_insert (details, "drive-connection-interface", drive->priv->drive_connection_interface);
-            }
-        }
 
       subject = polkit_system_bus_name_new (dbus_g_method_get_sender (context));
 
@@ -2328,14 +2272,13 @@ daemon_local_check_auth (Daemon *daemon,
       polkit_authority_check_authorization (daemon->priv->authority,
                                             subject,
                                             action_id,
-                                            details,
+                                            NULL, /* PolkitDetails */
                                             flags,
                                             data->cancellable,
                                             (GAsyncReadyCallback) lca_check_authorization_callback,
                                             data);
 
       g_object_unref (subject);
-      g_object_unref (details);
     }
   else
     {
diff --git a/src/polkit-action-lookup.c b/src/polkit-action-lookup.c
deleted file mode 100644 (file)
index 62199b2..0000000
+++ /dev/null
@@ -1,246 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/*
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#include "config.h"
-
-#include <polkitbackend/polkitbackend.h>
-
-#include <glib/gi18n-lib.h>
-
-#define UDISKS_TYPE_ACTION_LOOKUP          (udisks_action_lookup_get_type())
-#define UDISKS_ACTION_LOOKUP(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), UDISKS_TYPE_ACTION_LOOKUP, UDisksActionLookup))
-#define UDISKS_ACTION_LOOKUP_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST((k), UDISKS_TYPE_ACTION_LOOKUP, UDisksActionLookupClass))
-#define UDISKS_ACTION_LOOKUP_GET_CLASS(o)  (G_TYPE_INSTANCE_GET_CLASS ((o), UDISKS_TYPE_ACTION_LOOKUP, UDisksActionLookupClass))
-#define UDISKS_IS_ACTION_LOOKUP(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), UDISKS_TYPE_ACTION_LOOKUP))
-#define UDISKS_IS_ACTION_LOOKUP_CLASS(k)   (G_TYPE_CHECK_CLASS_TYPE ((k), UDISKS_TYPE_ACTION_LOOKUP))
-
-typedef struct _UDisksActionLookup UDisksActionLookup;
-typedef struct _UDisksActionLookupClass UDisksActionLookupClass;
-
-struct _UDisksActionLookup
-{
-  GObject parent;
-};
-
-struct _UDisksActionLookupClass
-{
-  GObjectClass parent_class;
-};
-
-GType udisks_action_lookup_get_type (void) G_GNUC_CONST;
-
-static void
-polkit_backend_action_lookup_iface_init (PolkitBackendActionLookupIface *iface);
-
-#define _G_IMPLEMENT_INTERFACE_DYNAMIC(TYPE_IFACE, iface_init)          \
-  {                                                                     \
-  const GInterfaceInfo g_implement_interface_info = {                   \
-    (GInterfaceInitFunc) iface_init, NULL, NULL                         \
-  };                                                                    \
-  g_type_module_add_interface (type_module, g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \
-}
-
-G_DEFINE_DYNAMIC_TYPE_EXTENDED (UDisksActionLookup,
-    udisks_action_lookup,
-    G_TYPE_OBJECT,
-    0,
-    _G_IMPLEMENT_INTERFACE_DYNAMIC (POLKIT_BACKEND_TYPE_ACTION_LOOKUP,
-        polkit_backend_action_lookup_iface_init))
-
-static void
-udisks_action_lookup_init (UDisksActionLookup *lookup)
-{
-}
-
-static void
-udisks_action_lookup_class_finalize (UDisksActionLookupClass *klass)
-{
-}
-
-static void
-udisks_action_lookup_class_init (UDisksActionLookupClass *klass)
-{
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-typedef struct
-{
-  const gchar *name;
-  const gchar *message;
-} Map;
-
-static const Map map[] =
-  {
-    { "PartitionDelete", N_ ("Authentication is required to delete a partition"), },
-    { "FilesystemCreate", N_ ("Authentication is required to create a filesystem") },
-    { "PartitionCreate", N_ ("Authentication is required to create a partition") },
-    { "PartitionModify", N_ ("Authentication is required to modify a partition") },
-    { "PartitionTableCreate", N_ ("Authentication is required to create a partition table") },
-    { "FilesystemSetLabel", N_ ("Authentication is required to set the file system label") },
-    { "LinuxMdStop", N_ ("Authentication is required to stop a Software RAID device") },
-    { "LinuxMdCheck", N_ ("Authentication is required to check a Software RAID device") },
-    { "LinuxMdRepair", N_ ("Authentication is required to repair a Software RAID device") },
-    { "LinuxMdAddComponent", N_ ("Authentication is required to add a new component to a Software RAID device") },
-    { "LinuxMdRemoveComponent", N_ ("Authentication is required to remove a component from a Software RAID device") },
-    { "LinuxMdStart", N_ ("Authentication is required to start a Software RAID device") },
-    { "LinuxMdCreate", N_ ("Authentication is required to create a Software RAID device") },
-    { "DriveInhibitPolling", N_ ("Authentication is required to inhibit polling on a drive") },
-    { "DrivePollMedia", N_ ("Authentication is required to poll for media") },
-    { "InhibitAllPolling", N_ ("Authentication is required to inhibit all drive polling") },
-    { NULL, NULL, }
-  };
-
-static gchar *
-udisks_action_lookup_get_message (PolkitBackendActionLookup *lookup,
-                                  const gchar *action_id,
-                                  PolkitDetails *details,
-                                  PolkitActionDescription *action_description)
-{
-  const gchar *operation;
-  gchar *ret;
-  guint n;
-
-  ret = NULL;
-
-  if (!g_str_has_prefix (action_id, "org.freedesktop.udisks."))
-    goto out;
-
-  operation = polkit_details_lookup (details, "operation");
-  if (operation == NULL)
-    goto out;
-
-  for (n = 0; map[n].name != NULL; n++)
-    {
-      if (g_strcmp0 (map[n].name, operation) != 0)
-        continue;
-
-      ret = g_strdup (g_dgettext (GETTEXT_PACKAGE, map[n].message));
-      break;
-    }
-
- out:
-  return ret;
-}
-
-static gchar *
-udisks_action_lookup_get_icon_name (PolkitBackendActionLookup *lookup,
-                                    const gchar *action_id,
-                                    PolkitDetails *details,
-                                    PolkitActionDescription *action_description)
-{
-  gchar *ret;
-
-  ret = NULL;
-
-  if (!g_str_has_prefix (action_id, "org.freedesktop.udisks."))
-    goto out;
-
-  /* explicitly left blank for now */
-
-  out:
-  return ret;
-}
-
-static PolkitDetails *
-udisks_action_lookup_get_details (PolkitBackendActionLookup *lookup,
-                                  const gchar *action_id,
-                                  PolkitDetails *details,
-                                  PolkitActionDescription *action_description)
-{
-  const gchar *s;
-  const gchar *s2;
-  const gchar *s3;
-  GString *str;
-  PolkitDetails *ret;
-
-  if (!g_str_has_prefix (action_id, "org.freedesktop.udisks."))
-    return NULL;
-
-  ret = polkit_details_new ();
-
-  /* see daemon_local_check_auth() in daemon.c
-   * for where these keys are set
-   */
-
-  s = polkit_details_lookup (details, "unix-device");
-  if (s != NULL)
-    polkit_details_insert (ret, _ ("Device"), s);
-
-  s = polkit_details_lookup (details, "drive-vendor");
-  s2 = polkit_details_lookup (details, "drive-model");
-  s3 = polkit_details_lookup (details, "drive-revision");
-  str = g_string_new (NULL);
-  if (s != NULL)
-    {
-      g_string_append (str, s);
-    }
-  if (s2 != NULL)
-    {
-      if (str->len > 0)
-        g_string_append_c (str, ' ');
-      g_string_append (str, s2);
-    }
-  if (s3 != NULL)
-    {
-      if (str->len > 0)
-        g_string_append_c (str, ' ');
-      g_string_append_printf (str, "(%s)", s3);
-    }
-
-  if (str->len > 0)
-    {
-      polkit_details_insert (ret, _ ("Drive"), str->str);
-    }
-  g_string_free (str, TRUE);
-
-  return ret;
-}
-
-static void
-polkit_backend_action_lookup_iface_init (PolkitBackendActionLookupIface *iface)
-{
-  iface->get_message = udisks_action_lookup_get_message;
-  iface->get_icon_name = udisks_action_lookup_get_icon_name;
-  iface->get_details = udisks_action_lookup_get_details;
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-void
-g_io_module_load (GIOModule *module)
-{
-  bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-
-  udisks_action_lookup_register_type (G_TYPE_MODULE (module));
-
-  g_io_extension_point_implement (POLKIT_BACKEND_ACTION_LOOKUP_EXTENSION_POINT_NAME,
-                                  UDISKS_TYPE_ACTION_LOOKUP,
-                                  "udisks action lookup extension " PACKAGE_VERSION,
-                                  0);
-}
-
-void
-g_io_module_unload (GIOModule *module)
-{
-}