14358 Commits

Author SHA1 Message Date
98c9469d27 Merge pull request #22472 from TomSweeneyRedHat/cve-2022-4122-symlink-info
[v4.0-rhel] remote,build: error if containerignore is symlink
2024-05-08 21:29:10 +00:00
1438a21698 remote,build: error if containerignore is symlink
Drop support for remote use-cases when `.containerignore` or
`.dockerignore` is a symlink pointing to arbitrary location on host.

This backport addresses: CVE-2022-4122
https://issues.redhat.com/browse/RHEL-13467

Signed-off-by: Aditya R <arajan@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2024-05-01 19:46:07 -04:00
b82db6ff0e Merge pull request #22269 from TomSweeneyRedHat/dev/tsweeney/cve-v4.0-rhel
[v4.0-rhel] Bump Buildah to v1.24.7
2024-04-18 14:36:21 +00:00
5b09baac3d [v4.0-rhel] Bump Buildah to v1.24.7
This bumps Buildah to v1.24.7 and addresses CVE-2024-1753
https://issues.redhat.com/browse/RHEL-26758
https://issues.redhat.com/browse/RHEL-26757
https://issues.redhat.com/browse/RHEL-26756

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2024-04-17 17:40:56 -04:00
17e88d2d95 Merge pull request #22344 from cevich/v4.0-rhel_newer_fedora
[v4.0-rhel] CI: Bump CI env. to F36
2024-04-16 10:23:41 +00:00
9341a1033b Disable failing golangci-lint check
When running in an updated F36 environment, this old linter fail with
inumerable errors that aren't worth fixing.  Disable it.

Signed-off-by: Chris Evich <cevich@redhat.com>
2024-04-11 11:56:11 -04:00
7b3cac1aa8 Apply required golang 1.17+ meta changes
Signed-off-by: Chris Evich <cevich@redhat.com>
2024-04-11 10:53:28 -04:00
4cc423b7e3 [v4.0-rhel] CI: Bump CI env. to F36
This branch is in need of a handful of CVE backports which are
incompatible with golang 1.16 shipping in F35.  This is making the
backports very difficult.  Bump the CI VM up to F36 with golang 1.18,
which is representative of what's happening in the RHEL builds.  The
image used was pulled from the CI in the buildah release-1.26 branch.

Also: Disable the upgrade tests since they're non-functional on F36
without significant changes.

Signed-off-by: Chris Evich <cevich@redhat.com>
2024-04-11 10:53:28 -04:00
948d71947d Merge pull request #22303 from cevich/v4.0-rhel_bump_ci
[v4.0-rhel] CI maintenance mode
2024-04-10 18:57:44 +00:00
8781019d42 [v4.0-rhel] CI maintenance mode
This release was originally built around Fedora 35 and golang 1.16.
However the RHEL platform this branch feeds has since moved on to golang
1.17 out of necessity to support security backports.  Given the
difficulty/complexity of updating the CI platform to F36 (golang 1.18),
and the age of this branch, place it into a slimmed-down
"maintenance-only" mode.

Note: This implies a heavier reliance on downstream QE/QA.

Signed-off-by: Chris Evich <cevich@redhat.com>
2024-04-10 10:50:42 -04:00
6675e348ea Merge pull request #21968 from kolyshkin/v4.0-rhel-runc
[v4.0-rhel] Use a branched runc instead of manual vendor changes
2024-03-07 12:31:46 +00:00
ed942ad77e [v4.0-rhel] Use a branched runc instead of manual vendor changes
Commit 480a451d7 manually patched runc/libcontainer in vendor, which is
OK short term but creates a maintenance problem down the line.

The manual patching was done in a rush to address CVE-2024-21626.
A fixed runc version (v1.1.12) could not be used as it requires Go 1.17
(since runc 1.1.6) , while this branch here uses Go 1.16.

Instead of manual patching in place, let's use a new runc branch in
projectatomic repo [1], which contains runc 1.1.2 + CVE fix.

Note runc v1.1.2 (rather than v1.1.0 which was used previosly) was
chosen as a base because the CVE backport was already available. As for
what's vendored here, the only difference from v1.1.0 is
https://github.com/opencontainers/runc/commit/8290c4cf58fb.
Meaning, update from v1.1.0 to v1.1.2 should not bring any new issues.

[1] https://github.com/projectatomic/runc/tree/podman-v4.0-rhel

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2024-03-06 19:27:51 -08:00
983094d4ac Merge pull request #21490 from mheon/manual_runc_fix_40rhel
[v4.0-rhel] Manually update runc vendor to address CVE-2024-21626
2024-02-05 19:04:16 +00:00
83200203fa Disable build_each_commit and validate
The branch is very old, and manual changes to vendor/ are
breaking these tasks.

Signed-off-by: Matt Heon <mheon@redhat.com>
2024-02-05 10:43:25 -05:00
272d3286e5 Disable code consistency test
Signed-off-by: Matt Heon <mheon@redhat.com>
2024-02-02 15:41:37 -05:00
480a451d74 Manually update runc vendor to address CVE-2024-21626
Signed-off-by: Matt Heon <mheon@redhat.com>
2024-02-02 15:10:02 -05:00
427a15fffe Merge pull request #20694 from mtrmac/pgzip-update-4.0-rhel
[v4.0-rhel] RHEL-17145: Update to github.com/klauspost/pgzip@v1.2.6
2023-11-27 21:11:05 +00:00
ad332ea341 (Temporary) Emergency CI fix: quay search is broken
Someone please revert this once quay search is fixed.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2023-11-16 00:11:28 +01:00
6f1ff812f4 Update to github.com/klauspost/pgzip@v1.2.6
... to fix a bug which shows up with Go >= 1.19:
https://github.com/klauspost/pgzip/pull/50

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2023-11-15 21:21:39 +01:00
a99cd1f508 Merge pull request #19337 from cevich/v4.0-rhel_fix_python_license_file
[v4.0-rhel] Fix AttributeError: cython_sources
2023-07-28 16:44:14 +02:00
ae18173ce7 [v4.0-rhel] Fix AttributeError: cython_sources
Apparent Cython regression causing a warning and traceback when
installing PyYAML with pip:

Ref. Upstream issue 601: https://github.com/yaml/pyyaml/issues/

Ref. warning message:
```
********************************************************************************
The license_file parameter is deprecated, use license_files instead.
By 2023-Oct-30, you need to update your project and remove deprecated calls
or your builds will no longer be supported.
See https://setuptools.pypa.io/en/latest/userguide/declarative_config.html for details.
********************************************************************************
```

Ref. traceback snippet:
```
Traceback (most recent call last):
  File "/var/tmp/go/src/github.com/containers/podman/venv/lib/python3.10/site-packages/pip/_vendor/pyproject_hooks/_in_process/_in_process.py", line 353, in <module>
    main()
...cut...
  File "<string>", line 201, in get_source_files
  File "/tmp/pip-build-env-yiijk0jv/overlay/lib/python3.10/site-packages/setuptools/_distutils/cmd.py", line 107, in __getattr__
    raise AttributeError(attr)
AttributeError: cython_sources
```

Signed-off-by: Chris Evich <cevich@redhat.com>
2023-07-25 11:37:49 -04:00
8a17bee690 Merge pull request #18665 from TomSweeneyRedHat/dev/tsweeney/v4.0_ctrenv
[v4.0-rhel] container: do not create .containerenv with -v SRC:/run
2023-06-01 23:35:26 -04:00
febde1a23f [v4.0-rhel] container: do not create .containerenv with -v SRC:/run
if /run is on a volume do not create the file /run/.containerenv as it
would leak outside of the container.

Closes: https://github.com/containers/podman/issues/14577

Backporting #14582 to v4.0-rhel to complete the backports to https://issues.redhat.com/browse/OCPBUGS-7522

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Signed-off-by: Tom Sweeney <tsweeney@redhat.com>
2023-05-25 15:55:03 -04:00
d54ecc8c3b Merge pull request #17535 from mheon/backport_17528_40rhel
[v4.0-rhel] Backport #17528
2023-02-16 16:08:05 -05:00
a5d8acb304 volume,container: chroot to source before exporting content
* Utils must support higher level API to create Tar with chrooted into
  directory
* Volume export: use TarwithChroot instead of Tar so we can make sure no
  symlink can be exported by tar if it exists outside of the source
directory.
* container export: use chroot and Tar instead of Tar so we can make sure no
  symlink can be exported by tar if it exists outside of the mointPoint.

[NO NEW TESTS NEEDED]
[NO TESTS NEEDED]
Race needs combination of external/in-container mechanism which is hard to repro in CI.

Closes: BZ:#2168256
CVE: https://access.redhat.com/security/cve/CVE-2023-0778

Signed-off-by: Aditya R <arajan@redhat.com>

MH: Backport to v4.4-rhel per RHBZ 2169617

Signed-off-by: Matt Heon <mheon@redhat.com>
2023-02-16 11:41:27 -05:00
0b00627816 Merge pull request #17442 from giuseppe/v4.0-rhel-no-spawn-dbus
[v4.0-rhel] vendor: update c/common to v0.47.6
2023-02-09 04:02:33 -05:00
e5c53c691b vendor: update c/common to v0.47.6
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2154015

[NO TESTS NEEDED] it is a dep update

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2023-02-08 22:38:12 +01:00
ccfe4dd653 Merge pull request #17357 from mheon/15618_40rhel
Backport #15618 to v4.0-rhel
2023-02-03 22:55:57 +01:00
e7a73108b3 Add container GID to additional groups
Mitigates a potential permissions issue. Mirrors Buildah PR #4200
and CRI-O PR #6159.

Signed-off-by: Matthew Heon <mheon@redhat.com>

MH: Backported to v4.0-rhel per RHBZ #2121541

Signed-off-by: Matthew Heon <mheon@redhat.com>
2023-02-03 13:32:06 -05:00
1cc1f6cc43 Merge pull request #17319 from TomSweeneyRedHat/dev/tsweeney/randomfix_4.0
[v4.0-rhel] all: stop using deprecated GenerateNonCryptoID
2023-02-02 13:31:23 +01:00
361ec22fe5 [v4.0-rhel] all: stop using deprecated GenerateNonCryptoID
Cherry-pick #15788 to v4.0-rhel branch per RHBZ 2157930

In view of https://github.com/containers/storage/pull/1337, do this:

	for f in $(git grep -l stringid.GenerateNonCryptoID | grep -v '^vendor/'); do
		sed -i 's/stringid.GenerateNonCryptoID/stringid.GenerateRandomID/g' $f;
	done

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2023-02-01 17:45:36 -05:00
11afff33da Merge pull request #17203 from edsantiago/backport_14765
[v4.0-rhel] runtime: unpause the container before killing it
2023-01-24 17:45:02 -05:00
33a3d3df24 Fix search_test to return correct version of alpine
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-01-24 13:45:46 -07:00
e9cf473549 runtime: unpause the container before killing it
the new version of runc has the same check in place and it
automatically resume the container if it is paused.  So when Podman
tries to resume it again, it fails since the container is not in the
paused state.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2100740

[NO NEW TESTS NEEDED] the CI doesn't use a new runc on cgroup v1 systems.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2023-01-24 12:34:33 -07:00
1602793c62 Merge pull request #17111 from cevich/v4.0-rhel-kill_osx
[v4.0-rhel] [CI:BUILD] Cirrus: Stop building for OSX
2023-01-13 16:11:55 -05:00
b9b998f157 [v4.0-rhel] Cirrus: Stop building for OSX
There's no reason to maintain this task on a release-branch.  The
environment is managed by Cirrus, no us.  Nobody will ever need/want/try
to cross-compile an old podman version with the latest environment.
Just remove the test.

Signed-off-by: Chris Evich <cevich@redhat.com>
2023-01-13 15:29:18 -05:00
0a1d0e805b Merge pull request #17007 from lsm5/v4.0-rhel-osx
[BACKPORT v4.0-rhel] [CI:DOCS] Migrate OSX Cross to M1
2023-01-05 13:49:40 -05:00
d6ea5b13f3 [CI:DOCS] Migrate OSX Cross to M1
Migrate our OSX Cross build to a M1 instance, since Cirrus is sunsetting Intel-based macOS instances.

Signed-off-by: Ashley Cui <acui@redhat.com>
(cherry picked from commit a575111ad4bcaa8c9ec4b0c4f7ecc5197e5be43f)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2023-01-05 20:22:16 +05:30
94d849894a Merge pull request #16533 from openshift-cherrypick-robot/cherry-pick-16488-to-v4.0-rhel
[v4.0-rhel] [skip-ci] Disable gitlab task
2022-11-16 13:31:04 +00:00
8f04f8a6d4 Disable gitlab task
This task runs the latest/greatest upstream gitlab unit tests.  There is
no benefit to running it on a podman release-branch.  Disable it.

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-11-16 13:14:48 +00:00
ee04ef9271 Merge pull request #16373 from edsantiago/skip_broken_ubi8_test_v40rhel
[v4.0-rhel] Skip failing pull-arch test
2022-11-02 05:37:02 -04:00
60a4432b11 Skip failing pull-arch test
ubi8 broke our tests. Fix is #16308 (don't use images that we
don't control), but it's too hard to backport to this old branch.
Just skip the failing test.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-10-31 08:07:56 -06:00
66518b40d1 Merge pull request #16002 from lsm5/v4.0-rhel-buildah-1.24.6
[v4.0-rhel] vendor buildah v1.24.6
2022-09-30 12:18:22 +02:00
9850845a62 [v4.0-rhel] vendor buildah v1.24.6
Includes a fix for CVE-2022-2990
Ref: https://github.com/advisories/GHSA-fjm8-m7m6-2fjp

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-09-29 15:47:22 -04:00
d661d8e443 Merge pull request #15555 from TomSweeneyRedHat/dev/tsweeney/backport14319
[v4.0-rhel] compat, build: suppress step errors when quiet is set
2022-09-12 13:35:12 +02:00
48e614d44e compat, build: suppress step errors when quiet is set
Match with docker API and suppress step errors when field quiet is set.

Closes: https://github.com/containers/podman/issues/14315

Signed-off-by: Aditya R <arajan@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2022-09-01 15:16:31 -04:00
33084ebddd Merge pull request #15147 from vrothberg/4.0-fix-ci
[v4.0-rhel] fix e2e sign tests
2022-08-02 11:49:33 +02:00
9beedca4d2 e2e: pull_test: speed up --all-tags
Pulling the K8s pause image seems unnecessarily expensive to me. Let's
use the testgitest_v2s2 one which is under our control and weighs only a
couple of KB.

This cut the execution time in less than half on my machine.  Since it's
network bound and I am running on fibre, I expect more significant speed
ups in slower networks.

Also fixes CI since the K8s pause image changed and broke the test.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-08-02 09:42:29 +02:00
f02d379736 fix e2e sign tests
The key used in the tests has expired.  Remove the expiration date to
turn CI happy and green.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-08-02 08:52:50 +02:00
3efe4c292a Merge pull request #15080 from cevich/v4.0-rhel_latest_imgts
[v4.0-rhel] [CI:DOCS] Cirrus: Use the latest imgts container
2022-07-26 21:48:23 +02:00