1f349/go-webdav
4
0
Fork 0
mirror of https://github.com/1f349/go-webdav.git synced 2024-12-23 00:34:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

carddav: improve error handling

Browse Source
This commit is contained in:
Simon Ser 2020-01-08 18:54:29 +01:00
parent cb215c7037
commit 1be15ec875
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
carddav/carddav.go
View File

@ -53,9 +53,12 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
w = responseWriter{w} w = responseWriter{w}
switch r.Method { switch r.Method {
case "REPORT": case "REPORT":
status, _ := h.handleReport(w, r) code, err := h.handleReport(w, r)
if status != 0 { if err != nil {
w.WriteHeader(status) if code == 0 {
code = http.StatusInternalServerError
}
http.Error(w, err.Error(), code)
} }
case "OPTIONS": case "OPTIONS":
w.Header().Add("Allow", "REPORT") w.Header().Add("Allow", "REPORT")
@ -78,8 +81,10 @@ func (h *Handler) handleReport(w http.ResponseWriter, r *http.Request) (int, err
mg.Href = []string{r.URL.Path} mg.Href = []string{r.URL.Path}
} }
for _, href := range mg.Href { for _, href := range mg.Href {
pstats, status, _ := multiget(r.Context(), h.webdav.FileSystem, h.webdav.LockSystem, href, []xml.Name(mg.Prop), mg.Allprop != nil) pstats, status, err := multiget(r.Context(), h.webdav.FileSystem, h.webdav.LockSystem, href, []xml.Name(mg.Prop), mg.Allprop != nil)
// TODO: error handling if err != nil {
return status, err
}
resp := &webdav.Response{ resp := &webdav.Response{
Href: []string{(&url.URL{Path: href}).EscapedPath()}, Href: []string{(&url.URL{Path: href}).EscapedPath()},
@ -88,7 +93,7 @@ func (h *Handler) handleReport(w http.ResponseWriter, r *http.Request) (int, err
} }
if err := mw.Write(resp); err != nil { if err := mw.Write(resp); err != nil {
return http.StatusInternalServerError, err return 0, err
} }
} }
@ -114,7 +119,7 @@ func multiget(ctx context.Context, fs webdav.FileSystem, ls webdav.LockSystem, n
pstats, err = webdav.Props(ctx, fs, ls, name, pnames) pstats, err = webdav.Props(ctx, fs, ls, name, pnames)
} }
if err != nil { if err != nil {
return pstats, http.StatusInternalServerError, err return pstats, 0, err
} }
// TODO: locking stuff // TODO: locking stuff
@ -135,7 +140,10 @@ func multiget(ctx context.Context, fs webdav.FileSystem, ls webdav.LockSystem, n
return nil, http.StatusNotFound, err return nil, http.StatusNotFound, err
} }
prop, status, _ := addressdata(f.(*file).ao) prop, status, err := addressdata(f.(*file).ao)
if err != nil {
return nil, status, err
}
if status == 0 { if status == 0 {
status = http.StatusOK status = http.StatusOK
} }
@ -165,19 +173,19 @@ func addressdata(ao AddressObject) (webdav.Property, int, error) {
card, err := ao.Card() card, err := ao.Card()
if err != nil { if err != nil {
return prop, http.StatusInternalServerError, err return prop, 0, err
} }
// TODO: restrict to requested props // TODO: restrict to requested props
var b bytes.Buffer var b bytes.Buffer
if err := vcard.NewEncoder(&b).Encode(card); err != nil { if err := vcard.NewEncoder(&b).Encode(card); err != nil {
return prop, http.StatusInternalServerError, err return prop, 0, err
} }
var escaped bytes.Buffer var escaped bytes.Buffer
if err := xml.EscapeText(&escaped, b.Bytes()); err != nil { if err := xml.EscapeText(&escaped, b.Bytes()); err != nil {
return prop, http.StatusInternalServerError, err return prop, 0, err
} }
prop.InnerXML = escaped.Bytes() prop.InnerXML = escaped.Bytes()