From 40fb6652a2b76f1eef45e4b9dcfd963062dd0863 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sat, 4 May 2019 11:03:35 +0200
Subject: [PATCH] auth-manager: re-use D-Bus connection from NMDBusManager

First of all, NMDBusManager takes the system D-Bus connection synchronously, so we
should avoid API that is asynchronous and first needs to get glib's G_BUS_TYPE_SYSTEM
instance.

Also, the only reason why NMDBusManager might not have a D-Bus connection is in "initrd"
configure-and-quit mode. In that mode we also don't need polkit.
---
 src/main.c            |  6 +++---
 src/nm-auth-manager.c | 44 ++++++++++++++++++++++++++++++-------------
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/main.c b/src/main.c
index 6b356e16c2..200cff276c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -423,14 +423,14 @@ main (int argc, char *argv[])
 
 	NM_UTILS_KEEP_ALIVE (config, nm_netns_get (), "NMConfig-depends-on-NMNetns");
 
+	if (!_dbus_manager_init (config))
+		goto done_no_manager;
+
 	nm_auth_manager_setup (nm_config_data_get_value_boolean (nm_config_get_data_orig (config),
 	                                                         NM_CONFIG_KEYFILE_GROUP_MAIN,
 	                                                         NM_CONFIG_KEYFILE_KEY_MAIN_AUTH_POLKIT,
 	                                                         NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_BOOL));
 
-	if (!_dbus_manager_init (config))
-		goto done_no_manager;
-
 	manager = nm_manager_setup ();
 
 	nm_dbus_manager_start (nm_dbus_manager_get(),
diff --git a/src/nm-auth-manager.c b/src/nm-auth-manager.c
index bae437b6c1..0db7e599ca 100644
--- a/src/nm-auth-manager.c
+++ b/src/nm-auth-manager.c
@@ -25,6 +25,7 @@
 #include "c-list/src/c-list.h"
 #include "nm-errors.h"
 #include "nm-core-internal.h"
+#include "nm-dbus-manager.h"
 #include "NetworkManagerUtils.h"
 
 #define POLKIT_SERVICE                      "org.freedesktop.PolicyKit1"
@@ -628,23 +629,40 @@ constructed (GObject *object)
 {
 	NMAuthManager *self = NM_AUTH_MANAGER (object);
 	NMAuthManagerPrivate *priv = NM_AUTH_MANAGER_GET_PRIVATE (self);
+	GDBusConnection *dbus_connection;
+	NMLogLevel logl = LOGL_DEBUG;
+	const char *create_message;
 
 	G_OBJECT_CLASS (nm_auth_manager_parent_class)->constructed (object);
 
-	_LOGD ("create auth-manager: polkit %s", priv->polkit_enabled ? "enabled" : "disabled");
-
-	if (priv->polkit_enabled) {
-		priv->new_proxy_cancellable = g_cancellable_new ();
-		g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
-		                          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-		                          NULL,
-		                          POLKIT_SERVICE,
-		                          POLKIT_OBJECT_PATH,
-		                          POLKIT_INTERFACE,
-		                          priv->new_proxy_cancellable,
-		                          _dbus_new_proxy_cb,
-		                          self);
+	if (!priv->polkit_enabled) {
+		create_message = "polkit disabled";
+		goto out;
 	}
+
+	dbus_connection = NM_MAIN_DBUS_CONNECTION_GET;
+	if (!dbus_connection) {
+		priv->polkit_enabled = FALSE;
+		/* This warrants an info level message. */
+		logl = LOGL_INFO;
+		create_message = "D-Bus connection not available. Polkit is disabled and all requests are authenticated.";
+		goto out;
+	}
+
+	priv->new_proxy_cancellable = g_cancellable_new ();
+	g_dbus_proxy_new (dbus_connection,
+	                  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+	                  NULL,
+	                  POLKIT_SERVICE,
+	                  POLKIT_OBJECT_PATH,
+	                  POLKIT_INTERFACE,
+	                  priv->new_proxy_cancellable,
+	                  _dbus_new_proxy_cb,
+	                  self);
+	create_message = "polkit enabled";
+
+out:
+	_NMLOG (logl, "create auth-manager: %s", create_message);
 }
 
 NMAuthManager *