From 4314b1c34489b369704b79419ae945e4d4076962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Tue, 28 Nov 2023 20:44:17 +0100 Subject: [PATCH] Fix transferring data using tar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of relying on the remote server to create tar files with the right account IDs (which the remote server doesn't even know, when the client and server run under different accounts), have the remote client ignore the account IDs when unpacking. Then just hard-code 0 in the remote server, so that the remote server's account identity does not leak in the tar file contents. Compare https://github.com/containers/image/issues/1627 . [NO NEW TESTS NEEDED] : https://github.com/containers/podman/pull/18563 suggests that existing tests already cover these code paths / properties. Signed-off-by: Miloslav Trmač --- pkg/api/handlers/libpod/images.go | 6 +----- pkg/domain/infra/tunnel/images.go | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index 8cef020bda..5fd6eeaeec 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -27,7 +27,6 @@ import ( "github.com/containers/podman/v4/pkg/domain/infra/abi" domainUtils "github.com/containers/podman/v4/pkg/domain/utils" "github.com/containers/podman/v4/pkg/errorhandling" - "github.com/containers/podman/v4/pkg/rootless" "github.com/containers/podman/v4/pkg/util" utils2 "github.com/containers/podman/v4/utils" "github.com/containers/storage" @@ -330,10 +329,7 @@ func ExportImages(w http.ResponseWriter, r *http.Request) { } tarOptions := &archive.TarOptions{ - ChownOpts: &idtools.IDPair{ - UID: rootless.GetRootlessUID(), - GID: rootless.GetRootlessGID(), - }, + ChownOpts: &idtools.IDPair{UID: 0, GID: 0}, } tar, err := chrootarchive.Tar(output, tarOptions, output) if err != nil { diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go index 304c99ccd7..9851259790 100644 --- a/pkg/domain/infra/tunnel/images.go +++ b/pkg/domain/infra/tunnel/images.go @@ -336,7 +336,7 @@ func (ir *ImageEngine) Save(ctx context.Context, nameOrID string, tags []string, return err } - return archive.Untar(f, opts.Output, nil) + return archive.Untar(f, opts.Output, &archive.TarOptions{NoLchown: true}) } func (ir *ImageEngine) Search(ctx context.Context, term string, opts entities.ImageSearchOptions) ([]entities.ImageSearchReport, error) {