From daa5add33ae7808d71ffcd7f76c7bd636875c71b Mon Sep 17 00:00:00 2001
From: yongxiu <cuiyongxiu@gmail.com>
Date: Wed, 21 Apr 2021 08:42:12 -0700
Subject: [PATCH] Add support for symbol link inside docker tar file (#987)

* Add support for symbol link inside docker tar file

* docker tar file containing multiple images will have symbol link for
layer files to save space, this will read from the target file instead
of the symbol link file

* Add unit test for symbol link inside tar file

* Fix format
---
 pkg/v1/tarball/image.go               |   6 +++++
 pkg/v1/tarball/image_test.go          |  32 ++++++++++++++++++++++++++
 pkg/v1/tarball/testdata/test_link.tar | Bin 0 -> 29696 bytes
 3 files changed, 38 insertions(+)
 create mode 100644 pkg/v1/tarball/testdata/test_link.tar

diff --git a/pkg/v1/tarball/image.go b/pkg/v1/tarball/image.go
index 2ffa7a6ac..980842d23 100644
--- a/pkg/v1/tarball/image.go
+++ b/pkg/v1/tarball/image.go
@@ -23,6 +23,8 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"path"
+	"path/filepath"
 	"sync"
 
 	"github.com/google/go-containerregistry/internal/gzip"
@@ -216,6 +218,10 @@ func extractFileFromTar(opener Opener, filePath string) (io.ReadCloser, error) {
 			return nil, err
 		}
 		if hdr.Name == filePath {
+			if hdr.Typeflag == tar.TypeSymlink || hdr.Typeflag == tar.TypeLink {
+				currentDir := filepath.Dir(filePath)
+				return extractFileFromTar(opener, path.Join(currentDir, hdr.Linkname))
+			}
 			close = false
 			return tarFile{
 				Reader: tf,
diff --git a/pkg/v1/tarball/image_test.go b/pkg/v1/tarball/image_test.go
index a600a7d61..e76ac5d9f 100644
--- a/pkg/v1/tarball/image_test.go
+++ b/pkg/v1/tarball/image_test.go
@@ -15,9 +15,11 @@
 package tarball
 
 import (
+	"io/ioutil"
 	"testing"
 
 	"github.com/google/go-containerregistry/pkg/name"
+	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/validate"
 )
 
@@ -95,3 +97,33 @@ func TestBundleMultiple(t *testing.T) {
 		})
 	}
 }
+
+func TestLayerLink(t *testing.T) {
+	tag, err := name.NewTag("bazel/v1/tarball:test_image_3", name.WeakValidation)
+	if err != nil {
+		t.Fatalf("Error creating tag: %v", err)
+	}
+	img, err := ImageFromPath("testdata/test_link.tar", &tag)
+	if err != nil {
+		t.Fatalf("Error loading image: %v", img)
+	}
+	hash := v1.Hash{
+		Algorithm: "sha256",
+		Hex:       "8897395fd26dc44ad0e2a834335b33198cb41ac4d98dfddf58eced3853fa7b17",
+	}
+	layer, err := img.LayerByDiffID(hash)
+	if err != nil {
+		t.Fatalf("Error getting layer by diff ID: %v, %v", hash, err)
+	}
+	rc, err := layer.Uncompressed()
+	if err != nil {
+		t.Fatal(err)
+	}
+	bs, err := ioutil.ReadAll(rc)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(bs) == 0 {
+		t.Errorf("layer.Uncompressed() returned a link file")
+	}
+}
diff --git a/pkg/v1/tarball/testdata/test_link.tar b/pkg/v1/tarball/testdata/test_link.tar
new file mode 100644
index 0000000000000000000000000000000000000000..e83064fed7467a4fee54b7f5aae3cfc25b704bc3
GIT binary patch
literal 29696
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
a_Z`{}W6zgxa|wN)@CbMWJObYjf&T%Z-Ao<;

literal 0
HcmV?d00001