From 45b1f4dd3ba898decbc3472b78bac081e6833cca Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 14 Jul 2023 06:27:15 -0400 Subject: Add support for different Maven POM encoding (#25873) (#25890) Backport #25873 by @KN4CK3R Fixes #25853 - Maven POM files aren't always UTF-8 encoded. - Reject the upload of unparsable POM files Co-authored-by: KN4CK3R --- modules/packages/maven/metadata.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'modules/packages/maven/metadata.go') diff --git a/modules/packages/maven/metadata.go b/modules/packages/maven/metadata.go index be057c8c07..42aa250718 100644 --- a/modules/packages/maven/metadata.go +++ b/modules/packages/maven/metadata.go @@ -8,6 +8,8 @@ import ( "io" "code.gitea.io/gitea/modules/validation" + + "golang.org/x/net/html/charset" ) // Metadata represents the metadata of a Maven package @@ -52,7 +54,10 @@ type pomStruct struct { // ParsePackageMetaData parses the metadata of a pom file func ParsePackageMetaData(r io.Reader) (*Metadata, error) { var pom pomStruct - if err := xml.NewDecoder(r).Decode(&pom); err != nil { + + dec := xml.NewDecoder(r) + dec.CharsetReader = charset.NewReaderLabel + if err := dec.Decode(&pom); err != nil { return nil, err } -- cgit v1.2.3