vikunja
/
vikunja
6
43
Fork 71
Code Issues 150 Pull Requests 17 Packages Releases 32 Activity

Fix /dav/principals/*/ throwing a server error when accessed with GET instead of PROPFIND #769

Merged
konrad merged 1 commits from fix/caldav into master 2021-01-16 14:37:35 +00:00
Conversation 0 Commits 1 Files Changed 1 +9
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/routes/caldav/listStorageProvider.go
View File

@ -397,6 +397,11 @@ func (vlra *VikunjaListResourceAdapter) CalculateEtag() string {
if vlra.task != nil {
return `"` + strconv.FormatInt(vlra.task.ID, 10) + `-` + strconv.FormatInt(vlra.task.Updated.Unix(), 10) + `"`
}
if vlra.list == nil {
return ""
}
// This also returns the etag of the list, and not of the task,
// which becomes problematic because the client uses this etag (= the one from the list) to make
// Requests to update a task. These do not match and thus updating a task fails.
@ -439,6 +444,10 @@ func (vcls *VikunjaCaldavListStorage) getListRessource(isCollection bool) (rr Vi
s := db.NewSession()
defer s.Close()
if vcls.list == nil {
return
}
can, _, err := vcls.list.CanRead(s, vcls.user)
if err != nil {
_ = s.Rollback()