Commit graph

9998 commits

Author SHA1 Message Date
Thomas Haller
2af8036b58 core/trivial: unify names of internal NMSettingsConnectionCallId as "call_id"
(cherry picked from commit 4e11be5ecf)
2017-11-27 15:59:58 +01:00
Thomas Haller
adca290d31 core: drop internal typedef GetSecretsInfo for NMSettingsConnectionCallId
Using an internal alias for the type is just confusing. Drop it.

(cherry picked from commit fc918049de)
2017-11-27 15:59:58 +01:00
Thomas Haller
2addde633c core: refactor NMSettingsConnectionCallId typedef not to be a pointer to struct
Typedefs to structs are fine, but a typedef for a pointer seems confusing to
me. Let's avoid it.

(cherry picked from commit 616976d6a8)
2017-11-27 15:59:58 +01:00
Thomas Haller
06ac0b6d96 core/vpn: mark secret hints as const
(cherry picked from commit f76dbfc1a6)
2017-11-27 15:59:39 +01:00
Thomas Haller
f000c76be4 core: replace "dup()" by "fcntl(fd, F_DUPFD_CLOEXEC, 0)"
(cherry picked from commit 1e572ebf87)
2017-11-27 14:03:51 +01:00
Beniamino Galvani
a792a7f9c3 ifcfg-rh: close file descriptor only when necessary
If the file was read-only, we already closed it.

This fixes the following valgrind warnings:

 Warning: invalid file descriptor -1 in syscall close()

(cherry picked from commit 174da8f922)
2017-11-27 10:19:29 +01:00
Francesco Giudici
9c634e13c3 device: update device mtu from ip interface when required
If the tracked device is a control device only (has no network interface)
like in the case of a cdc-wdm device, get the mtu from the ip interface
(the exposed wwan network interface in this case).

https://bugzilla.redhat.com/show_bug.cgi?id=1460217
(cherry picked from commit efed5254cd)
2017-11-24 17:38:14 +01:00
Thomas Haller
a6b388d7d5 device: only set ip_forward sysctl if necessary
/proc/sys might be read-only but we want to set it for
enabling shared mode.

Check first if the sysctl already has the expected value,
and if so, do nothing.

https://bugzilla.gnome.org/show_bug.cgi?id=790726
(cherry picked from commit d841930d67)
2017-11-24 17:13:45 +01:00
Thomas Haller
26ca80ebf5 device: return and log failure reason for start_sharing()
Also downgrade a few intermediate error logging messages
for failures that happen while start_sharing(). A debug
message is enough in this case, because we propagate now
the error to the caller, which logs a warning anyway.

(cherry picked from commit 3369a2c0b0)
2017-11-24 17:13:45 +01:00
Thomas Haller
1725c7136f platform: preserve errno in nm_platform_sysctl_get_int_checked()
It's not clear whether free() changes errno. Be sure about it.

https://bugzilla.gnome.org/show_bug.cgi?id=790726
(cherry picked from commit 653aab70ac)
2017-11-24 17:13:45 +01:00
Thomas Haller
d586bc0304 core: use CList to track NMActRequestGetSecretsCallId in NMActRequest
Gives O(1) insert and remove. Also saves the overhead of the GSlice
allocation for the GSList node.

(cherry picked from commit a3569eddf2)
2017-11-24 17:05:03 +01:00
Thomas Haller
2776fe6cb4 core/trivial: unify names of internal NMActRequestGetSecretsCallId as "call_id"
(cherry picked from commit 1cbbefcddd)
2017-11-24 17:05:03 +01:00
Thomas Haller
4a7fa0c4c4 core: drop internal typedef Result for NMSecretAgentCallId
Using an internal alias for the type is just confusing. Drop it.

(cherry picked from commit 966ac03668)
2017-11-24 17:05:03 +01:00
Thomas Haller
b652f492a1 core: drop internal typedef GetSecretsInfo for NMSecretAgentCallId
Using an internal alias for the type is just confusing. Drop it.

(cherry picked from commit 370dc8883f)
2017-11-24 17:05:03 +01:00
Thomas Haller
26905105bf core: refactor NMActRequestGetSecretsCallId typedef not to be a pointer to struct
Typedefs to structs are fine, but a typedef for a pointer seems confusing to
me. Let's avoid it.

(cherry picked from commit e5e291b65f)
2017-11-24 17:05:03 +01:00
Thomas Haller
f842831059 core: refactor NMSecretAgentCallId typedef not to be a pointer to struct
Typedefs to structs are fine, but a typedef for a pointer seems confusing to
me. Let's avoid it.

(cherry picked from commit 6cb40da2f0)
2017-11-24 17:05:03 +01:00
Thomas Haller
539a2835b2 ifcfg-rh: check integer value for other bridge options
(cherry picked from commit b074fd23b4)
2017-11-24 08:29:27 +01:00
Thomas Haller
c42913f5b1 ifcfg-rh: check integer value when reading handle_bridge_option()
We cannot just call g_object_set() with an integer that is out of bound.
Otherwise, glib will warn. We can use nm_g_object_set_property*() to return
an error without asserting.

(cherry picked from commit ff239c1652)
2017-11-24 08:29:24 +01:00
Thomas Haller
3d6d54676d ifcfg-rh: fix range and size when parsing integer values in reader
(cherry picked from commit 30ce598fb5)
2017-11-24 08:29:21 +01:00
Thomas Haller
0219368a77 ifcfg-rh/trivial: rename get_uint() to get_uint32()
(cherry picked from commit 12788db4ee)
2017-11-24 08:29:19 +01:00
Thomas Haller
f147f490dd ifcfg-rh: avoid string copies in make_bridge_setting()
Also, don't g_strstrip(value) for BRIDGE_MACADDR.

(cherry picked from commit 3a67b496ca)
2017-11-24 08:29:18 +01:00
Beniamino Galvani
1d5f060098 ifcfg-rh: use distinct variables for bridge and wired mac address
Currently both bridge.mac-address and ethernet.cloned-mac-address get
written to the same MACADDR ifcfg-rh variable; the ethernet property
wins if both are present.

When one property is set and the connection is saved (and thus reread)
both properties are populated with the same value. This is wrong
because, even if the properties have the same meaning, the setting
plugin should not read something different from what was written. Also
consider that after the following steps:

 $ nmcli con mod c ethernet.cloned-mac-address 00:11:22:33:44:55
 $ nmcli con mod c ethernet.cloned-mac-address ""

the connection will still have the new mac address set in the
bridge.mac-address property, which is certainly unexpected.

In general, mapping multiple properties to the same variable is
harmful and must be avoided. Therefore, let's use a different variable
for bridge.mac-address. This changes behavior, but not so much:

 - connections that have MACADDR set will behave as before; the only
   difference will be that the MAC will be present in the wired
   setting instead of the bridge one;

 - initscripts compatibility is not relevant because MACADDR for
   bridges was a NM extension;

 - if someone creates a new connection and sets bridge.mac-address NM
   will set the BRIDGE_MACADDR property instead of MACADDR. But this
   shouldn't be a big concern as bridge.mac-address is documented as
   deprecated and should not be used for new connections.

https://bugzilla.redhat.com/show_bug.cgi?id=1516659
(cherry picked from commit fb191fc282)
2017-11-24 08:28:47 +01:00
Beniamino Galvani
3a623c2d1f ifcfg-rh: read wired properties for bridge connections
A bridge connection can have ethernet settings, read them from the
ifcfg file.

(cherry picked from commit 56a02c9baf)
2017-11-24 08:28:43 +01:00
Thomas Haller
628d292be7 ifcfg-rh: avoid duplicate lookup of bond-option in write_bond_setting()
Now that nm_setting_bond_get_option() has a stable order
(alphabetically), we no longer need to sort it.

(cherry picked from commit 6b319cd072)
2017-11-21 14:15:26 +01:00
Thomas Haller
fae12cf956 ifcfg-rh/tests: test writing multiple bond options
(cherry picked from commit 7328976a02)
2017-11-21 14:14:25 +01:00
Beniamino Galvani
0bd8b34725 settings: preserve agent-owned secrets on connection add
Settings plugins now return the connection that was reread from file
when adding a connection, which means that any agent-owned secret is
lost. Ensure that we don't forget agent-owned secrets by caching them
and readding them to the new connection returned by plugins.

Fixes: 8a1d483ca8
Fixes: b4594af55e

https://bugzilla.gnome.org/show_bug.cgi?id=789383
(cherry picked from commit 62141d59cb)
2017-11-21 13:37:53 +01:00
Beniamino Galvani
7225fdc5ae ifcfg-rh: sort bond options when writing a connection
Bond options are stored in a hash table and the order in which they
are returned by the API is not guaranteed. Sort them alphabetically so
that a connection will always be written in the same way, even if the
internal implementation of the hash table or the hashing function
changes, as it did in commit a6be2f4aa9 ("all: use nm_str_hash()
instead of g_str_hash()").

(cherry picked from commit 9a631a068e)
2017-11-21 11:29:32 +01:00
Beniamino Galvani
de66655f0a device: check captured IPv6 configuration in check_and_add_ipv6ll_addr()
check_and_add_ipv6ll_addr() checks whether a link-local address is
already present in priv->ip6_config and if so, it returns with no
action.

priv->ip6_config is only updated after a merge-and-apply or (in an
idle source) when the external configuration changes and so there is
no guarantee that the addresses there are up-to-date.

priv->ext_ip6_config_captured should be checked instead, because it is
updated from platform right before starting the generation of a
link-local address. Note that also linklocal6_start() already checks
the captured external configuration rather than priv->ip6_config.

https://bugzilla.redhat.com/show_bug.cgi?id=1500350
(cherry picked from commit a7c97d58db)
2017-11-20 10:53:41 +01:00
Thomas Haller
cd30bc1246 dns: don't stat relative paths when detecting resolved use
NetworkManager daemon has no defined working directory.
It makes no sense to ever open or stat relative paths.
Just skip them.

https://bugzilla.gnome.org/show_bug.cgi?id=790446
(cherry picked from commit 25267f9d27)
2017-11-19 14:33:27 +01:00
Dimitri John Ledkov
4d77df7751 dns: check for relative paths and stub-resolve.conf when detecting systemd-resolved
Fix resolved detection, the symlink target is usually relative to the
root, such that in chroots the file points to a file inside the
chroot. But keep absolute targets too, as these may have been in use
with older version of systemd. Add support for stub-resolv.conf
detection.

https://bugzilla.gnome.org/show_bug.cgi?id=790446
(cherry picked from commit e09503dcc4)
2017-11-19 14:33:26 +01:00
Beniamino Galvani
a2e0c92901 device: don't touch external devices
If a device is 'external' (which means that NM generated an in-memory
connection to only to track the device state) we should not change its
IP configuration.

https://bugzilla.redhat.com/show_bug.cgi?id=1512316
(cherry picked from commit 60334a2893)
2017-11-17 18:22:37 +01:00
Beniamino Galvani
c516dca0d5 device: start managing external devices on reapply
In the next commit we will modify ipX_config_merge_and_apply to never
touch external devices. When a "reapply" call is issued on an external
device we are no longer simply tracking its state but we are actively
managing it and so its sys-iface-state must be promoted to managed.

https://bugzilla.redhat.com/show_bug.cgi?id=1512316
(cherry picked from commit 9e41ed4461)
2017-11-17 18:22:35 +01:00
Thomas Haller
3a8a9941df core/vpn: log capabilities of secret-agent
(cherry picked from commit 96d5d66460)
2017-11-17 17:14:51 +01:00
Beniamino Galvani
ba630b828b core: don't reset existing routes when merging IP setting
Don't reset existing routes if ipvx.ignore-auto-routes=yes: callers
should already avoid adding them when not needed.

Previously we would also reset the manual gateway route just added.

Fixes: 5c299454b4

https://bugzilla.gnome.org/show_bug.cgi?id=790423
(cherry picked from commit a0cd75b20c)
2017-11-17 13:44:47 +01:00
Beniamino Galvani
c7accc92d5 vpn: avoid adding unneeded routes when ipvx.ignore-auto-routes=yes
Instead of adding routes and then let nm_ipx_config_merge_setting()
remove them, don't add them in the first place when
ipvx.ignore-auto-routes=yes.

(cherry picked from commit 8f677a7772)
2017-11-17 13:44:46 +01:00
Thomas Haller
c449d9fe07 platform/tests: skip netns tests if we fail to create a new NMPNetns instance
nmp_netns_new () might fail with:
  netns: failed mount --make-rslave: Invalid argument

Skip the test in that case.

https://bugzilla.gnome.org/show_bug.cgi?id=790214
(cherry picked from commit b20384fac7)
2017-11-17 12:38:26 +01:00
Thomas Haller
f4cd75d422 platform: preserve errno when creating netns fails
(cherry picked from commit 7a98ee78be)
2017-11-17 12:38:25 +01:00
Thomas Haller
9464fa0963 vpn: avoid coverity warning in print_vpn_config()
coverity thinks that @address4 might be NULL. Maybe it can. We
have an nm_assert(), but to be sure, check the value.

(cherry picked from commit 6df212ccb1)
2017-11-15 18:32:02 +01:00
Thomas Haller
2dcf08402c ifcfg-rh: avoid coverity false positive in write_secrets()
Comparing @secrets_keys indicates to coverity that it might be NULL.
Below, we access @secrets_keys without check, and coverity doesn't realize
that this cannot crash, because secrets_keys_n would be zero too.

Anyway, this way we safe the sorting, in case we only have
one element.

(cherry picked from commit cfdb962ebd)
2017-11-15 18:19:54 +01:00
Thomas Haller
39002a4e3c platform: fix double closing netlink socket
The file descriptor is owned by the netlink socket instance,
which we close in finalize. We most not close it when destroying
the IO channel, otherwise the file descriptor gets closed twice.

Closing an invalid file descriptor (or a descriptor that is already closed)
is a serious bug, because the integer values are re-used, so there is a race
that the close might affect an innocent file descriptor instead of just
failing with EBADF.

(cherry picked from commit 79482c9a9e)
2017-11-14 15:17:03 +01:00
Thomas Haller
fc2894508e all: use nm_close() instead of close()
(cherry picked from commit 5b29c2e5b9)
2017-11-14 15:17:02 +01:00
Beniamino Galvani
8db2120979 core: allow slaves to autoactivate when master is available
When a master connection is deactivated by user, we set the
autoconnect-blocked reason 'user-request' for the connection and we
propagate the same reason to slaves. Doing so prevents the
autoactivation of slaves when the master is manually activated again,
because the only way to override the 'user-request' blocked reason is
through manual activation of slaves.

Instead what should happen is that the manual deactivation of a master
marks slaves as blocked for failed dependencies. When the master
becomes available again, slaves can autoactivate if the profile allows
it.

https://bugzilla.redhat.com/show_bug.cgi?id=1437598
(cherry picked from commit b31118cfd2)
2017-11-13 20:34:23 +01:00
Beniamino Galvani
200e714885 device: make nm_device_state_reason_to_str() public
(cherry picked from commit dcd7760eae)
2017-11-13 20:34:22 +01:00
Thomas Haller
648c580902 platform/tests: add test for onlink route attribute
(cherry picked from commit cb47ed0fcd)
2017-11-13 14:43:08 +01:00
Thomas Haller
4b890dead5 all: support route-attribute "onlink" for IPv4
Kernel doesn't support it for IPv6.

This is especially useful, if you combine static routes
with DHCP. In that case, you might want to get the device-route
to the gateway automatically, but add a static-route for it.

(cherry picked from commit 0ed49717ab)
2017-11-13 14:43:07 +01:00
Thomas Haller
b4c2219951 platform: consider RTNH_F_ONLINK onlink flag for IPv4 routes
The "onlink" flag for IPv4 routes is part of the route ID.
Consider it in nm_platform_ip4_route_cmp().

Also, allow configuring the flag when adding a route.

Note that for IPv6, the onlink flag is still ignored.
Pretty much like kernel does.

(cherry picked from commit 88a40f960c)
2017-11-13 14:43:07 +01:00
Thomas Haller
675bae5642 platform: track all rtm_flags for routes
(cherry picked from commit 81778f59f2)
2017-11-13 14:43:07 +01:00
Thomas Haller
f0bcf533f5 core: merge IPv4 and IPv6 version of _nm_ip_config_merge_route_attributes()
(cherry picked from commit 433d2f8659)
2017-11-13 14:43:07 +01:00
Thomas Haller
b3d3227c44 platform: add generic NM_PLATFORM_IP_ROUTE_CAST() macro
A cast macro, that does some static type checking (of the pointer).

(cherry picked from commit 8948dbe117)
2017-11-13 14:43:07 +01:00
Thomas Haller
6adeb5eb29 core: use NM_CONSTCAST() for NM_IP_CONFIG_CAST()
(cherry picked from commit d5c9c95e96)
2017-11-13 14:43:07 +01:00