From b95f4a05cf1b9d06d57462cae53c83c482ec79f4 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Mon, 13 May 2024 12:54:38 +0200 Subject: [PATCH] chore: bump reva to latest stable version 2.19.7 --- changelog/unreleased/bump-reva.md | 7 +++++++ go.mod | 2 +- go.sum | 2 ++ vendor/github.com/cs3org/reva/v2/pkg/storage/uploads.go | 1 + .../reva/v2/pkg/storage/utils/decomposedfs/upload.go | 7 +++++++ vendor/modules.txt | 2 +- 6 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 changelog/unreleased/bump-reva.md diff --git a/changelog/unreleased/bump-reva.md b/changelog/unreleased/bump-reva.md new file mode 100644 index 00000000000..512ba2e4852 --- /dev/null +++ b/changelog/unreleased/bump-reva.md @@ -0,0 +1,7 @@ +Bugfix: Update reva to v2.19.7 + +We updated reva to v2.19.7 + +* Enhancement [cs3org/reva#4673](https://github.com/cs3org/reva/pull/4673): Add virus filter to list uploads sessions + +https://github.com/owncloud/ocis/pull/9011 diff --git a/go.mod b/go.mod index a2e23397686..e37c1912371 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/cenkalti/backoff v2.2.1+incompatible github.com/coreos/go-oidc/v3 v3.9.0 github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781 - github.com/cs3org/reva/v2 v2.19.6 + github.com/cs3org/reva/v2 v2.19.7 github.com/dhowden/tag v0.0.0-20230630033851-978a0926ee25 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 2e9d44a20f0..1c9fd74586d 100644 --- a/go.sum +++ b/go.sum @@ -1021,6 +1021,8 @@ github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781 h1:BUdwkIlf8IS2F github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/reva/v2 v2.19.6 h1:n7fsTwdIN20vmQFkfOiJUbF2D7JFMLLMgOnEBRM5OTU= github.com/cs3org/reva/v2 v2.19.6/go.mod h1:GRUrOp5HbFVwZTgR9bVrMZ/MvVy+Jhxw1PdMmhhKP9E= +github.com/cs3org/reva/v2 v2.19.7 h1:0hMIbCZq1VBSxAslEvDDkj1Si8RqxbxR0wx3JvIRXTE= +github.com/cs3org/reva/v2 v2.19.7/go.mod h1:GRUrOp5HbFVwZTgR9bVrMZ/MvVy+Jhxw1PdMmhhKP9E= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= diff --git a/vendor/github.com/cs3org/reva/v2/pkg/storage/uploads.go b/vendor/github.com/cs3org/reva/v2/pkg/storage/uploads.go index f6ef9ad2d72..50a8fe0eb4f 100644 --- a/vendor/github.com/cs3org/reva/v2/pkg/storage/uploads.go +++ b/vendor/github.com/cs3org/reva/v2/pkg/storage/uploads.go @@ -86,4 +86,5 @@ type UploadSessionFilter struct { ID *string Processing *bool Expired *bool + HasVirus *bool } diff --git a/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/upload.go b/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/upload.go index 06d1583da6f..df83878895f 100644 --- a/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/upload.go +++ b/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/upload.go @@ -376,6 +376,13 @@ func (fs *Decomposedfs) ListUploadSessions(ctx context.Context, filter storage.U } } } + if filter.HasVirus != nil { + sr, _ := session.ScanData() + infected := sr != "" + if *filter.HasVirus != infected { + continue + } + } filteredSessions = append(filteredSessions, session) } return filteredSessions, nil diff --git a/vendor/modules.txt b/vendor/modules.txt index f266b335a94..e0f65fd0ebb 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -359,7 +359,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.19.6 +# github.com/cs3org/reva/v2 v2.19.7 ## explicit; go 1.21 github.com/cs3org/reva/v2/cmd/revad/internal/grace github.com/cs3org/reva/v2/cmd/revad/runtime