diff options
| author | Giovanni Campagna <gcampagna@src.gnome.org> | 2013-10-25 18:02:16 +0200 |
|---|---|---|
| committer | Giovanni Campagna <gcampagna@src.gnome.org> | 2013-10-26 14:55:18 +0200 |
| commit | 415c6d2e2742946606c4db5b1157a946767afdb7 (patch) | |
| tree | 740dccf998ac947266a8f883661148bf8cfa8689 /gio | |
| parent | 3e48e3be40ffb38067dc8cce4e5830cdd9c08aa5 (diff) | |
gapplication: don't emit warnings for DBus calls
If a broken (or malicious) remote client calls Open or CommandLine
on a GApplication that does not implement those, return a DBus
error instead of going through and then emitting a warning.
https://bugzilla.gnome.org/show_bug.cgi?id=710885
Diffstat (limited to 'gio')
| -rw-r--r-- | gio/gapplicationimpl-dbus.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/gio/gapplicationimpl-dbus.c b/gio/gapplicationimpl-dbus.c index 07709cc9e..2c77fee81 100644 --- a/gio/gapplicationimpl-dbus.c +++ b/gio/gapplicationimpl-dbus.c @@ -203,12 +203,20 @@ g_application_impl_method_call (GDBusConnection *connection, else if (strcmp (method_name, "Open") == 0) { + GApplicationFlags flags; GVariant *platform_data; const gchar *hint; GVariant *array; GFile **files; gint n, i; + flags = g_application_get_flags (impl->app); + if ((flags & G_APPLICATION_HANDLES_OPEN) == 0) + { + g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_NOT_SUPPORTED, "Application does not open files"); + return; + } + /* freedesktop interface has no hint parameter */ if (g_str_equal (interface_name, "org.freedesktop.Application")) { @@ -246,10 +254,18 @@ g_application_impl_method_call (GDBusConnection *connection, else if (strcmp (method_name, "CommandLine") == 0) { + GApplicationFlags flags; GApplicationCommandLine *cmdline; GVariant *platform_data; int status; + flags = g_application_get_flags (impl->app); + if ((flags & G_APPLICATION_HANDLES_COMMAND_LINE) == 0) + { + g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_NOT_SUPPORTED, "Application does not handle command line arguments"); + return; + } + /* Only on the GtkApplication interface */ cmdline = g_dbus_command_line_new (invocation); |