From 196b6959da5e72f3bb0b6d33980ea5a731a81777 Mon Sep 17 00:00:00 2001 From: ston1th Date: Mon, 2 Sep 2019 10:25:36 +0200 Subject: [PATCH] added webdav filter for macos files --- go.mod | 4 ++-- go.sum | 6 ++++-- pkg/server/server.go | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 1b87c6d..51040d9 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module git.giftfish.de/ston1th/docstore go 1.12 require ( - git.giftfish.de/ston1th/authdav v1.0.0 + git.giftfish.de/ston1th/authdav v1.1.0 git.giftfish.de/ston1th/godrop/v2 v2.1.0 git.giftfish.de/ston1th/jwt/v3 v3.2.0 github.com/RoaringBitmap/roaring v0.4.17 // indirect @@ -33,5 +33,5 @@ require ( github.com/urfave/cli v1.20.0 go.etcd.io/bbolt v1.3.3 // indirect golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 - golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 + golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 ) diff --git a/go.sum b/go.sum index 91ddefe..173878f 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -git.giftfish.de/ston1th/authdav v1.0.0 h1:lbDLK/nW5K0kNzry9rYVp0leNCbZ0trAWcH55668OPg= -git.giftfish.de/ston1th/authdav v1.0.0/go.mod h1:LKpYWom0EiBKDHHqVTDvagBLxT1J7L8Nz+JRybHEDmw= +git.giftfish.de/ston1th/authdav v1.1.0 h1:hGNmaw/bNKETcV02JaS6NQaf3cKVFc3iyQ32QaAwXeo= +git.giftfish.de/ston1th/authdav v1.1.0/go.mod h1:UAVoOXY6jAVh0rOnIwy4wVWpLIPAom/EoptPkAhX1nQ= git.giftfish.de/ston1th/godrop/v2 v2.1.0 h1:vR4aWVeMGJ+tHQH0p44esZrSl5dYJzuCmZqhKWP/vwI= git.giftfish.de/ston1th/godrop/v2 v2.1.0/go.mod h1:z8KA3HP/vB04wddLXZfYVKURYDxBGau9hlHtV61x9mM= git.giftfish.de/ston1th/jwt/v3 v3.2.0 h1:V6Lh7OjXn4D3HPd/LoDf7w5N7cyiSXEPAQCIfSVZ05c= @@ -104,6 +104,8 @@ golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8U golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026144532-2772b66316d2/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/pkg/server/server.go b/pkg/server/server.go index aab94ff..cc1bbd4 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -111,6 +111,7 @@ func (s *HTTPServer) buildRoutes() http.Handler { r.NotFoundHandler = ¬FoundHandler{s} if s.Config.WebDav { fs := authdav.NewWriteOnlyOnceFileSystem(webdav.Dir(s.Config.DataDir)) + fs.Filters = []authdav.Filter{authdav.NewMacOSFilter()} h := authdav.NewWebdavBasicAuth(core.WebDavPrefix, fs, nil, webdavLogger, s.DB, "DocStore WebDav") r.PathPrefix(core.WebDavPrefix).Handler(h) }