diff options
author | KN4CK3R <admin@oldschoolhack.me> | 2023-07-14 11:39:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-14 09:39:15 +0000 |
commit | bd82d8974e84eeff8072c962c7253db3f4128f69 (patch) | |
tree | ced9fba1fc79a530167f94fa9f58fe2e7f3028c2 /modules/packages/maven/metadata.go | |
parent | dc679fc9faf3c661d23849f3cc1c3e02f995f74f (diff) | |
download | gitea-bd82d8974e84eeff8072c962c7253db3f4128f69.tar.gz gitea-bd82d8974e84eeff8072c962c7253db3f4128f69.zip |
Add support for different Maven POM encoding (#25873)
Fixes #25853
- Maven POM files aren't always UTF-8 encoded.
- Reject the upload of unparsable POM files
Diffstat (limited to 'modules/packages/maven/metadata.go')
-rw-r--r-- | modules/packages/maven/metadata.go | 7 |
1 files changed, 6 insertions, 1 deletions
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 } |