Commit Graph

3443 Commits

Author SHA1 Message Date
openshift-merge-bot[bot] 81584443fa
Merge pull request #6058 from openshift-cherrypick-robot/cherry-pick-6051-to-release-1.23
[release-1.23] tests/conformance/testdata/Dockerfile.add:...
2025-03-11 14:10:30 +00:00
Nalin Dahyabhai 5ae35cee93 tests/conformance/testdata/Dockerfile.add:...
update some URLs

The origin repository renamed its "master" branch to "main", so we need
to update our references to items in that branch.

[NO NEW TESTS NEEDED]

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-03-11 02:32:44 +00:00
openshift-merge-bot[bot] d7f2d697c6
Merge pull request #5507 from nalind/conformance-trailing-zeroes-1.23
[release-1.23] conformance tests: don't break on trailing zeroes in layer blobs
2024-05-02 19:50:53 +00:00
Nalin Dahyabhai a936abcba2 conformance tests: don't break on trailing zeroes in layer blobs
When analyzing a layer blob's contents, don't break if the blob has more
zeroes padding it out even after the tar reader thinks it's hit the end
of the archive.

Add more detail to the diagnostic error we print when there's a digest
or length mismatch, too, in case it's triggered by something other than
zero padding.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2024-05-02 15:19:40 -04:00
openshift-merge-bot[bot] fe095c8bfa
Merge pull request #5262 from cevich/conformance-bit-masking-1.23
[release-1.23] conformance test: ignore file type bits when comparing layers
2024-01-11 16:37:08 +00:00
Nalin Dahyabhai 084e0e73dd
conformance test: ignore file type bits when comparing layers
When comparing layer payloads during conformance tests, mask off any
file type bits that the tar headers in the layers might have included.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Signed-off-by: Chris Evich <cevich@redhat.com>
2024-01-11 11:01:37 -05:00
OpenShift Merge Robot d8e6952665
Merge pull request #4852 from cevich/release-1.23_backport-fix_ci_using_docker_hub
[release-1.23] Replace registry.centos.org
2023-06-07 15:41:03 -04:00
Aditya R 5b12d516e6
[release-1.23] Replace registry.centos.org
The registry.centos.org service has been decommissioned.  Update the
conformance test references to point into the static CI images under
the `quay.io/libpod` repositories.

Signed-off-by: Aditya R <arajan@redhat.com>
Signed-off-by: Ed Santiago <santiago@redhat.com>
Signed-off-by: Chris Evich <cevich@redhat.com>
2023-06-06 15:02:48 -04:00
OpenShift Merge Robot 886430ab44
Merge pull request #4280 from nalind/v1.23.5
[release-1.23] tag v1.23.5
2022-09-21 08:02:27 +02:00
Nalin Dahyabhai 170a60ceec tag v1.23.5
[NO NEW TESTS NEEDED]

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-09-20 13:04:48 -04:00
flouthoc 0f561f691b
Merge pull request #4264 from nalind/additional-groups-1.23
[release-1.23] run: add container gid to additional groups
2022-09-20 00:55:23 +05:30
Aditya R 7acef8ff1c run: add container gid to additional groups
When container is created with specific uid and gid also add container
gid to supplementary/additional group.

Signed-off-by: Aditya R <arajan@redhat.com>
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-09-19 14:57:09 -04:00
OpenShift Merge Robot e6c2f2f820
Merge pull request #4139 from cevich/1.23_latest_imgts
[release-1.23] Cirrus: Use the latest imgts container
2022-07-27 11:45:02 +02:00
Chris Evich 2857891d27
Cirrus: Use the latest imgts container
Contains important updates re: preserving release-branch CI VM images.
Ref: https://github.com/containers/automation_images/pull/157

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-07-26 14:02:03 -04:00
OpenShift Merge Robot 601d9dd686
Merge pull request #3911 from lsm5/release-1.23-cve-2022-27191-backport
[release-1.23] Bump golang.org/x/crypto to 7b82a4e
2022-04-12 16:24:01 -04:00
Lokesh Mandvekar 55e2081cc9
Bump golang.org/x/crypto to 7b82a4e
Resolves: GHSA-8c26-wmh5-6g9v - CVE-2022-27191

Buildah doesn't seem to be directly affected as the logic in question
is not called.

golang.org/x/crypto@1baeb1ce contains the actual CVE fix. Using the
latest upstream commit to also include support for SHA-2.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-04-12 14:11:44 -04:00
OpenShift Merge Robot b07f40b7d0
Merge pull request #3905 from rhatdan/bump-1.23.4
Bump to v1.23.4
2022-04-07 11:01:34 -04:00
Daniel J Walsh b6b492324e
Bump to v1.23.4
[NO NEW TESTS NEEDED]

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-04-07 10:16:22 -04:00
OpenShift Merge Robot 5a4c930733
Merge pull request #3903 from flouthoc/release-1.23
[release-1.23 backport] bump to race-free `c/image` and `c/storage`
2022-04-07 09:13:32 -04:00
Aditya R 0036e40516
chroot: run gofmt on run.go
This is causing smoke test to fail so replace run.go with a goformatted
version.

[NO NEW TESTS NEEDED]

Signed-off-by: Aditya R <arajan@redhat.com>
2022-04-07 01:53:09 +05:30
Aditya R 3f63d91ac9
vendor: bump c/image to v5.16.0-rhel/8b06d33
Use race-free `AddNames` instead of `SetNames` by bumping `c/image`

Signed-off-by: Aditya R <arajan@redhat.com>
2022-04-07 01:15:53 +05:30
Aditya R 4ce604b757
Use race-free c/storage by bumping it to 1.36.3
Signed-off-by: Aditya R <arajan@redhat.com>
2022-04-07 01:10:59 +05:30
Daniel J Walsh b4f3cfede5
Merge pull request #3853 from nalind/CVE-2022-27651-1.23
[release-1.23] CVE-2022-27651: do not set the inheritable capabilities
2022-03-25 05:40:29 -04:00
OpenShift Merge Robot 0e4380a438
Merge pull request #3854 from nalind/CVE-2022-21698-1.23
[release-1.23] CVE-2022-21698: bump github.com/prometheus/client_golang to v1.11.1
2022-03-25 10:05:16 +01:00
Nalin Dahyabhai 4e12c25b29 Add a test for CVE-2022-27651
Check that the inheritable capabilities are set to 0, even when we
explicitly try to add capabilities.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-03-24 16:34:20 -04:00
Nalin Dahyabhai 9f71aefbff Bump github.com/prometheus/client_golang to v1.11.1
Resolves: CVE-2022-21698

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-03-24 16:26:14 -04:00
Giuseppe Scrivano 44062a0e8d do not set the inheritable capabilities
The kernel never sets the inheritable capabilities for a process, they
are only set by userspace.  Emulate the same behavior.

Closes: CVE-2022-27651

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2022-03-24 16:22:16 -04:00
Daniel J Walsh 299dcebd0d
Merge pull request #3769 from nalind/v1.23.3
[release-1.23] bump to v1.23.3
2022-02-03 12:45:41 -05:00
Nalin Dahyabhai 976948e307 bump to v1.23.3
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-02-03 11:55:51 -05:00
OpenShift Merge Robot 1ed2ba8f06
Merge pull request #3763 from nalind/update-reflect2
bump(github.com/modern-go/reflect2) to v1.0.2
2022-02-01 21:22:51 -05:00
Nalin Dahyabhai fea62ccc70 bump(github.com/modern-go/reflect2) to v1.0.2
github.com/modern-go/reflect2, pulled in by github.com/json-iterator/go,
which we use in multiple dependencies, wasn't compatible with Go 1.18
until v1.0.2, so we need to update from v1.0.1.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-02-01 16:45:15 -05:00
Daniel J Walsh 83a66a747e
Merge pull request #3741 from nalind/v1.23.2
[release-1.23] bump(github.com/containerd/containerd), bump us to v1.23.2
2022-01-24 15:03:55 -05:00
Nalin Dahyabhai 11ad7951fe Bump to v1.23.2
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-01-24 14:46:47 -05:00
Lokesh Mandvekar 3ec002a7ac Bump containerd to v1.5.7
Fixes: GHSA-c2h3-6mxw-7mvq
Vulnerable versions: >= 1.5.0, < 1.5.7
Patched version: 1.5.7

`Impact`
A bug was found in containerd where container root directories and
some plugins had insufficiently restricted permissions, allowing
otherwise unprivileged Linux users to traverse directory contents
and execute programs. When containers included executable programs
with extended permission bits (such as setuid), unprivileged Linux
users could discover and execute those programs. When the UID of
an unprivileged Linux user on the host collided with the file
owner or group inside a container, the unprivileged Linux user on
the host could discover, read, and modify those files.

`Patches`
This vulnerability has been fixed in containerd 1.4.11 and
containerd 1.5.7. Users should update to these version when they
are released and may restart containers or update directory
permissions to mitigate the vulnerability.

`Workarounds`
Limit access to the host to trusted users. Update directory
permission on container bundles directories.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-01-24 14:41:56 -05:00
OpenShift Merge Robot 4b73e0d7de
Merge pull request #3738 from nalind/is-not-a-directory-1.23
[release-1.23] copier.Put: check for is-not-a-directory using lstat, not stat; RemoveAll possibly-directories
2022-01-24 13:46:44 -05:00
Nalin Dahyabhai 4a831103c0 copier: RemoveAll possibly-directories
When we attempt to remove a directory to make way for a non-directory as
part of extracting content, use RemoveAll() instead of Remove().

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-01-24 10:39:06 -05:00
Nalin Dahyabhai 9091023db2 copier.Put: check for is-not-a-directory using lstat, not stat
When checking if something that we want to overwrite with a directory is
already a directory or not, use lstat instead of stat.  If it's a
symbolic link, it's not a directory.

This is a subtle behavior change, but it's in line with docker build.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-01-24 10:28:39 -05:00
OpenShift Merge Robot 867c1bc093
Merge pull request #3628 from cevich/1.23_fix_install
[1.23] Cirrus: Backport PR #3562 + reduce testing tasks
2021-11-19 17:55:15 +01:00
Chris Evich 9ff86a0111
Cirrus: Reduce CI tasks to releive maint. burden
This follows a long-standing practice here and across other containers
projects.  Over time, it's simply not worth developer/maintainer time to
debug old tests that may fail due to new/changing inputs.  Reduce down
to the bare minimum of tasks to keep CI on life-support while the need
for backports remains possible but unlikely.

Signed-off-by: Chris Evich <cevich@redhat.com>
2021-11-19 10:45:18 -05:00
Chris Evich 9439690000
Cirrus: Backport PR #3562
Same package metadata problem found to affect older release branch
'conformance' testing.

Signed-off-by: Chris Evich <cevich@redhat.com>
2021-11-15 15:04:02 -05:00
OpenShift Merge Robot 87a0565219
Merge pull request #3547 from ashley-cui/bump-1.23.1
[v1.23] Bump 1.23.1
2021-09-28 13:15:14 -04:00
Ashley Cui d9a41b8518 Bump to v1.23.1
[NO TESTS NEEDED]

Signed-off-by: Ashley Cui <acui@redhat.com>
2021-09-27 21:46:00 -04:00
OpenShift Merge Robot 3b96771f0f
Merge pull request #3543 from ashley-cui/1.23
Vendor containers/common v0.44.2
2021-09-27 16:51:21 -04:00
OpenShift Merge Robot 3a283be985
Merge pull request #3542 from nalind/post-1.23
post-1.23 branch fixups
2021-09-27 15:02:57 -04:00
Ashley Cui f6ff8fd97b Vendor containers/common v0.44.2
Signed-off-by: Ashley Cui <acui@redhat.com>
2021-09-27 14:23:46 -04:00
Nalin Dahyabhai 144df94023 post-1.23 branch fixups
* Change DEST_BRANCH in .cirrus.yml from main to release-1.23
* Set GITVALIDATE_EPOCH for validation to the release-1.23 branch point

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2021-09-27 13:17:31 -04:00
Daniel J Walsh 37fe4e86c2
Bump to v1.23.0
[NO TESTS NEEDED]

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-09-13 16:38:37 -04:00
OpenShift Merge Robot 8657d7ec9b
Merge pull request #3515 from rhatdan/VENDOR
Vendor in containers/common v0.44.0
2021-09-13 14:06:52 -04:00
Daniel J Walsh b44c7b64da
Vendor in containers/common v0.44.0
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-09-13 10:38:41 -04:00
OpenShift Merge Robot e9bc224636
Merge pull request #3514 from containers/dependabot/go_modules/github.com/containers/storage-1.36.0
build(deps): bump github.com/containers/storage from 1.35.0 to 1.36.0
2021-09-13 08:59:40 -04:00