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

pacrunner: merge branch 'bg/pacrunner-domains-bgo780558'

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=780558
(cherry picked from commit bac864725b)
This commit is contained in:
Beniamino Galvani 2017-04-11 10:37:25 +02:00
commit 12d16e8a89
4 changed files with 215 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/devices/nm-device.c
View file

@ -322,6 +322,7 @@ typedef struct _NMDevicePrivate {
/* Proxy Configuration */
NMProxyConfig *proxy_config;
NMPacrunnerManager *pacrunner_manager;
bool proxy_config_sent;
/* IP4 configuration info */
NMIP4Config * ip4_config; /* Combined config from VPN, settings, and device */
@ -8839,15 +8840,19 @@ reactivate_proxy_config (NMDevice *self)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
if (!priv->proxy_config_sent)
return;
nm_pacrunner_manager_remove (priv->pacrunner_manager,
nm_device_get_ip_iface (self));
nm_device_set_proxy_config (self, priv->dhcp4.pac_url);
nm_pacrunner_manager_send (priv->pacrunner_manager,
nm_device_get_ip_iface (self),
nm_device_get_ip_iface (self),
priv->proxy_config,
priv->ip4_config,
priv->ip6_config);
NULL,
NULL);
}
static gboolean
@ -12508,8 +12513,11 @@ _set_state_full (NMDevice *self,
}
}
/* Remove config from PacRunner */
nm_pacrunner_manager_remove (priv->pacrunner_manager, nm_device_get_ip_iface (self));
if (priv->proxy_config_sent) {
nm_pacrunner_manager_remove (priv->pacrunner_manager,
nm_device_get_ip_iface (self));
priv->proxy_config_sent = FALSE;
}
break;
case NM_DEVICE_STATE_DISCONNECTED:
if ( priv->queued_act_request
@ -12536,10 +12544,12 @@ _set_state_full (NMDevice *self,
if (priv->proxy_config) {
nm_pacrunner_manager_send (priv->pacrunner_manager,
nm_device_get_ip_iface (self),
nm_device_get_ip_iface (self),
priv->proxy_config,
priv->ip4_config,
priv->ip6_config);
NULL,
NULL);
priv->proxy_config_sent = TRUE;
}
break;
case NM_DEVICE_STATE_FAILED:

304
src/nm-pacrunner-manager.c
View file

@ -28,24 +28,28 @@
#include "nm-ip4-config.h"
#include "nm-ip6-config.h"
static void pacrunner_remove_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data);
#define PACRUNNER_DBUS_SERVICE "org.pacrunner"
#define PACRUNNER_DBUS_INTERFACE "org.pacrunner.Manager"
#define PACRUNNER_DBUS_PATH "/org/pacrunner/manager"
/*****************************************************************************/
struct remove_data {
char *iface;
typedef struct {
char *tag;
NMPacrunnerManager *manager;
GVariant *args;
char *path;
};
guint refcount;
bool removed;
} Config;
typedef struct {
char *iface;
GPtrArray *domains;
GDBusProxy *pacrunner;
GCancellable *pacrunner_cancellable;
GList *args;
GList *remove;
GList *configs;
} NMPacrunnerManagerPrivate;
struct _NMPacrunnerManager {
@ -68,23 +72,50 @@ NM_DEFINE_SINGLETON_GETTER (NMPacrunnerManager, nm_pacrunner_manager_get, NM_TYP
/*****************************************************************************/
#define _NMLOG_DOMAIN LOGD_PROXY
#define _NMLOG(level, ...) __NMLOG_DEFAULT_WITH_ADDR (level, _NMLOG_DOMAIN, "pacrunner", __VA_ARGS__)
#define _NMLOG(level, ...) __NMLOG_DEFAULT (level, _NMLOG_DOMAIN, "pacrunner", __VA_ARGS__)
/*****************************************************************************/
static void
remove_data_destroy (struct remove_data *data)
static Config *
config_new (NMPacrunnerManager *manager, char *tag, GVariant *args)
{
g_return_if_fail (data != NULL);
Config *config;
g_free (data->iface);
g_free (data->path);
memset (data, 0, sizeof (struct remove_data));
g_free (data);
config = g_slice_new0 (Config);
config->manager = manager;
config->tag = tag;
config->args = g_variant_ref_sink (args);
config->refcount = 1;
return config;
}
static void
add_proxy_config (NMPacrunnerManager *self, GVariantBuilder *proxy_data, const NMProxyConfig *proxy_config)
config_ref (Config *config)
{
g_assert (config);
g_assert (config->refcount > 0);
config->refcount++;
}
static void
config_unref (Config *config)
{
g_assert (config);
g_assert (config->refcount > 0);
if (config->refcount == 1) {
g_free (config->tag);
g_variant_unref (config->args);
g_free (config->path);
g_slice_free (Config, config);
} else
config->refcount--;
}
static void
add_proxy_config (GVariantBuilder *proxy_data, const NMProxyConfig *proxy_config)
{
const char *pac_url, *pac_script;
NMProxyConfigMethod method;
@ -113,19 +144,18 @@ add_proxy_config (NMPacrunnerManager *self, GVariantBuilder *proxy_data, const N
}
static void
add_ip4_config (NMPacrunnerManager *self, GVariantBuilder *proxy_data, NMIP4Config *ip4)
get_ip4_domains (GPtrArray *domains, NMIP4Config *ip4)
{
NMPacrunnerManagerPrivate *priv = NM_PACRUNNER_MANAGER_GET_PRIVATE (self);
char *cidr;
int i;
char *cidr = NULL;
/* Extract searches */
for (i = 0; i < nm_ip4_config_get_num_searches (ip4); i++)
g_ptr_array_add (priv->domains, g_strdup (nm_ip4_config_get_search (ip4, i)));
g_ptr_array_add (domains, g_strdup (nm_ip4_config_get_search (ip4, i)));
/* Extract domains */
for (i = 0; i < nm_ip4_config_get_num_domains (ip4); i++)
g_ptr_array_add (priv->domains, g_strdup (nm_ip4_config_get_domain (ip4, i)));
g_ptr_array_add (domains, g_strdup (nm_ip4_config_get_domain (ip4, i)));
/* Add addresses and routes in CIDR form */
for (i = 0; i < nm_ip4_config_get_num_addresses (ip4); i++) {
@ -134,8 +164,7 @@ add_ip4_config (NMPacrunnerManager *self, GVariantBuilder *proxy_data, NMIP4Conf
cidr = g_strdup_printf ("%s/%u",
nm_utils_inet4_ntop (address->address, NULL),
address->plen);
g_ptr_array_add (priv->domains, g_strdup (cidr));
g_free (cidr);
g_ptr_array_add (domains, cidr);
}
for (i = 0; i < nm_ip4_config_get_num_routes (ip4); i++) {
@ -144,25 +173,23 @@ add_ip4_config (NMPacrunnerManager *self, GVariantBuilder *proxy_data, NMIP4Conf
cidr = g_strdup_printf ("%s/%u",
nm_utils_inet4_ntop (routes->network, NULL),
routes->plen);
g_ptr_array_add (priv->domains, g_strdup (cidr));
g_free (cidr);
g_ptr_array_add (domains, cidr);
}
}
static void
add_ip6_config (NMPacrunnerManager *self, GVariantBuilder *proxy_data, NMIP6Config *ip6)
get_ip6_domains (GPtrArray *domains, NMIP6Config *ip6)
{
NMPacrunnerManagerPrivate *priv = NM_PACRUNNER_MANAGER_GET_PRIVATE (self);
char *cidr;
int i;
char *cidr = NULL;
/* Extract searches */
for (i = 0; i < nm_ip6_config_get_num_searches (ip6); i++)
g_ptr_array_add (priv->domains, g_strdup (nm_ip6_config_get_search (ip6, i)));
g_ptr_array_add (domains, g_strdup (nm_ip6_config_get_search (ip6, i)));
/* Extract domains */
for (i = 0; i < nm_ip6_config_get_num_domains (ip6); i++)
g_ptr_array_add (priv->domains, g_strdup (nm_ip6_config_get_domain (ip6, i)));
g_ptr_array_add (domains, g_strdup (nm_ip6_config_get_domain (ip6, i)));
/* Add addresses and routes in CIDR form */
for (i = 0; i < nm_ip6_config_get_num_addresses (ip6); i++) {
@ -171,8 +198,7 @@ add_ip6_config (NMPacrunnerManager *self, GVariantBuilder *proxy_data, NMIP6Conf
cidr = g_strdup_printf ("%s/%u",
nm_utils_inet6_ntop (&address->address, NULL),
address->plen);
g_ptr_array_add (priv->domains, g_strdup (cidr));
g_free (cidr);
g_ptr_array_add (domains, cidr);
}
for (i = 0; i < nm_ip6_config_get_num_routes (ip6); i++) {
@ -181,69 +207,76 @@ add_ip6_config (NMPacrunnerManager *self, GVariantBuilder *proxy_data, NMIP6Conf
cidr = g_strdup_printf ("%s/%u",
nm_utils_inet6_ntop (&routes->network, NULL),
routes->plen);
g_ptr_array_add (priv->domains, g_strdup (cidr));
g_free (cidr);
g_ptr_array_add (domains, cidr);
}
}
static void
pacrunner_send_done (GObject *source, GAsyncResult *res, gpointer user_data)
pacrunner_send_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data)
{
NMPacrunnerManager *self = NM_PACRUNNER_MANAGER (user_data);
NMPacrunnerManagerPrivate *priv = NM_PACRUNNER_MANAGER_GET_PRIVATE (self);
Config *config = user_data;
NMPacrunnerManager *self;
NMPacrunnerManagerPrivate *priv;
gs_free_error GError *error = NULL;
gs_unref_variant GVariant *variant = NULL;
const char *path = NULL;
GList *iter = NULL;
gboolean found = FALSE;
variant = g_dbus_proxy_call_finish (priv->pacrunner, res, &error);
g_return_if_fail (!config->path);
variant = g_dbus_proxy_call_finish (proxy, res, &error);
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
config_unref (config);
return;
}
self = NM_PACRUNNER_MANAGER (config->manager);
priv = NM_PACRUNNER_MANAGER_GET_PRIVATE (self);
if (!variant) {
_LOGD ("sending proxy config to pacrunner failed: %s", error->message);
_LOGD ("send config for '%s' failed: %s", config->tag, error->message);
} else {
struct remove_data *data;
g_variant_get (variant, "(&o)", &path);
/* Replace the old path (if any) of proxy config with the new one returned
* from CreateProxyConfiguration() DBus method on pacrunner.
*/
for (iter = g_list_first (priv->remove); iter; iter = g_list_next (iter)) {
struct remove_data *r = iter->data;
if (g_strcmp0 (priv->iface, r->iface) == 0) {
g_free (r->path);
r->path = g_strdup (path);
found = TRUE;
break;
}
}
config->path = g_strdup (path);
_LOGD ("successfully sent config for '%s'", config->tag);
if (!found) {
data = g_malloc0 (sizeof (struct remove_data));
data->iface = g_strdup (priv->iface);
data->path = g_strdup (path);
priv->remove = g_list_append (priv->remove, data);
_LOGD ("proxy config sent to pacrunner");
if (config->removed) {
g_dbus_proxy_call (priv->pacrunner,
"DestroyProxyConfiguration",
g_variant_new ("(o)", config->path),
G_DBUS_CALL_FLAGS_NO_AUTO_START,
-1,
priv->pacrunner_cancellable,
(GAsyncReadyCallback) pacrunner_remove_done,
config);
}
}
config_unref (config);
}
static void
send_pacrunner_proxy_data (NMPacrunnerManager *self, GVariant *pacrunner_manager_args)
pacrunner_send_config (NMPacrunnerManager *self, Config *config)
{
NMPacrunnerManagerPrivate *priv = NM_PACRUNNER_MANAGER_GET_PRIVATE (self);
if (!pacrunner_manager_args)
return;
if (priv->pacrunner) {
gs_free char *args_str = NULL;
_LOGT ("sending proxy config for '%s': %s", config->tag,
(args_str = g_variant_print (config->args, FALSE)));
config_ref (config);
g_clear_pointer (&config->path, g_free);
if (priv->pacrunner)
g_dbus_proxy_call (priv->pacrunner,
"CreateProxyConfiguration",
pacrunner_manager_args,
G_DBUS_CALL_FLAGS_NONE,
config->args,
G_DBUS_CALL_FLAGS_NO_AUTO_START,
-1,
NULL,
(GAsyncReadyCallback) pacrunner_send_done,
self);
priv->pacrunner_cancellable,
(GAsyncReadyCallback) pacrunner_send_done,
config);
}
}
static void
@ -258,12 +291,11 @@ name_owner_changed (GObject *object,
owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (object));
if (owner) {
_LOGD ("pacrunner appeared as %s", owner);
for (iter = g_list_first(priv->args); iter; iter = g_list_next(iter)) {
send_pacrunner_proxy_data (self, iter->data);
}
_LOGD ("name owner appeared (%s)", owner);
for (iter = g_list_first (priv->configs); iter; iter = g_list_next (iter))
pacrunner_send_config (self, iter->data);
} else {
_LOGD ("pacrunner disappeared");
_LOGD ("name owner disappeared");
}
}
@ -296,13 +328,15 @@ pacrunner_proxy_cb (GObject *source, GAsyncResult *res, gpointer user_data)
* nm_pacrunner_manager_send:
* @self: the #NMPacrunnerManager
* @iface: the iface for the connection or %NULL
* @tag: unique configuration identifier
* @proxy_config: proxy config of the connection
* @ip4_config: IP4 config of the connection
* @ip6_config: IP6 config of the connection
* @ip4_config: IP4 config of the connection to extract domain info from
* @ip6_config: IP6 config of the connection to extract domain info from
*/
void
nm_pacrunner_manager_send (NMPacrunnerManager *self,
const char *iface,
const char *tag,
NMProxyConfig *proxy_config,
NMIP4Config *ip4_config,
NMIP6Config *ip6_config)
@ -311,7 +345,8 @@ nm_pacrunner_manager_send (NMPacrunnerManager *self,
NMProxyConfigMethod method;
NMPacrunnerManagerPrivate *priv;
GVariantBuilder proxy_data;
GVariant *pacrunner_manager_args;
GPtrArray *domains;
Config *config;
g_return_if_fail (NM_IS_PACRUNNER_MANAGER (self));
g_return_if_fail (proxy_config);
@ -343,51 +378,62 @@ nm_pacrunner_manager_send (NMPacrunnerManager *self,
g_variant_new_string ("direct"));
}
priv->domains = g_ptr_array_new_with_free_func (g_free);
/* Extract stuff from configs */
add_proxy_config (self, &proxy_data, proxy_config);
add_proxy_config (&proxy_data, proxy_config);
if (ip4_config)
add_ip4_config (self, &proxy_data, ip4_config);
if (ip6_config)
add_ip6_config (self, &proxy_data, ip6_config);
if (ip4_config || ip6_config) {
domains = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (priv->domains, NULL);
strv = (char **) g_ptr_array_free (priv->domains, (priv->domains->len == 1));
if (ip4_config)
get_ip4_domains (domains, ip4_config);
if (ip6_config)
get_ip6_domains (domains, ip6_config);
if (strv) {
g_variant_builder_add (&proxy_data, "{sv}",
"Domains",
g_variant_new_strv ((const char *const *) strv, -1));
g_strfreev (strv);
g_ptr_array_add (domains, NULL);
strv = (char **) g_ptr_array_free (domains, (domains->len == 1));
if (strv) {
g_variant_builder_add (&proxy_data, "{sv}",
"Domains",
g_variant_new_strv ((const char *const *) strv, -1));
g_strfreev (strv);
}
}
pacrunner_manager_args = g_variant_ref_sink (g_variant_new ("(a{sv})", &proxy_data));
priv->args = g_list_append (priv->args, pacrunner_manager_args);
config = config_new (self, g_strdup (tag),
g_variant_new ("(a{sv})", &proxy_data));
priv->configs = g_list_append (priv->configs, config);
/* Send if pacrunner is available on Bus, otherwise
* argument has already been appended above to be
/* Send if pacrunner is available on bus, otherwise
* config has already been appended above to be
* sent when pacrunner appears.
*/
send_pacrunner_proxy_data (self, pacrunner_manager_args);
pacrunner_send_config (self, config);
}
static void
pacrunner_remove_done (GObject *source, GAsyncResult *res, gpointer user_data)
pacrunner_remove_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data)
{
/* @self may be a dangling pointer. However, we don't use it as the
* logging macro below does not dereference @self. */
NMPacrunnerManager *self = user_data;
Config *config = user_data;
NMPacrunnerManager *self;
gs_free_error GError *error = NULL;
gs_unref_variant GVariant *ret = NULL;
ret = g_dbus_proxy_call_finish ((GDBusProxy *) source, res, &error);
ret = g_dbus_proxy_call_finish (proxy, res, &error);
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
config_unref (config);
return;
}
self = NM_PACRUNNER_MANAGER (config->manager);
if (!ret)
_LOGD ("Couldn't remove proxy config from pacrunner: %s", error->message);
_LOGD ("couldn't remove config for '%s': %s", config->tag, error->message);
else
_LOGD ("Successfully removed proxy config from pacrunner");
_LOGD ("successfully removed config for '%s'", config->tag);
config_unref (config);
}
/**
@ -397,26 +443,45 @@ pacrunner_remove_done (GObject *source, GAsyncResult *res, gpointer user_data)
* from pacrunner
*/
void
nm_pacrunner_manager_remove (NMPacrunnerManager *self, const char *iface)
nm_pacrunner_manager_remove (NMPacrunnerManager *self, const char *tag)
{
NMPacrunnerManagerPrivate *priv = NM_PACRUNNER_MANAGER_GET_PRIVATE (self);
GList *list;
for (list = g_list_first(priv->remove); list; list = g_list_next(list)) {
struct remove_data *data = list->data;
if (g_strcmp0 (data->iface, iface) == 0) {
if (priv->pacrunner && data->path)
g_dbus_proxy_call (priv->pacrunner,
"DestroyProxyConfiguration",
g_variant_new ("(o)", data->path),
G_DBUS_CALL_FLAGS_NONE,
-1,
NULL,
(GAsyncReadyCallback) pacrunner_remove_done,
self);
break;
g_return_if_fail (tag);
_LOGT ("removing config for '%s'", tag);
for (list = g_list_first (priv->configs); list; list = g_list_next (list)) {
Config *config = list->data;
if (nm_streq (config->tag, tag)) {
if (priv->pacrunner) {
if (!config->path) {
/* send() failed or is still pending. Mark the item as
* removed, so that we ask pacrunner to drop it when the
* send() completes.
*/
config->removed = TRUE;
config_unref (config);
} else {
g_dbus_proxy_call (priv->pacrunner,
"DestroyProxyConfiguration",
g_variant_new ("(o)", config->path),
G_DBUS_CALL_FLAGS_NO_AUTO_START,
-1,
priv->pacrunner_cancellable,
(GAsyncReadyCallback) pacrunner_remove_done,
config);
}
} else
config_unref (config);
priv->configs = g_list_delete_link (priv->configs, list);
return;
}
}
/* bug, remove() should always match a previous send() for a given tag */
g_return_if_reached ();
}
/*****************************************************************************/
@ -445,16 +510,11 @@ dispose (GObject *object)
NMPacrunnerManagerPrivate *priv = NM_PACRUNNER_MANAGER_GET_PRIVATE ((NMPacrunnerManager *) object);
g_clear_pointer (&priv->iface, g_free);
nm_clear_g_cancellable (&priv->pacrunner_cancellable);
g_clear_object (&priv->pacrunner);
g_list_free_full (priv->args, (GDestroyNotify) g_variant_unref);
priv->args = NULL;
g_list_free_full (priv->remove, (GDestroyNotify) remove_data_destroy);
priv->remove = NULL;
g_list_free_full (priv->configs, (GDestroyNotify) config_unref);
priv->configs = NULL;
G_OBJECT_CLASS (nm_pacrunner_manager_parent_class)->dispose (object);
}

3
src/nm-pacrunner-manager.h
View file

@ -36,10 +36,11 @@ NMPacrunnerManager *nm_pacrunner_manager_get (void);
void nm_pacrunner_manager_send (NMPacrunnerManager *self,
const char *iface,
const char *tag,
NMProxyConfig *proxy_config,
NMIP4Config *ip4_config,
NMIP6Config *ip6_config);
void nm_pacrunner_manager_remove (NMPacrunnerManager *self, const char *iface);
void nm_pacrunner_manager_remove (NMPacrunnerManager *self, const char *tag);
#endif /* __NETWORKMANAGER_PACRUNNER_MANAGER_H__ */

20
src/vpn/nm-vpn-connection.c
View file

@ -127,6 +127,7 @@ typedef struct {
GVariant *connect_hash;
guint connect_timeout;
NMProxyConfig *proxy_config;
gboolean proxy_config_sent;
gboolean has_ip4;
NMIP4Config *ip4_config;
guint32 ip4_internal_gw;
@ -481,6 +482,7 @@ _set_vpn_state (NMVpnConnection *self,
VpnState old_vpn_state;
NMVpnConnectionState new_external_state, old_external_state;
NMDevice *parent_dev = nm_active_connection_get_device (NM_ACTIVE_CONNECTION (self));
NMConnection *applied;
g_return_if_fail (NM_IS_VPN_CONNECTION (self));
@ -552,13 +554,15 @@ _set_vpn_state (NMVpnConnection *self,
}
break;
case STATE_ACTIVATED:
applied = _get_applied_connection (self);
/* Secrets no longer needed now that we're connected */
nm_active_connection_clear_secrets (NM_ACTIVE_CONNECTION (self));
/* Let dispatcher scripts know we're up and running */
nm_dispatcher_call_vpn (NM_DISPATCHER_ACTION_VPN_UP,
_get_settings_connection (self, FALSE),
_get_applied_connection (self),
applied,
parent_dev,
priv->ip_iface,
priv->proxy_config,
@ -571,16 +575,19 @@ _set_vpn_state (NMVpnConnection *self,
if (priv->proxy_config) {
nm_pacrunner_manager_send (nm_pacrunner_manager_get (),
priv->ip_iface,
nm_connection_get_uuid (applied),
priv->proxy_config,
priv->ip4_config,
priv->ip6_config);
priv->proxy_config_sent = TRUE;
}
break;
case STATE_DEACTIVATING:
applied = _get_applied_connection (self);
if (quitting) {
nm_dispatcher_call_vpn_sync (NM_DISPATCHER_ACTION_VPN_PRE_DOWN,
_get_settings_connection (self, FALSE),
_get_applied_connection (self),
applied,
parent_dev,
priv->ip_iface,
priv->proxy_config,
@ -589,7 +596,7 @@ _set_vpn_state (NMVpnConnection *self,
} else {
if (!nm_dispatcher_call_vpn (NM_DISPATCHER_ACTION_VPN_PRE_DOWN,
_get_settings_connection (self, FALSE),
_get_applied_connection (self),
applied,
parent_dev,
priv->ip_iface,
priv->proxy_config,
@ -603,8 +610,11 @@ _set_vpn_state (NMVpnConnection *self,
}
}
/* Remove config from PacRunner */
nm_pacrunner_manager_remove (nm_pacrunner_manager_get(), priv->ip_iface);
if (priv->proxy_config_sent) {
nm_pacrunner_manager_remove (nm_pacrunner_manager_get(),
nm_connection_get_uuid (applied));
priv->proxy_config_sent = FALSE;
}
break;
case STATE_FAILED:
case STATE_DISCONNECTED: