From 76ee77c8359f358556ea30cec5d709aff374f96c Mon Sep 17 00:00:00 2001 From: jkoberg Date: Tue, 23 May 2023 15:41:15 +0200 Subject: [PATCH] bump reva Signed-off-by: jkoberg --- go.mod | 2 +- go.sum | 4 +-- .../http/services/owncloud/ocdav/copy.go | 26 +++++++++++-------- .../owncloud/ocs/data/capabilities.go | 1 + vendor/modules.txt | 2 +- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index b8ac03911b..9b9ecc84f2 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/coreos/go-oidc v2.2.1+incompatible github.com/coreos/go-oidc/v3 v3.6.0 github.com/cs3org/go-cs3apis v0.0.0-20230516150832-730ac860c71d - github.com/cs3org/reva/v2 v2.13.4-0.20230522082327-0d66bdd610d3 + github.com/cs3org/reva/v2 v2.13.4-0.20230523132457-4fb99464ab8d github.com/disintegration/imaging v1.6.2 github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e github.com/egirna/icap-client v0.1.1 diff --git a/go.sum b/go.sum index aba4cc66f8..7f13da01a9 100644 --- a/go.sum +++ b/go.sum @@ -627,8 +627,8 @@ github.com/crewjam/httperr v0.2.0 h1:b2BfXR8U3AlIHwNeFFvZ+BV1LFvKLlzMjzaTnZMybNo github.com/crewjam/httperr v0.2.0/go.mod h1:Jlz+Sg/XqBQhyMjdDiC+GNNRzZTD7x39Gu3pglZ5oH4= github.com/crewjam/saml v0.4.13 h1:TYHggH/hwP7eArqiXSJUvtOPNzQDyQ7vwmwEqlFWhMc= github.com/crewjam/saml v0.4.13/go.mod h1:igEejV+fihTIlHXYP8zOec3V5A8y3lws5bQBFsTm4gA= -github.com/cs3org/reva/v2 v2.13.4-0.20230522082327-0d66bdd610d3 h1:YGqR0xnslU9wkQ8/XhZE0fJ87u5meecdvOQ15VKFiFM= -github.com/cs3org/reva/v2 v2.13.4-0.20230522082327-0d66bdd610d3/go.mod h1:jkngU/36YdFNQfFurjgKl8URY2dkhwgJ5gQXt1GUoPw= +github.com/cs3org/reva/v2 v2.13.4-0.20230523132457-4fb99464ab8d h1:Wuz6lxPY022NP9052zcDFpnqhLkDtik11fYHX1NLF74= +github.com/cs3org/reva/v2 v2.13.4-0.20230523132457-4fb99464ab8d/go.mod h1:jkngU/36YdFNQfFurjgKl8URY2dkhwgJ5gQXt1GUoPw= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= diff --git a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/copy.go b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/copy.go index 8fd20484e4..4dc25f6bb8 100644 --- a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/copy.go +++ b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/copy.go @@ -616,18 +616,22 @@ func (s *svc) prepareCopy(ctx context.Context, w http.ResponseWriter, r *http.Re return nil } - // delete existing tree - delReq := &provider.DeleteRequest{Ref: dstRef} - delRes, err := s.gwClient.Delete(ctx, delReq) - if err != nil { - log.Error().Err(err).Msg("error sending grpc delete request") - w.WriteHeader(http.StatusInternalServerError) - return nil - } + // delete existing tree when overwriting a directory or replacing a file with a directory + if dstStatRes.Info.Type == provider.ResourceType_RESOURCE_TYPE_CONTAINER || + (dstStatRes.Info.Type == provider.ResourceType_RESOURCE_TYPE_FILE && + srcStatRes.Info.Type == provider.ResourceType_RESOURCE_TYPE_CONTAINER) { + delReq := &provider.DeleteRequest{Ref: dstRef} + delRes, err := s.gwClient.Delete(ctx, delReq) + if err != nil { + log.Error().Err(err).Msg("error sending grpc delete request") + w.WriteHeader(http.StatusInternalServerError) + return nil + } - if delRes.Status.Code != rpc.Code_CODE_OK && delRes.Status.Code != rpc.Code_CODE_NOT_FOUND { - errors.HandleErrorStatus(log, w, delRes.Status) - return nil + if delRes.Status.Code != rpc.Code_CODE_OK && delRes.Status.Code != rpc.Code_CODE_NOT_FOUND { + errors.HandleErrorStatus(log, w, delRes.Status) + return nil + } } } else if p := path.Dir(dstRef.Path); p != "" { // check if an intermediate path / the parent exists diff --git a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/data/capabilities.go b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/data/capabilities.go index 281918da7d..300a17a857 100644 --- a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/data/capabilities.go +++ b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/data/capabilities.go @@ -148,6 +148,7 @@ type CapabilitiesFiles struct { Undelete ocsBool `json:"undelete" xml:"undelete"` Versioning ocsBool `json:"versioning" xml:"versioning"` Favorites ocsBool `json:"favorites" xml:"favorites"` + FullTextSearch ocsBool `json:"full_text_search" xml:"full_text_search" mapstructure:"full_text_search"` Tags ocsBool `json:"tags" xml:"tags"` BlacklistedFiles []string `json:"blacklisted_files" xml:"blacklisted_files>element" mapstructure:"blacklisted_files"` TusSupport *CapabilitiesFilesTusSupport `json:"tus_support" xml:"tus_support" mapstructure:"tus_support"` diff --git a/vendor/modules.txt b/vendor/modules.txt index 514b67a67d..1b766a56d5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -349,7 +349,7 @@ github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1 github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1 github.com/cs3org/go-cs3apis/cs3/tx/v1beta1 github.com/cs3org/go-cs3apis/cs3/types/v1beta1 -# github.com/cs3org/reva/v2 v2.13.4-0.20230522082327-0d66bdd610d3 +# github.com/cs3org/reva/v2 v2.13.4-0.20230523132457-4fb99464ab8d ## explicit; go 1.19 github.com/cs3org/reva/v2/cmd/revad/internal/grace github.com/cs3org/reva/v2/cmd/revad/runtime