d8045b9569
Signed-off-by: liuxu <liuxu156@huawei.com> (cherry picked from commit 02485f7220d5756b18d1837705923206654482f2)
57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
From c7846fd24c16266a3bfd86315171f5b4d5f0c9c9 Mon Sep 17 00:00:00 2001
|
|
From: Imre Rad <imrer@google.com>
|
|
Date: Thu, 25 Apr 2024 14:21:51 +0000
|
|
Subject: [PATCH] gitRepo volume: directory must be max 1 level deep
|
|
|
|
More details on Hackerone #2266560
|
|
---
|
|
pkg/volume/git_repo/git_repo.go | 6 ++++++
|
|
pkg/volume/git_repo/git_repo_test.go | 14 ++++++++++++++
|
|
2 files changed, 20 insertions(+)
|
|
|
|
diff --git a/pkg/volume/git_repo/git_repo.go b/pkg/volume/git_repo/git_repo.go
|
|
index 995018d9007..b3827b92ad0 100644
|
|
--- a/pkg/volume/git_repo/git_repo.go
|
|
+++ b/pkg/volume/git_repo/git_repo.go
|
|
@@ -261,6 +261,12 @@ func validateVolume(src *v1.GitRepoVolumeSource) error {
|
|
if err := validateNonFlagArgument(src.Directory, "directory"); err != nil {
|
|
return err
|
|
}
|
|
+ if (src.Revision != "") && (src.Directory != "") {
|
|
+ cleanedDir := filepath.Clean(src.Directory)
|
|
+ if strings.Contains(cleanedDir, "/") || (strings.Contains(cleanedDir, "\\")) {
|
|
+ return fmt.Errorf("%q is not a valid directory, it must not contain a directory separator", src.Directory)
|
|
+ }
|
|
+ }
|
|
return nil
|
|
}
|
|
|
|
diff --git a/pkg/volume/git_repo/git_repo_test.go b/pkg/volume/git_repo/git_repo_test.go
|
|
index 5b1461be892..650f765cc48 100644
|
|
--- a/pkg/volume/git_repo/git_repo_test.go
|
|
+++ b/pkg/volume/git_repo/git_repo_test.go
|
|
@@ -267,6 +267,20 @@ func TestPlugin(t *testing.T) {
|
|
},
|
|
isExpectedFailure: true,
|
|
},
|
|
+ {
|
|
+ name: "invalid-revision-directory-combo",
|
|
+ vol: &v1.Volume{
|
|
+ Name: "vol1",
|
|
+ VolumeSource: v1.VolumeSource{
|
|
+ GitRepo: &v1.GitRepoVolumeSource{
|
|
+ Repository: gitURL,
|
|
+ Revision: "main",
|
|
+ Directory: "foo/bar",
|
|
+ },
|
|
+ },
|
|
+ },
|
|
+ isExpectedFailure: true,
|
|
+ },
|
|
}
|
|
|
|
for _, scenario := range scenarios {
|
|
--
|
|
2.34.1
|
|
|