summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* all: avoid "==" bashism in scriptsth/build-fixes-cloud-setupThomas Haller2023-05-156-8/+8
|
* build/meson: enable -Dnm_cloud_setup=true by defaultThomas Haller2023-05-151-1/+1
| | | | | | | That is also what autotools does. Keep the behvior in sync. Also, "contrib/scripts/nm-ci-run.sh" does not explicitly enable nm-cloud-setup, so we ended up not building it in test. This solves that, by enabling it by default.
* build/autotools: avoid checking twice for libcurlThomas Haller2023-05-151-1/+4
| | | | | We check once conditionally for enable_concheck, and once for with_nm_cloud_setup. Don't do it twice.
* build: don't mark nm-cloud-setup as EXPERIMENTAL in build scriptThomas Haller2023-05-152-2/+2
|
* nm-in-container: run with "--no-hosts" to have a plain /etc/hosts in the ↵Thomas Haller2023-05-151-0/+1
| | | | | | | container The bind mount interferes with running certain CI tests that want to change /etc/hosts.
* ipv6ll: don't regenerate the address when it's removed externallybg/ipv6ll-removedBeniamino Galvani2023-05-151-11/+19
| | | | | | | | | | | | | | | | | | Currently if the IPv6 link-local address is removed after it passed DAD, NetworkManager tries to generate a new link-local address. If this fails, which is always the case for EUI64, ipv6ll is considered as failed and the connection can go down (depending on may-fail). This is particularly bad for virtual interfaces because if somebody removes the link-local address, the activation can fail and destroy the interface, breaking all services that require it. Also, it's a change in behavior introduced in 1.36.0. It seems that a better approach here is to re-add the address that was removed externally. Fixes: aa070fb82190 ('core: add NML3IPv6LL helper') https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1622
* merge: branch 'bg/wake-assume-rh2193422'Beniamino Galvani2023-05-153-3/+39
|\ | | | | | | | | https://bugzilla.redhat.com/show_bug.cgi?id=2193422 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1624
| * manager: use the right reason for managing devices after wake/reenablebg/wake-assume-rh2193422Beniamino Galvani2023-05-151-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When managing the interface after wake/reenable, the reason determines whether the device will be sys-iface-state=managed or external. Commit 5a9a7623c5a4 ('core: set STATE_REASON_CONNECTION_ASSUMED when waking up') changed the reason from 'now-managed' to 'connection-assumed'; the effect was that devices that were fully managed before sleeping become external after a wake up. For example: $ nmcli connection add type ethernet ifname enp1s0 Connection 'ethernet-enp1s0' (47fcd81e-bf00-4c02-b25b-354894f5657e) successfully added. $ nmcli device | grep enp1s0 enp1s0 ethernet connected ethernet-enp1s0 $ nmcli networking off $ nmcli device | grep enp1s0 enp1s0 ethernet unmanaged -- $ nmcli networking on $ nmcli device | grep enp1s0 enp1s0 ethernet unavailable -- Set the correct reason during wake up so that the previous state is restored. Fixes: 5a9a7623c5a4 ('core: set STATE_REASON_CONNECTION_ASSUMED when waking up') https://bugzilla.redhat.com/show_bug.cgi?id=2193422
| * device: add functions to get and set sys-iface-state before sleepBeniamino Galvani2023-05-152-1/+27
|/
* clients: merge branch 'th/client-secrets-cleanup'Thomas Haller2023-05-122-21/+14
|\ | | | | | | https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1630
| * libnmc: fix openconnect option "--cafile" in ↵th/client-secrets-cleanupThomas Haller2023-05-121-1/+1
| | | | | | | | | | | | nm_vpn_openconnect_authenticate_helper() Fixes: 97f2a368f154 ('libnmc-base: add supported options for OpenConnect CLI authentication')
| * libnmc: drop redundant defines for array lengthsThomas Haller2023-05-121-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use G_N_ELEMENTS() macro instead of having separate defines. The separate defines mean that when we check g_return_val_if_fail(oc_argc <= OC_ARGS_MAX, FALSE) that we must double check that OC_ARGS_MAX is really the size of the array that we want to check. - replace g_return_val_if_fail() with nm_assert(). In this case, it should be very clear by review that the buffer is indeed large enough and the assertion holds. Use nm_assert(). - use unsigned integer for the loop variables. While int theoretically might exploit undefined behavior of signed overflow, we should instead use unsigned at places where it's appropriate (for example, those variables are compared against G_N_ELEMENTS() which gives a size_t type. - declare auto variables on separate lines. - make the global variable oc_property_args static and const. The const means the linker will put it into read-only memory, so we would get a crash on accidental modification.
| * tui: cleanup secrets_requested() function to use cleanup attributeThomas Haller2023-05-121-11/+5
|/ | | | | No explicit unref/free. Resources should be owned by somebody, like an auto variable with a cleanup attribute.
* cloud-setup: merge branch 'lr/more-cloud-setup-tests'Thomas Haller2023-05-128-49/+477
|\ | | | | | | https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1606
| * test/cloud-meta-mock: mock GCP metadata APILubomir Rintel2023-05-121-0/+11
| | | | | | | | Not used for testing, but still might be useful for development.
| * test/cloud-meta-mock: mock azure metadata APILubomir Rintel2023-05-121-0/+16
| | | | | | | | Not used for testing, but still might be useful for development.
| * test/cloud-meta-mock: mock aliyun metadata APILubomir Rintel2023-05-121-0/+15
| | | | | | | | Not used for testing, but still might be useful for development.
| * test/client: test cloud-setup GCP supportLubomir Rintel2023-05-121-0/+61
| |
| * cloud-setup/gcp: add ability to redirect metadata API requestsLubomir Rintel2023-05-121-7/+31
| | | | | | | | | | A different host can be specified with (undocumented, private) NM_CLOUD_SETUP_GCP_HOST environment variable.
| * test/client: test cloud-setup azure supportLubomir Rintel2023-05-121-0/+86
| |
| * cloud-setup/azure: add ability to redirect metadata API requestsLubomir Rintel2023-05-121-1/+23
| | | | | | | | | | A different host can be specified with (undocumented, private) NM_CLOUD_SETUP_AZURE_HOST environment variable.
| * test/client: test cloud-setup aliyun supportLubomir Rintel2023-05-121-0/+90
| |
| * test-client: use a test fixture from the testLubomir Rintel2023-05-121-2/+41
| | | | | | | | | | | | | | | | Don't rely on resources provided by mock metadata server by default, create the from within the test instead. This allows for more flexibility, but the locality of the test fixture relative to the tests makes the test more legible.
| * test/cloud-meta-mock: allow putting the resourcesLubomir Rintel2023-05-121-16/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | This reworks the cloud metadata mock server in a significant way. Most importantly this makes it possible for the client to add and modify the resources for later retrieval using the PUT method. This allows the test to create the fixture for itself. The default set of resources is still provided, so that the too remains useful as a development aid. If that is not desirable, the --empty parameter might be passed to cause the server to start with no resources.
| * test-client: factor out the test device setupLubomir Rintel2023-05-121-3/+1
| | | | | | | | We're going to reuse the setup for tests of other cloud providers.
| * test-client: hardcode the cloud-setup mac addressesLubomir Rintel2023-05-121-2/+2
| | | | | | | | | | We rely on the predictable but random MAC addresses. Hardcode them instead -- the mock service also hardcodes them.
| * test: fix file description passing to cloud-setup mock serviceLubomir Rintel2023-05-121-1/+1
| | | | | | | | The pass_fds file descriptor is *after* the dup2. Always 3.
| * Revert "client/tests: don't do dup2() dance to pass file descriptor to ↵Lubomir Rintel2023-05-122-3/+9
| | | | | | | | | | | | | | | | | | "tools/test-cloud-meta-mock.py"" This changed the fd passing protocol making it not compatible with systemd-socket-activate(1). This reverts commit 342ee618c75b350cf5cccf49f2bade85c5dfa3ea.
| * test-client: cleanup after test on failureThomas Haller2023-05-121-1/+9
| | | | | | | | Otherwise, the following tests will fail too.
| * test-client: increase context in pexecpt failure for debuggingThomas Haller2023-05-121-0/+2
| | | | | | | | | | | | When a pexpect check fails, we want to see the full content of the buffer, so we can better see where it went wrong. Increase the context that is printed in the error message.
| * cloud-init: fix leaking iproutes for GCP providerThomas Haller2023-05-124-13/+14
| | | | | | | | | | | | | | The routes in iproutes were leaked (and ownership stolen in _nmc_mangle_connection(), leaving dangling pointers). Fix that by using a GPtrArray instead.
| * libnm-core: add internal _nm_ip_route_ref() helperThomas Haller2023-05-121-0/+7
|/ | | | | For some reason, nm_ip_route_ref() does not return the referenced instance, making it cumbersome to use. Add a helper.
* cli,tui: merge branch 'dwmw2:openconnect-cli'Thomas Haller2023-05-114-152/+260
|\ | | | | | | https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1625
| * libnmc-base: fix port extraction for openconnect authDavid Woodhouse2023-05-111-3/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With old versions of openconnect we need to extract the port# from the initial URL and then append it to the hostname we eventually get back. Using strrchr(gw, ':') isn't going to work right with IPv6 literals, ad we should also be dropping any path element. So switch to using an int for the port instead of a string, and import a cut-down variant of openconnect's internal_parse_url() which does *largely* the same thing with strrchr() but is saved by using the 'end' value returned from strtol() and insisting that the port is the very end of the host part of the URL.
| * libnmc-base: report explicit error if not gateway configured for openconnectDavid Woodhouse2023-05-111-2/+10
| | | | | | | | | | | | Rather than letting openconnect run, and whine that there's no gateway, and making the user scroll up past the openconnect usage information, give them an explicit error.
| * nmtui: do not prompt for secrets if openconnect already provided themDavid Woodhouse2023-05-111-38/+25
| | | | | | | | | | | | While we're at it, kill the separate openconnect_authenticate() function since it barely does anything any more and it wants visibility to both 's_vpn' and 'success' variables in the caller.
| * nmcli, nmtui: reduce duplication around openconnect auth helperDavid Woodhouse2023-05-114-133/+69
| | | | | | | | | | | | | | Pull a bunch of stuff into nm_vpn_openconnect_authenticate_helper() that both callers were doing for themselves, and make its API a bit simpler. It's given the NMSettingVpn and the GPtrArray of secrets, and it simply succeeds or fails.
| * libnmc-base: add supported options for OpenConnect CLI authenticationDavid Woodhouse2023-05-111-5/+85
| | | | | | | | | | | | | | | | | | | | Ideally, we wouldn't have this hard-coded in NetworkManager itself; we would invoke a tool to do it for us, like the GUI auth-dialog, which can live in the NetworkManager-openconnect repository and be kept up to date as new options are added. To start with though, let's bring it into sync. We don't add new options that often, and this will cover the majority of use cases.
| * nmcli, nmtui: update authentication for OpenConnectDavid Woodhouse2023-05-114-43/+99
|/ | | | | | | | | | | | | | | | Since OpenConnect 8.20, 'openconnect --authenticate' will return the full gateway URL, including the hostname and the path. This allows servers behind SNI-based proxies to work. To ensure we end up at the same IP address even behind round-robin DNS, there is a separate --resolve argument. Update nmcli/nmtui to use this, as NetworkManager-openconnect does. Shift some of the logic into the nm_vpn_openconnect_authenticate_helper() function instead of duplicating it in the callers. Also, pass the correct protocol in rather than only supporting Cisco AnyConnect.
* po: fix mistranslation in Turkish (tr)Sabri Unal2023-05-111-1/+1
| | | | https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1626
* bond: merge branch 'th/slb-bond-no-counters'Thomas Haller2023-05-107-30/+223
|\ | | | | | | https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1623
| * core/tests: add test for nm_firewall_nft_stdio_mlag()Thomas Haller2023-05-101-0/+122
| | | | | | | | | | If only to hit some of the code paths in our test, and to have valgrind check (some of) the code paths.
| * bond: don't configure "counter" on nft rules for slb-bonding/mlagThomas Haller2023-05-103-20/+34
| | | | | | | | | | Counters are convenient for debugging, but have a performance overhead. Configure them only when debug logging in NetworkManager is enabled.
| * glib-aux: add nmtst_assert_cmpmem() helperThomas Haller2023-05-101-0/+48
| | | | | | | | | | | | | | | | | | | | g_assert_cmpmem() exists, but it does not print the actual buffer content on test failure. It is useful to see what actually failed in the test output. Also, nmtst_assert_cmpmem() prints a backslash escaped output, that you can unescape in the terminal with `echo -e`. You can also directly copy and paste the output to C source code.
| * glib-aux: add NM_UTILS_STR_UTF8_SAFE_FLAG_ESCAPE_DOUBLE_QUOTE flag to escape ↵Thomas Haller2023-05-102-10/+19
|/ | | | | | | | double quotes This is useful when printing a string for debugging. Then we can printf("v=\"%s\"", utf8safe_escaped_text), which can be safely unescaped with `echo -e`.
* glib-aux: use GModule instead of dlopen() in _inet_aton()Thomas Haller2023-05-101-8/+8
| | | | | | | | | | Using dlopen() requires us to link with libdl (at least with some libc). That is cumbersome and was not done by all users of libnm-glib-aux, thereby causing a linker error. The code path is only used via nm_assert(). Use GModule instead. Fixes: a23af8f76469 ('glib-aux: avoid using inet_aton()')
* device: don't reset "net.ipv6.conf.$IFACE.forwarding"Thomas Haller2023-05-091-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to systemd, IPv6 forwarding is special anyway, and they only enable forwarding for "net.ipv6.conf.all.forwarding" ([1]). Since commit 46e63e03af58 ('device: announce the managed IPv6 configuration with ipv6.method=shared') we support "ipv6.method=shared" and enable forwarding for IPv6, on the interface. Whether that makes sense is questionable, given [1] and the claim that setting it per-interface is not useful. Anyway, since that change we always reset the "forwarding" sysctl to zero, when we don't enable shared mode. That is not right, because the user didn't explicitly ask for that (and there is no configuration option like systemd-networkd's "IPForward=" setting to control that). What we instead should do, not touch/reset the sysctl, unless we really want to. No longer set "forwarding" to zero by default. And only restore the previous value (_dev_sysctl_save_ip6_properties()) if we actually changed the value to "1". [1] https://github.com/systemd/systemd/blob/b8fba0cded2c3e14fe8c0b52aae3ecf2c9fa718e/src/network/networkd-sysctl.c#L79 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/923 Fixes: 46e63e03af58 ('device: announce the managed IPv6 configuration with ipv6.method=shared') https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1616
* gitlab-ci: remove container cleanup stagesThomas Haller2023-05-092-362/+11
| | | | | | | | | | | | | These stages were not properly implemented and don't seem to work. Drop them. Note that we do want that our cached containers get collected eventually. As these are just caches for performance reasons, that could be done with little downsides (we can just regenerate the containers when we need them). However, that's not done by our gitlab-ci stages. Instead, it should be done on a project level. It's not clear whether that is actually done, but if there is a need (because of the resources that this wastes), then we should do that (on freedesktop.org's gitlab instance).
* n-dhcp4: re-import git-subtree for 'src/n-dhcp4'Thomas Haller2023-05-093-2/+2
|\ | | | | | | git subtree pull --prefix src/n-dhcp4 git@github.com:nettools/n-dhcp4.git master --squash
| * Squashed 'src/n-dhcp4/' changes from f8fc48dc014d..b2a382ac4500Thomas Haller2023-05-093-2/+2
| | | | | | | | | | | | | | | | | | b2a382ac4500 test: use inet_pton() instead of inet_aton() in test tool 45df6a37a710 meson: no longer pass -Wl,--no-undefined explicitly bb9bcdee5754 n-dhcp4-client: make n_dhcp4_client_set_log_level public git-subtree-dir: src/n-dhcp4 git-subtree-split: b2a382ac4500dee1abfb7cd5acaa3678e47e9662