fix embed

Author: wxiaoguang

cmd/embedded.go

@@ -118,23 +118,23 @@ func initEmbeddedExtractor(c *cli.Command) error {
 
 func runList(_ context.Context, c *cli.Command) error {
 	if err := runListDo(c); err != nil {
-		fmt.Fprintf(os.Stderr, "%v\n", err)
+		_, _ = fmt.Fprintf(os.Stderr, "%v\n", err)
 		return err
 	}
 	return nil
 }
 
 func runView(_ context.Context, c *cli.Command) error {
 	if err := runViewDo(c); err != nil {
-		fmt.Fprintf(os.Stderr, "%v\n", err)
+		_, _ = fmt.Fprintf(os.Stderr, "%v\n", err)
 		return err
 	}
 	return nil
 }
 
 func runExtract(_ context.Context, c *cli.Command) error {
 	if err := runExtractDo(c); err != nil {
-		fmt.Fprintf(os.Stderr, "%v\n", err)
+		_, _ = fmt.Fprintf(os.Stderr, "%v\n", err)
 		return err
 	}
 	return nil
@@ -217,7 +217,7 @@ func runExtractDo(c *cli.Command) error {
 	for _, a := range matchedAssetFiles {
 		if err := extractAsset(destdir, a, overwrite, rename); err != nil {
 			// Non-fatal error
-			fmt.Fprintf(os.Stderr, "%s: %v", a.path, err)
+			_, _ = fmt.Fprintf(os.Stderr, "%s: %v\n", a.path, err)
 		}
 	}
 

modules/assetfs/embed.go

@@ -126,12 +126,21 @@ func (e *embeddedFS) ReadDir(name string) (l []fs.DirEntry, err error) {
 	}
 	l = make([]fs.DirEntry, len(fi.Children))
 	for i, child := range fi.Children {
-		l[i] = child
+		l[i], err = e.getFileInfo(name + "/" + child.BaseName)
+		if err != nil {
+			return nil, err
+		}
 	}
 	return l, nil
 }
 
 func (e *embeddedFS) getFileInfo(fullName string) (*embeddedFileInfo, error) {
+	// no need to do heavy "path.Clean()" because we don't want to support "foo/../bar" or absolute paths
+	fullName = strings.TrimPrefix(fullName, "./")
+	if fullName == "" {
+		fullName = "."
+	}
+
 	e.filesMu.RLock()
 	fi := e.files[fullName]
 	e.filesMu.RUnlock()
@@ -247,7 +256,7 @@ func (fi *embeddedFileInfo) Size() int64 {
 }
 
 func (fi *embeddedFileInfo) Mode() fs.FileMode {
-	return util.Iif[fs.FileMode](fi.IsDir(), 0o555, 0o444)
+	return util.Iif[fs.FileMode](fi.IsDir(), fs.ModeDir|0o555, 0o444)
 }
 
 func (fi *embeddedFileInfo) ModTime() time.Time {

modules/assetfs/embed_test.go

@@ -46,6 +46,8 @@ func TestEmbed(t *testing.T) {
 	assert.Equal(t, bytes.Repeat([]byte("a"), 1000), content)
 	fi, err = fs.Stat(efs, "foo/bar/b.txt")
 	require.NoError(t, err)
+	assert.False(t, fi.Mode().IsDir())
+	assert.True(t, fi.Mode().IsRegular())
 	gzipContent, ok := fi.(EmbeddedFileInfo).GetGzipContent()
 	assert.True(t, ok)
 	assert.Greater(t, len(gzipContent), 1)
@@ -67,6 +69,13 @@ func TestEmbed(t *testing.T) {
 	assert.Equal(t, "c.txt", entries[1].Name())
 	assert.False(t, entries[1].IsDir())
 
+	// test directory mode
+	fi, err = fs.Stat(efs, "foo")
+	require.NoError(t, err)
+	assert.True(t, fi.IsDir())
+	assert.True(t, fi.Mode().IsDir())
+	assert.False(t, fi.Mode().IsRegular())
+
 	// test httpfs
 	hfs := http.FS(efs)
 	hf, err := hfs.Open("foo/bar/b.txt")