Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a proper XML header to error replies. #1828

Merged
merged 3 commits into from
Jun 29, 2021
Merged

Add a proper XML header to error replies. #1828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff4dac0
Add a proper XML header to error replies.
Jun 27, 2021
90a5f3d
Add a changelog entry for the missing xml header
Jun 28, 2021
d038308
Reverse if statement to follow golang style
Jun 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog/unreleased/xmlheadertoerrors.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Bugfix: send a proper XML header with error messages

https://github.com/cs3org/reva/pull/1828
6 changes: 5 additions & 1 deletion internal/http/services/owncloud/ocdav/error.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,17 @@ type exception struct {

// Marshal just calls the xml marshaller for a given exception.
func Marshal(e exception) ([]byte, error) {
return xml.Marshal(&errorXML{
xmlstring, err := xml.Marshal(&errorXML{
Xmlnsd: "DAV",
Xmlnss: "http://sabredav.org/ns",
Exception: codesEnum[e.code],
Message: e.message,
Header: e.header,
})
if err != nil {
return []byte(""), err
}
return []byte(xml.Header + string(xmlstring)), err
}

// http://www.webdav.org/specs/rfc4918.html#ELEMENT_error
Expand Down