maal/go-webdav
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

internal: introduce DecodeXMLRequest, ServeXML and ServeMultistatus

Browse Source
This commit is contained in:
Simon Ser
2020-01-19 11:12:45 +01:00
parent 60e5d57cda
commit f3f1c8b58a
2 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
carddav/server.go
View File

@@ -2,7 +2,6 @@ package carddav
import (
"encoding/xml"
"mime"
"net/http"
"github.com/emersion/go-vcard"
@@ -42,14 +41,9 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
func (h *Handler) handleReport(w http.ResponseWriter, r *http.Request) error {
t, _, _ := mime.ParseMediaType(r.Header.Get("Content-Type"))
if t != "application/xml" && t != "text/xml" {
return internal.HTTPErrorf(http.StatusBadRequest, "webdav: expected application/xml REPORT request")
}
var report reportReq
if err := xml.NewDecoder(r.Body).Decode(&report); err != nil {
return &internal.HTTPError{http.StatusBadRequest, err}
if err := internal.DecodeXMLRequest(r, &report); err != nil {
return err
}
if report.Query != nil {
@@ -87,10 +81,7 @@ func (h *Handler) handleMultiget(w http.ResponseWriter, multiget *addressbookMul
ms := internal.NewMultistatus(resps...)
w.Header().Add("Content-Type", "text/xml; charset=\"utf-8\"")
w.WriteHeader(http.StatusMultiStatus)
w.Write([]byte(xml.Header))
return xml.NewEncoder(w).Encode(&ms)
return internal.ServeMultistatus(w, ms)
}
type backend struct {