diff --git a/cmd/storagefuncs.go b/cmd/storagefuncs.go index 784a43ad0..5755e4fd1 100644 --- a/cmd/storagefuncs.go +++ b/cmd/storagefuncs.go @@ -225,7 +225,7 @@ func cmdExportStorage(fl Flags) (int, error) { } hdr := &tar.Header{ - Name: k, + Name: filepath.ToSlash(k), Mode: 0o600, Size: int64(len(v)), ModTime: info.Modified, diff --git a/cmd/storagefuncs_test.go b/cmd/storagefuncs_test.go index ef1d1596a..31cc53c0d 100644 --- a/cmd/storagefuncs_test.go +++ b/cmd/storagefuncs_test.go @@ -104,6 +104,18 @@ func TestImportStorageArchive(t *testing.T) { if code, err := cmdExportStorage(Flags{exportFlags}); err != nil || code != caddy.ExitCodeSuccess { t.Fatalf("export failed: code %d, error %v", code, err) } + outputFile, err := os.Open(output) + if err != nil { + t.Fatal(err) + } + exportedHeader, err := tar.NewReader(outputFile).Next() + outputFile.Close() + if err != nil { + t.Fatal(err) + } + if exportedHeader.Name != tc.key { + t.Fatalf("exported archive key %q, want %q", exportedHeader.Name, tc.key) + } if err := flags.Set("input", output); err != nil { t.Fatal(err) }