go/goreleaser
go/goreleaser
1
0
Fork 0
mirror of https://github.com/goreleaser/goreleaser.git synced 2025-03-17 20:47:50 +02:00
Code Issues Releases Activity

fix(winget): replace forward slashes in Winget RelativeFilePath (#4195)

Browse Source 
If an archive filename contains `/` characters, they can sneak into
Winget's `RelativeFilePath`.
In this PR, I make sure that `RelativeFilePath` only uses `\` directory
separators.
This commit is contained in:
Carl Tashian 2023-07-18 11:34:07 -07:00 committed by GitHub
parent ca1657c2ec
commit 00bc248c1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/pipe/winget/testdata/TestRunPipe/wrapped-in-dir/wrapped-in-dir.installer.yaml.golden vendored
View File

@ -9,21 +9,21 @@ Installers:
- Architecture: x64
NestedInstallerType: portable
NestedInstallerFiles:
- RelativeFilePath: foo\foo.exe
- RelativeFilePath: foo\bin\foo.exe
InstallerUrl: https://dummyhost/download/v1.2.1/foo_windows_amd64v1.zip
InstallerSha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
UpgradeBehavior: uninstallPrevious
- Architecture: x86
NestedInstallerType: portable
NestedInstallerFiles:
- RelativeFilePath: foo\foo.exe
- RelativeFilePath: foo\bin\foo.exe
InstallerUrl: https://dummyhost/download/v1.2.1/foo_windows_386.zip
InstallerSha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
UpgradeBehavior: uninstallPrevious
- Architecture: arm64
NestedInstallerType: portable
NestedInstallerFiles:
- RelativeFilePath: foo\foo.exe
- RelativeFilePath: foo\bin\foo.exe
InstallerUrl: https://dummyhost/download/v1.2.1/foo_windows_arm64.zip
InstallerSha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
UpgradeBehavior: uninstallPrevious

9
internal/pipe/winget/winget.go
View File

@ -224,7 +224,7 @@ func (p Pipe) doRun(ctx *context.Context, winget config.Winget, cl client.Releas
folder := artifact.ExtraOr(*archive, artifact.ExtraWrappedIn, ".")
for _, bin := range artifact.ExtraOr(*archive, artifact.ExtraBinaries, []string{}) {
files = append(files, InstallerItemFile{
RelativeFilePath: windowsJoin([2]string{folder, bin}),
RelativeFilePath: strings.ReplaceAll(filepath.Join(folder, bin), "/", "\\"),
})
}
url, err := tmpl.New(ctx).WithArtifact(archive).Apply(winget.URLTemplate)
@ -397,10 +397,3 @@ func extFor(tp artifact.Type) string {
return ""
}
}
func windowsJoin(elem [2]string) string {
if elem[0] == "" {
return elem[1]
}
return elem[0] + "\\" + elem[1]
}

15
internal/pipe/winget/winget_test.go
View File

@ -602,15 +602,24 @@ func TestRunPipe(t *testing.T) {
goarch := "amd64"
createFakeArtifact("partial", goos, goarch, "v1", "", nil)
createFakeArtifact("foo", goos, goarch, "v1", "", nil)
createFakeArtifact("wrapped-in-dir", goos, goarch, "v1", "", map[string]any{artifact.ExtraWrappedIn: "foo"})
createFakeArtifact("wrapped-in-dir", goos, goarch, "v1", "", map[string]any{
artifact.ExtraWrappedIn: "foo",
artifact.ExtraBinaries: []string{"bin/foo.exe"},
})
goarch = "386"
createFakeArtifact("foo", goos, goarch, "", "", nil)
createFakeArtifact("wrapped-in-dir", goos, goarch, "", "", map[string]any{artifact.ExtraWrappedIn: "foo"})
createFakeArtifact("wrapped-in-dir", goos, goarch, "", "", map[string]any{
artifact.ExtraWrappedIn: "foo",
artifact.ExtraBinaries: []string{"bin/foo.exe"},
})
goarch = "arm64"
createFakeArtifact("foo", goos, goarch, "", "", nil)
createFakeArtifact("wrapped-in-dir", goos, goarch, "", "", map[string]any{artifact.ExtraWrappedIn: "foo"})
createFakeArtifact("wrapped-in-dir", goos, goarch, "", "", map[string]any{
artifact.ExtraWrappedIn: "foo",
artifact.ExtraBinaries: []string{"bin/foo.exe"},
})
client := client.NewMock()
pipe := Pipe{}