colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

polkit: port authorize to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-04-06 12:38:44 -07:00
committed by Aleksander Morgado
parent 1755d1a5c3
commit 740ce1fb26
1 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/mm-auth-provider-polkit.c
View File

@@ -41,24 +41,16 @@ mm_auth_provider_polkit_new (void)
/*****************************************************************************/
typedef struct {
MMAuthProvider *self;
GCancellable *cancellable;
PolkitSubject *subject;
gchar *authorization;
GDBusMethodInvocation *invocation;
GSimpleAsyncResult *result;
} AuthorizeContext;
static void
authorize_context_complete_and_free (AuthorizeContext *ctx)
authorize_context_free (AuthorizeContext *ctx)
{
g_simple_async_result_complete (ctx->result);
g_object_unref (ctx->result);
if (ctx->cancellable)
g_object_unref (ctx->cancellable);
g_object_unref (ctx->invocation);
g_object_unref (ctx->subject);
g_object_unref (ctx->self);
g_free (ctx->authorization);
g_free (ctx);
}
@@ -68,29 +60,31 @@ authorize_finish (MMAuthProvider *self,
GAsyncResult *res,
GError **error)
{
return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error);
return g_task_propagate_boolean (G_TASK (res), error);
}
static void
check_authorization_ready (PolkitAuthority *authority,
GAsyncResult *res,
AuthorizeContext *ctx)
GTask *task)
{
PolkitAuthorizationResult *pk_result;
GError *error = NULL;
AuthorizeContext *ctx;
if (g_cancellable_is_cancelled (ctx->cancellable)) {
g_simple_async_result_set_error (ctx->result,
if (g_cancellable_is_cancelled (g_task_get_cancellable (task))) {
g_task_return_new_error (task,
MM_CORE_ERROR,
MM_CORE_ERROR_CANCELLED,
"PolicyKit authorization attempt cancelled");
authorize_context_complete_and_free (ctx);
g_object_unref (task);
return;
}
ctx = g_task_get_task_data (task);
pk_result = polkit_authority_check_authorization_finish (authority, res, &error);
if (!pk_result) {
g_simple_async_result_set_error (ctx->result,
g_task_return_new_error (task,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"PolicyKit authorization failed: '%s'",
@@ -99,15 +93,15 @@ check_authorization_ready (PolkitAuthority *authority,
} else {
if (polkit_authorization_result_get_is_authorized (pk_result))
/* Good! */
g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
g_task_return_boolean (task, TRUE);
else if (polkit_authorization_result_get_is_challenge (pk_result))
g_simple_async_result_set_error (ctx->result,
g_task_return_new_error (task,
MM_CORE_ERROR,
MM_CORE_ERROR_UNAUTHORIZED,
"PolicyKit authorization failed: challenge needed for '%s'",
ctx->authorization);
else
g_simple_async_result_set_error (ctx->result,
g_task_return_new_error (task,
MM_CORE_ERROR,
MM_CORE_ERROR_UNAUTHORIZED,
"PolicyKit authorization failed: not authorized for '%s'",
@@ -115,7 +109,7 @@ check_authorization_ready (PolkitAuthority *authority,
g_object_unref (pk_result);
}
authorize_context_complete_and_free (ctx);
g_object_unref (task);
}
static void
@@ -128,14 +122,16 @@ authorize (MMAuthProvider *self,
{
MMAuthProviderPolkit *polkit = MM_AUTH_PROVIDER_POLKIT (self);
AuthorizeContext *ctx;
GTask *task;
/* When creating the object, we actually allowed errors when looking for the
* authority. If that is the case, we'll just forbid any incoming
* authentication request */
if (!polkit->priv->authority) {
g_simple_async_report_error_in_idle (G_OBJECT (self),
g_task_report_new_error (self,
callback,
user_data,
authorize,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"PolicyKit authorization error: "
@@ -144,16 +140,13 @@ authorize (MMAuthProvider *self,
}
ctx = g_new (AuthorizeContext, 1);
ctx->self = g_object_ref (self);
ctx->invocation = g_object_ref (invocation);
ctx->authorization = g_strdup (authorization);
ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
ctx->result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
authorize);
ctx->subject = polkit_system_bus_name_new (g_dbus_method_invocation_get_sender (ctx->invocation));
task = g_task_new (self, cancellable, callback, user_data);
g_task_set_task_data (task, ctx, (GDestroyNotify)authorize_context_free);
polkit_authority_check_authorization (polkit->priv->authority,
ctx->subject,
authorization,
@@ -161,7 +154,7 @@ authorize (MMAuthProvider *self,
POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
ctx->cancellable,
(GAsyncReadyCallback)check_authorization_ready,
ctx);
task);
}
/*****************************************************************************/