ami/tl-vikunja
1
0
Fork 0
Code

fix(caldav): do not crash for wrong parameters

Browse Source
This commit is contained in:
kolaente 2024-06-06 11:05:32 +02:00
parent dd58d37db3
commit e7041f02d0
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,8 +125,8 @@ func (vcls *VikunjaCaldavProjectStorage) GetResources(rpath string, _ bool) ([]d
return resources, nil return resources, nil
} }
// GetResourcesByList fetches a project of resources from a slice of paths // GetResourcesByList fetches a list of resources from a slice of paths
func (vcls *VikunjaCaldavProjectStorage) GetResourcesByList(rpaths []string) ([]data.Resource, error) { func (vcls *VikunjaCaldavProjectStorage) GetResourcesByList(rpaths []string) (resources []data.Resource, err error) {
// Parse the set of resourcepaths into usable uids // Parse the set of resourcepaths into usable uids
// A path looks like this: /dav/projects/10/a6eb526d5748a5c499da202fe74f36ed1aea2aef.ics // A path looks like this: /dav/projects/10/a6eb526d5748a5c499da202fe74f36ed1aea2aef.ics
@ -134,9 +134,16 @@ func (vcls *VikunjaCaldavProjectStorage) GetResourcesByList(rpaths []string) ([]
var uids []string var uids []string
for _, path := range rpaths { for _, path := range rpaths {
parts := strings.Split(path, "/") parts := strings.Split(path, "/")
if len(parts) < 5 {
continue
}
uids = append(uids, strings.TrimSuffix(parts[4], ".ics")) uids = append(uids, strings.TrimSuffix(parts[4], ".ics"))
} }
if len(uids) == 0 {
return
}
s := db.NewSession() s := db.NewSession()
defer s.Close() defer s.Close()
@ -145,13 +152,13 @@ func (vcls *VikunjaCaldavProjectStorage) GetResourcesByList(rpaths []string) ([]
tasks, err := models.GetTasksByUIDs(s, uids, vcls.user) tasks, err := models.GetTasksByUIDs(s, uids, vcls.user)
if err != nil { if err != nil {
_ = s.Rollback() _ = s.Rollback()
return nil, err return
} }
if err := s.Commit(); err != nil { err = s.Commit()
return nil, err if err != nil {
return
} }
var resources []data.Resource
for _, t := range tasks { for _, t := range tasks {
rr := VikunjaProjectResourceAdapter{ rr := VikunjaProjectResourceAdapter{
task: t, task: t,
@ -161,7 +168,7 @@ func (vcls *VikunjaCaldavProjectStorage) GetResourcesByList(rpaths []string) ([]
resources = append(resources, r) resources = append(resources, r)
} }
return resources, nil return
} }
// GetResourcesByFilters fetches a project of resources with a filter // GetResourcesByFilters fetches a project of resources with a filter