2019-04-18 13:50:39 +00:00
|
|
|
From 342795440012a216d4abb9cfb04d2c3bd0fe8f4d Mon Sep 17 00:00:00 2001
|
2012-06-29 08:51:24 +00:00
|
|
|
From: Giovanni Campagna <gcampagna@src.gnome.org>
|
|
|
|
Date: Thu, 31 Mar 2011 15:56:13 +0200
|
2019-10-04 15:46:38 +00:00
|
|
|
Subject: [PATCH] NetworkMenu: create private connections if the user is not authorized
|
2012-06-29 08:51:24 +00:00
|
|
|
|
|
|
|
Check polkit setting at startup and add, if needed, the "permissions"
|
|
|
|
setting to the connections we create, so that polkit authentication is
|
|
|
|
never needed. The connection is thus only available to other users
|
|
|
|
if the system administrator decides so.
|
|
|
|
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=646187
|
|
|
|
---
|
2022-03-21 08:37:00 +00:00
|
|
|
Index: gnome-shell-42.rc/js/ui/status/network.js
|
2021-09-27 06:24:32 +00:00
|
|
|
===================================================================
|
2022-03-21 08:37:00 +00:00
|
|
|
--- gnome-shell-42.rc.orig/js/ui/status/network.js
|
|
|
|
+++ gnome-shell-42.rc/js/ui/status/network.js
|
|
|
|
@@ -350,6 +350,11 @@ var NMConnectionDevice = class NMConnect
|
2014-10-05 17:36:35 +00:00
|
|
|
|
2018-03-09 10:05:57 +00:00
|
|
|
_autoConnect() {
|
|
|
|
let connection = new NM.SimpleConnection();
|
|
|
|
+ if (this._privateConnections) {
|
|
|
|
+ let connectionSetting = new NM.SettingConnection();
|
|
|
|
+ connectionSetting.add_permission('user', GLib.get_user_name(), null);
|
|
|
|
+ connection.add_setting(connectionSetting);
|
2021-09-27 06:24:32 +00:00
|
|
|
+ }
|
2018-03-09 10:05:57 +00:00
|
|
|
this._client.add_and_activate_connection_async(connection, this._device, null, null, null);
|
2019-04-18 13:50:39 +00:00
|
|
|
}
|
2014-10-05 17:36:35 +00:00
|
|
|
|
2022-03-21 08:37:00 +00:00
|
|
|
@@ -478,10 +483,11 @@ var NMConnectionDevice = class NMConnect
|
2019-04-18 13:50:39 +00:00
|
|
|
};
|
2013-10-07 08:46:47 +00:00
|
|
|
|
2019-04-18 13:50:39 +00:00
|
|
|
var NMDeviceWired = class extends NMConnectionDevice {
|
|
|
|
- constructor(client, device) {
|
|
|
|
+ constructor(client, device, privateConnections) {
|
|
|
|
super(client, device);
|
2013-10-17 10:31:42 +00:00
|
|
|
|
2018-03-09 10:05:57 +00:00
|
|
|
this.item.menu.addSettingsAction(_("Wired Settings"), 'gnome-network-panel.desktop');
|
2013-10-07 08:46:47 +00:00
|
|
|
+ this._privateConnections = privateConnections;
|
2019-04-18 13:50:39 +00:00
|
|
|
}
|
2013-10-17 10:31:42 +00:00
|
|
|
|
2019-04-18 13:50:39 +00:00
|
|
|
get category() {
|
2022-03-21 08:37:00 +00:00
|
|
|
@@ -738,11 +744,12 @@ var NMWirelessDialogItem = GObject.regis
|
2012-06-29 08:51:24 +00:00
|
|
|
|
2019-10-04 15:46:38 +00:00
|
|
|
var NMWirelessDialog = GObject.registerClass(
|
|
|
|
class NMWirelessDialog extends ModalDialog.ModalDialog {
|
|
|
|
- _init(client, device) {
|
|
|
|
+ _init(client, device, privateConnections) {
|
|
|
|
super._init({ styleClass: 'nm-dialog' });
|
2012-06-29 08:51:24 +00:00
|
|
|
|
2013-10-07 08:46:47 +00:00
|
|
|
this._client = client;
|
|
|
|
this._device = device;
|
2017-11-06 10:52:56 +00:00
|
|
|
+ this._privateConnections = privateConnections;
|
2012-06-29 08:51:24 +00:00
|
|
|
|
2022-03-21 08:37:00 +00:00
|
|
|
this._client.connectObject('notify::wireless-enabled',
|
|
|
|
this._syncView.bind(this), this);
|
|
|
|
@@ -978,6 +985,11 @@ class NMWirelessDialog extends ModalDial
|
|
|
|
this._getDeviceDBusPath(), accessPoints[0].get_path());
|
2013-10-07 08:46:47 +00:00
|
|
|
} else {
|
2018-03-09 10:05:57 +00:00
|
|
|
let connection = new NM.SimpleConnection();
|
2013-10-07 08:46:47 +00:00
|
|
|
+ if (this._privateConnections) {
|
2018-03-09 10:05:57 +00:00
|
|
|
+ let connectionSetting = new NM.SettingConnection();
|
2013-10-07 08:46:47 +00:00
|
|
|
+ connectionSetting.add_permission('user', GLib.get_user_name(), null);
|
|
|
|
+ connection.add_setting(connectionSetting);
|
|
|
|
+ }
|
2019-10-04 15:46:38 +00:00
|
|
|
this._client.add_and_activate_connection_async(connection, this._device, accessPoints[0].get_path(), null, null);
|
2013-10-07 08:46:47 +00:00
|
|
|
}
|
|
|
|
}
|
2022-03-21 08:37:00 +00:00
|
|
|
@@ -1243,9 +1255,10 @@ class NMWirelessDialog extends ModalDial
|
2019-10-04 15:46:38 +00:00
|
|
|
});
|
2018-10-23 05:48:40 +00:00
|
|
|
|
2019-04-18 13:50:39 +00:00
|
|
|
var NMDeviceWireless = class {
|
|
|
|
- constructor(client, device) {
|
|
|
|
+ constructor(client, device, privateConnections) {
|
2018-10-23 05:48:40 +00:00
|
|
|
this._client = client;
|
|
|
|
this._device = device;
|
|
|
|
+ this._privateConnections = privateConnections;
|
|
|
|
|
|
|
|
this._description = '';
|
|
|
|
|
2022-03-21 08:37:00 +00:00
|
|
|
@@ -1313,7 +1326,7 @@ var NMDeviceWireless = class {
|
2019-04-18 13:50:39 +00:00
|
|
|
}
|
2018-10-23 05:48:40 +00:00
|
|
|
|
|
|
|
_showDialog() {
|
|
|
|
- this._dialog = new NMWirelessDialog(this._client, this._device);
|
|
|
|
+ this._dialog = new NMWirelessDialog(this._client, this._device, this._privateConnections);
|
|
|
|
this._dialog.connect('closed', this._dialogClosed.bind(this));
|
|
|
|
this._dialog.open();
|
2019-04-18 13:50:39 +00:00
|
|
|
}
|
2022-03-21 08:37:00 +00:00
|
|
|
@@ -1683,6 +1696,20 @@ class Indicator extends PanelMenu.System
|
2020-10-26 08:15:38 +00:00
|
|
|
async _getClient() {
|
|
|
|
this._client = await NM.Client.new_async(null);
|
2019-10-04 15:46:38 +00:00
|
|
|
|
2021-09-27 06:24:32 +00:00
|
|
|
+
|
2018-10-23 05:48:40 +00:00
|
|
|
+ // Check if newly created connections should be private or not
|
|
|
|
+ this._privateConnections = true;
|
|
|
|
+ let authority = Polkit.Authority.get_sync(null);
|
|
|
|
+ let credential = new Gio.Credentials();
|
|
|
|
+ let subject = new Polkit.UnixProcess({ pid: credential.get_unix_pid(), uid: credential.get_unix_user() });
|
|
|
|
+ let authResult = authority.check_authorization_sync(subject,
|
|
|
|
+ 'org.freedesktop.NetworkManager.settings.modify.system',
|
|
|
|
+ null /* details */,
|
|
|
|
+ Polkit.CheckAuthorizationFlags.NONE,
|
|
|
|
+ null /* cancellable */);
|
|
|
|
+ if (authResult)
|
|
|
|
+ this._privateConnections = !authResult.get_is_authorized();
|
2021-09-27 06:24:32 +00:00
|
|
|
+
|
2019-10-04 15:46:38 +00:00
|
|
|
this._activeConnections = [];
|
|
|
|
this._connections = [];
|
2020-10-26 08:15:38 +00:00
|
|
|
this._connectivityQueue = [];
|
2022-03-21 08:37:00 +00:00
|
|
|
@@ -1812,7 +1839,7 @@ class Indicator extends PanelMenu.System
|
2018-10-23 05:48:40 +00:00
|
|
|
|
|
|
|
let wrapperClass = this._dtypes[device.get_device_type()];
|
|
|
|
if (wrapperClass) {
|
|
|
|
- let wrapper = new wrapperClass(this._client, device);
|
|
|
|
+ let wrapper = new wrapperClass(this._client, device, this._privateConnections);
|
|
|
|
device._delegate = wrapper;
|
|
|
|
this._addDeviceWrapper(wrapper);
|
2020-10-26 08:15:38 +00:00
|
|
|
|