octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-12-22 02:48:55 +00:00
Code Issues Releases Wiki Activity

in tar dump, convert uid, gid of value -1 to zero

Browse Source
This commit is contained in:
Panagiotis Cheilaris 2022-12-27 16:36:04 +01:00
parent 90fb6f70b4
commit 10fa5cde0a
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
changelog/unreleased/issue-4103 Normal file
View File

@ -0,0 +1,12 @@
Bugfix: fix restic dump of tar file with 32-bit binary
In restic up to 0.14.0, the restic dump from a 32-bit binary of a
snapshot of standard input that was created in Windows has as a
result a tar file whose content has a negative uid and gid. As a
result, gnu tar exits with failure status whenever it tries to
access such a tar file. With this fix, the tar file that is now
dumped from a 32-bit binary has content with non-negative uid and
gid.
https://github.com/restic/restic/issues/4103
https://github.com/restic/restic/pull/4104

13
internal/dump/tar.go
View File

@ -3,6 +3,7 @@ package dump
import (
"archive/tar"
"context"
"math"
"os"
"path/filepath"
"strings"
@ -38,6 +39,14 @@ const (
cISVTX = 0o1000 // Save text (sticky bit)
)
// substitute a uid or gid of -1 (which is converted to 2^32 - 1) with zero
func tarId(id uint32) int {
if id == math.MaxUint32 {
return 0
}
return int(id)
}
func (d *Dumper) dumpNodeTar(ctx context.Context, node *restic.Node, w *tar.Writer) error {
relPath, err := filepath.Rel("/", node.Path)
if err != nil {
@ -48,8 +57,8 @@ func (d *Dumper) dumpNodeTar(ctx context.Context, node *restic.Node, w *tar.Writ
Name: filepath.ToSlash(relPath),
Size: int64(node.Size),
Mode: int64(node.Mode.Perm()), // cIS* constants are added later
Uid: int(node.UID),
Gid: int(node.GID),
Uid: tarId(node.UID),
Gid: tarId(node.GID),
Uname: node.User,
Gname: node.Group,
ModTime: node.ModTime,