Return an error when trying to connect hidden networks

[connman] / plugins / polkit.c

diff --git a/plugins/polkit.c b/plugins/polkit.c
index bff357f..16dd9d5 100644 (file)
--- a/plugins/polkit.c
+++ b/plugins/polkit.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2008  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2009  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -28,17 +28,67 @@
 #include <glib.h>
 #include <polkit-dbus/polkit-dbus.h>
 
+#define CONNMAN_API_SUBJECT_TO_CHANGE
 #include <connman/plugin.h>
 #include <connman/security.h>
+#include <connman/dbus.h>
 #include <connman/log.h>
 
-static PolKitContext *polkit_context = NULL;
+#define ACTION_MODIFY "org.moblin.connman.modify"
+#define ACTION_SECRET "org.moblin.connman.secret"
 
-static int polkit_authorize(const char *sender)
+static DBusConnection *connection;
+static PolKitContext *polkit_context;
+
+static int polkit_authorize(const char *sender,
+                               enum connman_security_privilege privilege)
 {
+       DBusError error;
+       PolKitCaller *caller;
+       PolKitAction *action;
+       PolKitResult result;
+       const char *id = NULL;
+
        DBG("sender %s", sender);
 
-       return -EPERM;
+       switch (privilege) {
+       case CONNMAN_SECURITY_PRIVILEGE_PUBLIC:
+               return 0;
+       case CONNMAN_SECURITY_PRIVILEGE_MODIFY:
+               id = ACTION_MODIFY;
+               break;
+       case CONNMAN_SECURITY_PRIVILEGE_SECRET:
+               id = ACTION_SECRET;
+               break;
+       }
+
+       dbus_error_init(&error);
+
+       caller = polkit_caller_new_from_dbus_name(connection, sender, &error);
+       if (caller == NULL) {
+               if (dbus_error_is_set(&error) == TRUE) {
+                       connman_error("%s", error.message);
+                       dbus_error_free(&error);
+               } else
+                       connman_error("Failed to get caller information");
+               return -EIO;
+       }
+
+       action = polkit_action_new();
+       polkit_action_set_action_id(action, id);
+
+       result = polkit_context_is_caller_authorized(polkit_context,
+                                               action, caller, TRUE, NULL);
+
+       polkit_action_unref(action);
+       polkit_caller_unref(caller);
+
+       DBG("result %s", polkit_result_to_string_representation(result));
+
+       if (result == POLKIT_RESULT_NO)
+               return -EPERM;
+
+       return 0;
 }
 
 static struct connman_security polkit_security = {
@@ -90,6 +140,10 @@ static int polkit_init(void)
 {
        int err;
 
+       connection = connman_dbus_get_connection();
+       if (connection == NULL)
+               return -EIO;
+
        polkit_context = polkit_context_new();
 
        polkit_context_set_io_watch_functions(polkit_context,
@@ -98,14 +152,14 @@ static int polkit_init(void)
        if (polkit_context_init(polkit_context, NULL) == FALSE) {
                connman_error("Can't initialize PolicyKit");
                polkit_context_unref(polkit_context);
-               polkit_context = NULL;
+               dbus_connection_unref(connection);
                return -EIO;
        }
 
        err = connman_security_register(&polkit_security);
        if (err < 0) {
                polkit_context_unref(polkit_context);
-               polkit_context = NULL;
+               dbus_connection_unref(connection);
                return err;
        }
 
@@ -116,12 +170,10 @@ static void polkit_exit(void)
 {
        connman_security_unregister(&polkit_security);
 
-       if (polkit_context == NULL)
-               return;
-
        polkit_context_unref(polkit_context);
-       polkit_context = NULL;
+
+       dbus_connection_unref(connection);
 }
 
-CONNMAN_PLUGIN_DEFINE("polkit", "PolicyKit authorization plugin", VERSION,
-                                               polkit_init, polkit_exit)
+CONNMAN_PLUGIN_DEFINE(polkit, "PolicyKit authorization plugin", VERSION,
+               CONNMAN_PLUGIN_PRIORITY_DEFAULT, polkit_init, polkit_exit)