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

auth: drop unused idle-reason for NMAuthManagerCallId

Browse Source 
We now only call the idle action with the same reason: authorized.
That is since we no longer use GDBusProxy, there are no other reasons
where we would fail.

Drop the unused code.
This commit is contained in:
Thomas Haller
2019-08-10 10:36:17 +02:00
parent 6f4b6985e8
commit b80784a785
1 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/nm-auth-manager.c
View File

@@ -124,11 +124,6 @@ typedef enum {
POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION = (1<<0), POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION = (1<<0),
} PolkitCheckAuthorizationFlags; } PolkitCheckAuthorizationFlags;
typedef enum {
IDLE_REASON_AUTHORIZED,
IDLE_REASON_NO_DBUS,
} IdleReason;
struct _NMAuthManagerCallId { struct _NMAuthManagerCallId {
CList calls_lst; CList calls_lst;
NMAuthManager *self; NMAuthManager *self;
@@ -137,7 +132,6 @@ struct _NMAuthManagerCallId {
gpointer user_data; gpointer user_data;
guint64 call_numid; guint64 call_numid;
guint idle_id; guint idle_id;
IdleReason idle_reason:8;
}; };
#define cancellation_id_to_str_a(call_numid) \ #define cancellation_id_to_str_a(call_numid) \
@@ -276,25 +270,15 @@ static gboolean
_call_on_idle (gpointer user_data) _call_on_idle (gpointer user_data)
{ {
NMAuthManagerCallId *call_id = user_data; NMAuthManagerCallId *call_id = user_data;
gs_free_error GError *error = NULL; gboolean is_authorized = TRUE;
gboolean is_authorized = FALSE;
gboolean is_challenge = FALSE; gboolean is_challenge = FALSE;
const char *error_msg = NULL;
call_id->idle_id = 0; call_id->idle_id = 0;
if (call_id->idle_reason == IDLE_REASON_AUTHORIZED) {
is_authorized = TRUE;
_LOG2T (call_id, "completed: authorized=%d, challenge=%d (simulated)",
is_authorized, is_challenge);
} else {
nm_assert (call_id->idle_reason == IDLE_REASON_NO_DBUS);
error_msg = "failure creating GDBusProxy for authorization request";
_LOG2T (call_id, "completed: failed due to no D-Bus proxy");
}
if (error_msg) _LOG2T (call_id, "completed: authorized=%d, challenge=%d (simulated)",
g_set_error_literal (&error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN, error_msg); is_authorized, is_challenge);
_call_id_invoke_callback (call_id, is_authorized, is_challenge, error);
_call_id_invoke_callback (call_id, is_authorized, is_challenge, NULL);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
@@ -351,15 +335,12 @@ nm_auth_manager_check_authorization (NMAuthManager *self,
if (!priv->dbus_connection) { if (!priv->dbus_connection) {
_LOG2T (call_id, "CheckAuthorization(%s), subject=%s (succeeding due to polkit authorization disabled)", action_id, nm_auth_subject_to_string (subject, subject_buf, sizeof (subject_buf))); _LOG2T (call_id, "CheckAuthorization(%s), subject=%s (succeeding due to polkit authorization disabled)", action_id, nm_auth_subject_to_string (subject, subject_buf, sizeof (subject_buf)));
call_id->idle_reason = IDLE_REASON_AUTHORIZED;
call_id->idle_id = g_idle_add (_call_on_idle, call_id); call_id->idle_id = g_idle_add (_call_on_idle, call_id);
} else if (nm_auth_subject_is_internal (subject)) { } else if (nm_auth_subject_is_internal (subject)) {
_LOG2T (call_id, "CheckAuthorization(%s), subject=%s (succeeding for internal request)", action_id, nm_auth_subject_to_string (subject, subject_buf, sizeof (subject_buf))); _LOG2T (call_id, "CheckAuthorization(%s), subject=%s (succeeding for internal request)", action_id, nm_auth_subject_to_string (subject, subject_buf, sizeof (subject_buf)));
call_id->idle_reason = IDLE_REASON_AUTHORIZED;
call_id->idle_id = g_idle_add (_call_on_idle, call_id); call_id->idle_id = g_idle_add (_call_on_idle, call_id);
} else if (nm_auth_subject_get_unix_process_uid (subject) == 0) { } else if (nm_auth_subject_get_unix_process_uid (subject) == 0) {
_LOG2T (call_id, "CheckAuthorization(%s), subject=%s (succeeding for root)", action_id, nm_auth_subject_to_string (subject, subject_buf, sizeof (subject_buf))); _LOG2T (call_id, "CheckAuthorization(%s), subject=%s (succeeding for root)", action_id, nm_auth_subject_to_string (subject, subject_buf, sizeof (subject_buf)));
call_id->idle_reason = IDLE_REASON_AUTHORIZED;
call_id->idle_id = g_idle_add (_call_on_idle, call_id); call_id->idle_id = g_idle_add (_call_on_idle, call_id);
} else { } else {
GVariant *parameters; GVariant *parameters;