ToxicMushroom/tokidoki
1
0
Fork 0
mirror of https://git.sr.ht/~sircmpwn/tokidoki synced 2025-12-12 06:07:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Initial multi-calendar/address book support

Browse source 
Thanks to the latest version of go-webdav, this is now a thing. A lot of
operations (like creating a calendar) are not yet supported. But the
basics work fine. Note that multi-calendar means that different users
can each have their own calenders. Resource sharing is not yet
implemented either.

Includes the adding of a lot of debug logs, as issues are otherwise
pretty hard to figure out. The logging still needs to be made more
consistent, and probably cleaned up a bit in some places.
This commit is contained in:
Conrad Hoffmann 2024-02-02 22:19:36 +01:00
parent 1d871b000a
commit a74c76857d
7 changed files with 347 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

40
storage/filesystem.go
View file

@ -57,9 +57,20 @@ func ensureLocalDir(path string) error {
return nil
}
func (b *filesystemBackend) localDir(homeSetPath string, components ...string) (string, error) {
c := append([]string{b.path}, homeSetPath)
c = append(c, components...)
localPath := filepath.Join(c...)
if err := ensureLocalDir(localPath); err != nil {
return "", err
}
return localPath, nil
}
// don't use this directly, use localCalDAVPath or localCardDAVPath instead.
// note that homesetpath is expected to end in /
func (b *filesystemBackend) safeLocalPath(homeSetPath string, urlPath string) (string, error) {
localPath := filepath.Join(b.path, homeSetPath, defaultResourceName)
localPath := filepath.Join(b.path, homeSetPath)
if err := ensureLocalDir(localPath); err != nil {
return "", err
}
@ -69,27 +80,26 @@ func (b *filesystemBackend) safeLocalPath(homeSetPath string, urlPath string) (s
}
// We are mapping to local filesystem path, so be conservative about what to accept
// TODO this changes once multiple addess books are supported
dir, file := path.Split(urlPath)
// only accept resources in default calendar/adress book for now
if path.Clean(dir) != path.Join(homeSetPath, defaultResourceName) {
if strings.HasPrefix(dir, homeSetPath) {
err := fmt.Errorf("invalid request path: %s (%s is not %s)", urlPath, dir, path.Join(homeSetPath, defaultResourceName))
return "", webdav.NewHTTPError(400, err)
} else {
err := fmt.Errorf("access to resource outside of home set: %s", urlPath)
return "", webdav.NewHTTPError(403, err)
}
if strings.HasSuffix(urlPath, "/") {
urlPath = path.Clean(urlPath) + "/"
} else {
urlPath = path.Clean(urlPath)
}
if !strings.HasPrefix(urlPath, homeSetPath) {
err := fmt.Errorf("access to resource outside of home set: %s", urlPath)
return "", webdav.NewHTTPError(403, err)
}
urlPath = strings.TrimPrefix(urlPath, homeSetPath)
// only accept simple file names for now
if !validFilenameRegex.MatchString(file) {
dir, file := path.Split(urlPath)
if file != "" && !validFilenameRegex.MatchString(file) {
log.Debug().Str("file", file).Msg("file name does not match regex")
err := fmt.Errorf("invalid file name: %s", file)
return "", webdav.NewHTTPError(400, err)
}
// dir (= homeSetPath) is already included in path, so only file here
return filepath.Join(localPath, file), nil
return filepath.Join(localPath, dir, file), nil
}
func etagForFile(path string) (string, error) {