Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbbe2baf

Browse files
authored
fix: Ignore all hidden files and folders in archive (#4382)
This also adds a suite of tests to ensure this cannot happen again!
1 parent3ad5e11 commitbbe2baf

File tree

2 files changed

+58
-1
lines changed

2 files changed

+58
-1
lines changed

‎provisionersdk/archive.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func Tar(directory string, limit int64) ([]byte, error) {
7575
iferr!=nil {
7676
returnerr
7777
}
78-
ifstrings.HasPrefix(rel,".") {
78+
ifstrings.HasPrefix(rel,".")||strings.HasPrefix(filepath.Base(rel),"."){
7979
iffileInfo.IsDir()&&rel!="." {
8080
// Don't archive hidden files!
8181
returnfilepath.SkipDir

‎provisionersdk/archive_test.go

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package provisionersdk_test
22

33
import (
4+
"fmt"
45
"os"
56
"path/filepath"
67
"testing"
@@ -30,6 +31,62 @@ func TestTar(t *testing.T) {
3031
_,err=provisionersdk.Tar(dir,1024)
3132
require.NoError(t,err)
3233
})
34+
t.Run("HiddenFiles",func(t*testing.T) {
35+
t.Parallel()
36+
dir:=t.TempDir()
37+
typefilestruct {
38+
Namestring
39+
Archivesbool
40+
}
41+
files:= []*file{{
42+
Name:"*.tf",
43+
Archives:true,
44+
}, {
45+
Name:".*",
46+
Archives:false,
47+
}, {
48+
Name:"./testing/.test/*.tf",
49+
Archives:false,
50+
}, {
51+
Name:"./testing/asd.*",
52+
Archives:true,
53+
}, {
54+
Name:".terraform/.*",
55+
Archives:false,
56+
}, {
57+
Name:"example/.terraform/*",
58+
Archives:false,
59+
}}
60+
for_,file:=rangefiles {
61+
newDir:=dir
62+
iffilepath.Base(file.Name)!=file.Name {
63+
newDir=filepath.Join(newDir,filepath.Dir(file.Name))
64+
err:=os.MkdirAll(newDir,0755)
65+
require.NoError(t,err)
66+
file.Name=filepath.Base(file.Name)
67+
}
68+
tmpFile,err:=os.CreateTemp(newDir,file.Name)
69+
require.NoError(t,err)
70+
_=tmpFile.Close()
71+
file.Name,err=filepath.Rel(dir,tmpFile.Name())
72+
require.NoError(t,err)
73+
fmt.Printf("rel")
74+
}
75+
content,err:=provisionersdk.Tar(dir,1024)
76+
require.NoError(t,err)
77+
dir=t.TempDir()
78+
err=provisionersdk.Untar(dir,content)
79+
require.NoError(t,err)
80+
for_,file:=rangefiles {
81+
_,err=os.Stat(filepath.Join(dir,file.Name))
82+
t.Logf("stat %q %+v",file.Name,err)
83+
iffile.Archives {
84+
require.NoError(t,err)
85+
}else {
86+
require.ErrorIs(t,err,os.ErrNotExist)
87+
}
88+
}
89+
})
3390
}
3491

3592
funcTestUntar(t*testing.T) {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp