tests/meson: attempt to fix ossfuzz builds

As we link statically with liblxc, we don't need to
link with liblxc_ext_sources, as all the symbols will come
from liblxc.a itself.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

github: master -> main

Our main branch is "main" for some time, but
in github scripts we still use "master" which is incorrect
and prevent some stuff from working.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

Merge pull request #4401 from mihalicyn/meson_link_dynamically_fix

[RFC] meson: link dynamically

meson: link with liblxc dynamically everywhere if possible

Link tests/tools/commands dynamically with liblxc if possible.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

network: use IN_LIBLXC

Put a bunch of functions under #if IN_LIBLXC to compile-out
them when network.c is linked with tools/tests code.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

storage_utils: move get_fssize to utils

This helper is used in the lxc/tools and it's
fully independent of storage_utils code, let's move it
to utils.c

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

storage_utils: unhide and rename is_valid_storage_type to lxc_is_valid_storage_type

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

confile: unhide lxc_config_parse_arch() helper

Looks safe enough to be available for liblxc users.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

conf: reorganize/split code to utils.c

Move run_script/run_script_argv helpers to utils.c

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

conf: reorganize/split code to idmap_utils.c

Move some idmaps-related functions from lxc/conf.c
to a new idmap_utils.c file.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

confile: unhide lxc_config_define*() helpers

Let's unhide lxc_config_define_add, lxc_config_define_load and
lxc_config_define_free helpers. These functions are safe enough
to be used by external tools. Semantic is also clear.

Reason is that we have lxc-start/lxc-execute tools which
use these symbols. Right now it works, because we just
link a whole liblxc statically to each lxc-* tool...

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

meson: introduce IN_LIBLXC preprocessor macro

The purpose of it is to tell us if we are compiling
liblxc or lxc test/tool/command.

This thing is needed to exclude unnecessary functions
from being compiled-in in the resulting executables
like lxc-start, lxc-attach, etc.

The problem is that lxc tools (lxc-start, lxc-stop, etc)
depend not only on the liblxc as a shared library, but also
require some non-exported symbols or helpers from liblxc
internals. So, we have to link these executables with some liblxc
object files directly which results in the dependency hell,
because linking one .c file from liblxc may end up having to
link with another one (what contains some dependency) and so on.
By using IN_LIBLXC in the liblxc internals we can selectively
omit some functions from being compiled in such cases.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

confile: move lxc_fill_elevated_privileges() to tools/lxc_attach

lxc_fill_elevated_privileges() is used only in lxc-attach tool,
let's move this function in there.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

Merge pull request #4395 from tsnaik/mount-check

oci: resolve cross-filesystem blob caching failure

Merge pull request #4398 from mihalicyn/usernic_fixes_2

tests: lxc-test-usernic: use iproute tool instead of brctl

Merge pull request #4399 from mihalicyn/apparmor_lxc_copy

config: apparmor: add AppArmor profile for lxc-copy

Merge pull request #4400 from mihalicyn/remove_old_cgroup_handling_in_tests

tests: remove old and broken cgroup handling code from tests

tests: remove old and broken cgroup handling code from tests

We have removed the same piece of code in
ec85e5ca495 ("lxc-test-usernic: drop cgroup handling")
let's do the same for two other tests.

This fixes autopkgtests.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

config: apparmor: add AppArmor profile for lxc-copy

lxc-copy can start container as lxc-start does in some cases,
so we need to have the same profile for it.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

tests: lxc-test-usernic: use iproute tool instead of brctl

This is required to fix autopkgtest failures.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

oci: resolve cross-filesystem blob caching failure

This commit addresses an issue in the OCI template where lxc-create
fails if OCI-cache directory for blob caching is not on the same mount
as the destination OCI directory. lxc-create bails when skopeo tries to
create a hard-link across the two and fails.

For example, if /var/lib/lxc is a bind mountpoint of a random directory
and skopeo fails to hard-link across /var/cache/lxc and /var/lib/lxc

This commit introduces a check where if both directories are on not the
same mount points, it disables blob caching in skopeo and continues.

Signed-off-by: Tanmay Naik <tnaik96@gmail.com>

Merge pull request #4394 from hallyn/2024-02-02/test-usernic-fixes

test-usernic fixes

lxc-test-usernic: drop cgroup handling

This stuff is not needed in a modern systemd based system, and in fact
breaks.  It would probably be better to detect such a system so that a
non-systemd box can still run this test.  But I'm not sure what would be
reliable.

Signed-off-by: Serge Hallyn <serge@hallyn.com>

test-usernic: don't use ifconfig

ifconfig is not available on many modern systems.  Use ip instead.

Maybe it would be better to detect what's available, but that
could become brittle.

Signed-off-by: Serge Hallyn <serge@hallyn.com>

Merge pull request #4391 from gibmat/fix-x32-container-creation

Add x32 to the list of recognized architectures

Add x32 to the list of recognized architectures

LXC supports x32 containers, but currently creation of those containers is broken:

lxc-create: x32-test: ../src/lxc/confile.c: set_config_personality: 1432 Invalid argument - Unsupported personality "x32"
lxc-create: x32-test: ../src/lxc/parse.c: lxc_file_for_each_line_mmap: 129 Failed to parse config file "/var/lib/lxc/x32-test/config" at line "lxc.arch = x32"
lxc-create: x32-test: ../src/lxc/tools/lxc_create.c: main: 317 Failed to create container x32-test

Signed-off-by: Mathias Gibbens <gibmat@debian.org>

Merge pull request #4390 from jacobmcnamee/unpack-tar-xattrs

lxc-download, lxc-local: preserve xattrs on unpack

lxc-download, lxc-local: preserve xattrs on unpack

Update tar invocation to preserve all xattrs when unpacking the rootfs,
notably retaining security.capability xattrs (e.g. for ping, newuidmap)

Note: bsdtar already preserves xattrs with -p

Signed-off-by: Jacob McNamee <jacob@jacobmcnamee.com>

Merge pull request #4388 from mihalicyn/plumb_userns_checks

tree-wide: use container_uses_namespace() in more places

tree-wide: use container_uses_namespace() in less trivial cases

In our current codebase we have a logical pattern:
list_empty(&handler->conf->id_map)
*IF AND ONLY IF*
container does NOT use user namespace

Which is perfectly correct nowadays, but once we (hopefully)
get an "isolated user namespaces" stuff ready it won't be the case.
It will be perfectly fine to have a user namespace with empty
/proc/*/{u,g}id_map files. Nowadays it's also possible,
but this kind of a configuration close to useless and nobody
actually uses it.

No functional changes intended.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

tree-wide: use container_uses_namespace() helper

No functional changes.

Will be useful in future support for an isolated
user namespaces [1]. I have already played with
that locally and found that in the LXC codebase
we have a bunch of different ways to ensure if
a container uses user namespaces or not.

This commit contains a trivial conversion from
an open-coded version of the container_uses_namespace()
helper to an actual use of the helper.

[1] https://lpc.events/event/17/contributions/1569/

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

Merge pull request #4363 from zhaixiaojuan/main

Add loongarch64 support

Merge pull request #4382 from petermichaux/main

Add Verbose Output in Download Template

Fix error message.

Signed-off-by: Peter Michaux <petermichaux@gmail.com>

Add verbose output in download template.

Signed-off-by: Peter Michaux <petermichaux@gmail.com>

Merge pull request #4381 from petermichaux/patch-1

Align columns in lxc-download.in template

Align columns in lxc-download.in template

Signed-off-by: Peter Michaux <petermichaux@gmail.com>

Add loongarch64 support

Signed-off-by: zhaixiaojuan <zhaixiaojuan@loongson.cn>

Merge pull request #4375 from lxc/dependabot/github_actions/actions/upload-artifact-4

build(deps): bump actions/upload-artifact from 3 to 4

build(deps): bump actions/upload-artifact from 3 to 4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Merge pull request #3236 from xinhua9569/master

config: try to create workdir if not exist

config: try to create workdir if not exist

Signed-off-by: dongxinhua <dongxinhua@huawei.com>

Merge pull request #4368 from desultory/main

Updated lxc-local template

lxc-local: Add --no-dev option to exclude /dev from the fstree

Signed-off-by: Zen <z@pyl.onl>

lxc-local: Re-organize code to use more functions

Signed-off-by: Zen <z@pyl.onl>

lxc-local: Improve usage info

Signed-off-by: Zen <z@pyl.onl>

lxc-local: Change LXC_CONFIG to LXC_METADATA to match args and be more clear

Signed-off-by: Zen <z@pyl.onl>

Merge pull request #3430 from Der-Jan/master-zfs-fix

Read list until process exits

Merge pull request #4351 from flisk/fix-untagged-vlans-on-bridges-without-default-pvids

don't try to delete vlan 0 from veth

Merge pull request #4169 from cole-miller/link-local

Disable IPv6 link-local addresses for bridged veth

Disable IPv6 link-local addresses for bridged veth

When creating a bridged veth tunnel, disable assignment of IPv6
link-local addresses on the host's end by writing 1 to
/proc/sys/net/ipv6/conf/NAME/disable_ipv6, if it exists.

Signed-off-by: Cole Miller <m@cole-miller.net>

don't try to delete vlan 0 from veth

vid 0 is a special value that indicates the absence of a default pvid

Signed-off-by: flisk <self@flisk.xyz>

Merge pull request #4321 from lkomurcub/libarchive_tar_exclude

Add libarchive tar support for lxc download

Merge pull request #4344 from gibmat/fix-ephemeral-copy

lxc_storage_prepare(): Fix ephemeral copies

conf: fix ephemeral copies

Don't rely on rootfs->bdev_type because that may be NULL. Use storage->type
instead which can't be NULL.

Co-Developed-by: Mathias Gibbens <gibmat@debian.org>
Signed-off-by: Mathias Gibbens <gibmat@debian.org>
Reported-by: Mathias Gibbens <gibmat@debian.org>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

Merge pull request #4370 from simondeziel/no-upstart

Remove support for upstart

config/init: Drop upstart files

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

doc: remove the warning mentionning upstart

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

hooks/ubuntu-cloud-prep: remove upstart handling

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

meson: Remove support for upstart

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

Merge pull request #4357 from ElJeffe/fix-idmap-clear

reset root_nsuid_map and root_nsgid_map when idmaps is cleared

reset root_nsuid_map and root_nsgid_map when idmaps is cleared

Signed-off-by: Jef Steelant <jef@steelant.be>

Merge pull request #4352 from simondeziel/shellcheck-checkconfig

Make `lxc-checkconfig` shellcheck clean

lxc/checkconfig: use multiline `echo`

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

lxc/checkconfig: replace `echo -n` by printf

printf is already used for color output.

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

lxc/checkconfig: minor cosmetic change

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

lxc/checkconfig: avoid subshell (SC2235)

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

lxc/checkconfig: remove superfluous (..) around test command (SC2234)

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

lxc/checkconfig: check exit code directly (SC2181)

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

lxc/checkconfig: replace `! -z` by `-n` (SC2236)

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

lxc/checkconfig: add missing quotes to please shellcheck

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

lxc/checkconfig: remove some unneeded `echo -n`

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

lxc/checkconfig: replace `type` by `command`

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

lxc/checkconfig: replace `cat | grep` with `grep`

Also speedup `grep` invokations while at it.

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

Merge pull request #4349 from mihalicyn/set_timeout_fixup

lxc/lxccontainer: fix do_lxcapi_set_timeout retval

lxc/lxccontainer: fix do_lxcapi_set_timeout retval

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

Merge pull request #4345 from lxc/dependabot/github_actions/actions/checkout-4

build(deps): bump actions/checkout from 3 to 4

build(deps): bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Merge pull request #4343 from stgraber/main

lxccontainer.h: Move new fields to the end

lxccontainer.h: Move new fields to the end

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>

Merge pull request #4341 from stgraber/main

Remove references to LXD

Remove references to LXD

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>

Merge pull request #4339 from hallyn/2023-08-29/consoleperms

Update console perms to 0600

Update console perms to 0600

Closes #4338

We should not give execute permissions to console output.

Signed-off-by: Serge Hallyn <serge@hallyn.com>

Merge pull request #4336 from smoser/fix/api-start-split-better

Fix start api call to split quoted strings in execute or init command.

Fix start api call to split quoted strings in execute or init command.

If a user of the container.start api call provided NULL for the argv
argument, then lxc would load either 'lxc.execute.cmd' or
'lxc.init.cmd' configuration items as the command.

Given a config like:

    lxc.execute.cmd = /usr/bin/touch "file one" "file 2"

lxc would just split the string on spaces and end up executing array:

  ['touch', 'file"', 'one"', '"file', '2"']

This differs from the experience with the `lxc-start` command which
would use lxc_string_split_quoted and execute:

  ['touch', 'file one', 'file 2']

Note that as described in lxc_string_split_quoted, commands that include
nested quotes and possibly other characters are still a problem.  In
those cases, the caller of 'start' can provide an argv array.

Signed-off-by: Scott Moser <smoser@brickies.net>

Merge pull request #4260 from mihalicyn/lxcapi_set_timeout

LXC API extension: set_timeout

Merge pull request #4295 from mihalicyn/apparmor_mount_propagation

Apparmor mount propagation

github: Update for main branch

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>

Merge pull request #4327 from hallyn/2023-07-17/ai

CONTRIBUTING: add a note on AI generated code

CONTRIBUTING: add a note on AI generated code

Signed-off-by: Serge Hallyn <shallyn@cisco.com>

Merge pull request #4324 from hallyn/2023-07-06/bequiet

get_hierarchy: dont WARN about no usable controller

get_hierarchy: dont WARN about no usable controller

If I start a container with loglevel WARN, and (on a pretty
stock ubuntu) do lxc-info -n $c, I get

lxc-start media 20230706233337.765 WARN     cgfsng - cgroups/cgfsng.c:get_hierarchy:142 - There is no useable cpuacct controller
lxc-start media 20230706233337.765 WARN     cgfsng - cgroups/cgfsng.c:get_hierarchy:142 - There is no useable blkio controller

I don't think that's worth WARNing about, so change it to
INFO.

Signed-off-by: Serge Hallyn <shallyn@cisco.com>

Add libarchive tar support for lxc download

This patch fixes unpacking images when the system provided tar is libarchive (bsd-tar). bsd-tar  doesn't support 'exclude' flags (--anchored) like gnu-tar does. Instead each exclude path is prepended with ^ to simulate behavior of --anchored when bsd tar is detected.

Signed-off-by: Levent Komurcu <levent.komurcu@nl.bosch.com>

github: Add DCO/target tests

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

Merge pull request #4313 from mosbrew-ag/master

explicitly convert *mainloop_handler to __u64

explicitly convert *mainloop_handler to __u64

GCC treats such conversion as warning, while Clang-15 aborts compilation

Signed-off-by: Anatolii Gryzlov <agryzlov.mosbrew@gmail.com>

Merge pull request #4310 from magalilemes/parse-config-file

tests: fix parse_config_file seccomp test

tests: fix parse_config_file seccomp test

Link: https://bugs.launchpad.net/ubuntu-kernel-tests/+bug/1980218
Check if seccomp is enabled before throwing error.

Signed-off-by: Magali Lemes <magali.lemes@canonical.com>

Merge pull request #4309 from stgraber/master

src/tests: Fix container creation errors