1
0
mirror of https://github.com/goreleaser/goreleaser.git synced 2025-01-24 04:16:27 +02:00
Carlos Alexandro Becker 3c7a63979c
test: ensure utf-8 sources/archives filenames work properly (#3925)
This now works for files added to the source archive **after** the `git
archive` command is run. During the `git archive`, it seems that the
`tar` is still using some format that doesn't support utf-8 by default.

Tomorrow I'll look more into it.

see https://pkg.go.dev/archive/tar#Format

closes #3812

---------

Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com>
Co-Authored-By: Mohammed Al Sahaf <msaa1990@gmail.com>
2023-04-15 15:48:14 -03:00

108 lines
2.3 KiB
Go

// Package tar implements the Archive interface providing tar archiving.
package tar
import (
"archive/tar"
"fmt"
"io"
"io/fs"
"os"
"github.com/goreleaser/goreleaser/pkg/config"
)
// Archive as tar.
type Archive struct {
tw *tar.Writer
files map[string]bool
}
// New tar archive.
func New(target io.Writer) Archive {
return Archive{
tw: tar.NewWriter(target),
files: map[string]bool{},
}
}
// Copying creates a new tar with the contents of the given tar.
func Copying(source io.Reader, target io.Writer) (Archive, error) {
w := New(target)
r := tar.NewReader(source)
for {
header, err := r.Next()
if err == io.EOF || header == nil {
break
}
if err != nil {
return Archive{}, err
}
w.files[header.Name] = true
if err := w.tw.WriteHeader(header); err != nil {
return w, err
}
if _, err := io.Copy(w.tw, r); err != nil {
return w, err
}
}
return w, nil
}
// Close all closeables.
func (a Archive) Close() error {
return a.tw.Close()
}
// Add file to the archive.
func (a Archive) Add(f config.File) error {
if _, ok := a.files[f.Destination]; ok {
return &fs.PathError{Err: fs.ErrExist, Path: f.Destination, Op: "add"}
}
a.files[f.Destination] = true
info, err := os.Lstat(f.Source) // #nosec
if err != nil {
return fmt.Errorf("%s: %w", f.Source, err)
}
var link string
if info.Mode()&os.ModeSymlink != 0 {
link, err = os.Readlink(f.Source) // #nosec
if err != nil {
return fmt.Errorf("%s: %w", f.Source, err)
}
}
header, err := tar.FileInfoHeader(info, link)
if err != nil {
return fmt.Errorf("%s: %w", f.Source, err)
}
header.Name = f.Destination
if !f.Info.ParsedMTime.IsZero() {
header.ModTime = f.Info.ParsedMTime
}
if f.Info.Mode != 0 {
header.Mode = int64(f.Info.Mode)
}
if f.Info.Owner != "" {
header.Uid = 0
header.Uname = f.Info.Owner
}
if f.Info.Group != "" {
header.Gid = 0
header.Gname = f.Info.Group
}
if err = a.tw.WriteHeader(header); err != nil {
return fmt.Errorf("%s: %w", f.Source, err)
}
if info.IsDir() || info.Mode()&os.ModeSymlink != 0 {
return nil
}
file, err := os.Open(f.Source) // #nosec
if err != nil {
return fmt.Errorf("%s: %w", f.Source, err)
}
defer file.Close()
if _, err := io.Copy(a.tw, file); err != nil {
return fmt.Errorf("%s: %w", f.Source, err)
}
return nil
}