fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-11 08:40:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: NMSecretAgent shouldn't check peer UID on session bus

Browse source 
If an NMSecretAgent is attached to the session bus rather than the
system bus, then it's presumably a test program, and so we don't want
to check that the peer is root.
This commit is contained in:
Dan Winship 2014-09-02 12:56:50 -04:00
parent 8723bbd3e8
commit 79093c655b
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libnm/nm-secret-agent.c
View file

@ -66,6 +66,7 @@ typedef struct {
DBusGConnection *bus;
gboolean private_bus;
gboolean session_bus;
DBusGProxy *dbus_proxy;
DBusGProxy *manager_proxy;
DBusGProxyCall *reg_call;
@ -233,9 +234,7 @@ verify_sender (NMSecretAgent *self,
if (priv->private_bus)
return TRUE;
/* Verify the sender's UID is 0, and that the sender is the same as
* NetworkManager's bus name owner.
*/
/* Verify that the sender is the same as NetworkManager's bus name owner. */
nm_owner = get_nm_owner (self);
if (!nm_owner) {
@ -273,6 +272,14 @@ verify_sender (NMSecretAgent *self,
goto out;
}
/* If we're connected to the session bus, then this must be a test program,
* so skip the UID check.
*/
if (priv->session_bus) {
allowed = TRUE;
goto out;
}
dbus_error_init (&dbus_error);
sender_uid = dbus_bus_get_unix_user (bus, sender, &dbus_error);
if (dbus_error_is_set (&dbus_error)) {
@ -846,6 +853,7 @@ static void
nm_secret_agent_init (NMSecretAgent *self)
{
NMSecretAgentPrivate *priv = NM_SECRET_AGENT_GET_PRIVATE (self);
DBusGConnection *session_bus;
GError *error = NULL;
priv->bus = _nm_dbus_new_connection (&error);
@ -856,6 +864,12 @@ nm_secret_agent_init (NMSecretAgent *self)
}
priv->private_bus = _nm_dbus_is_connection_private (priv->bus);
session_bus = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
if (priv->bus == session_bus)
priv->session_bus = TRUE;
if (session_bus)
dbus_g_connection_unref (session_bus);
if (priv->private_bus == FALSE) {
priv->dbus_proxy = dbus_g_proxy_new_for_name (priv->bus,
DBUS_SERVICE_DBUS,