From 3b207a6028627d6149b91ec2140a7db6c61a9875 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Thu, 14 Mar 2024 16:38:15 +0100 Subject: [PATCH 1/2] feat: disable resharing by default --- changelog/unreleased/change-default-resharing.md | 5 +++++ services/frontend/pkg/config/defaults/defaultconfig.go | 2 +- services/graph/pkg/config/defaults/defaultconfig.go | 2 +- services/sharing/pkg/config/defaults/defaultconfig.go | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 changelog/unreleased/change-default-resharing.md diff --git a/changelog/unreleased/change-default-resharing.md b/changelog/unreleased/change-default-resharing.md new file mode 100644 index 00000000000..19a5f39550c --- /dev/null +++ b/changelog/unreleased/change-default-resharing.md @@ -0,0 +1,5 @@ +Change: Disable resharing by default for deprecation + +We disabled the resharing feature by default. This feature will be removed from the product in the next major release. The resharing feature is not recommended for use and should be disabled. Existing reshares will continue to work. + +https://github.com/owncloud/ocis/pull/8653 diff --git a/services/frontend/pkg/config/defaults/defaultconfig.go b/services/frontend/pkg/config/defaults/defaultconfig.go index 5a9b81c9acb..12d5d86240c 100644 --- a/services/frontend/pkg/config/defaults/defaultconfig.go +++ b/services/frontend/pkg/config/defaults/defaultconfig.go @@ -84,7 +84,7 @@ func DefaultConfig() *config.Config { UploadMaxChunkSize: 1e+7, UploadHTTPMethodOverride: "", DefaultUploadProtocol: "tus", - EnableResharing: true, + EnableResharing: false, DefaultLinkPermissions: 1, SearchMinLength: 3, Edition: "Community", diff --git a/services/graph/pkg/config/defaults/defaultconfig.go b/services/graph/pkg/config/defaults/defaultconfig.go index cb0ce6d0f16..13e04adb5f4 100644 --- a/services/graph/pkg/config/defaults/defaultconfig.go +++ b/services/graph/pkg/config/defaults/defaultconfig.go @@ -107,7 +107,7 @@ func DefaultConfig() *config.Config { EnableTLS: false, }, FilesSharing: config.FilesSharing{ - EnableResharing: true, + EnableResharing: false, }, } } diff --git a/services/sharing/pkg/config/defaults/defaultconfig.go b/services/sharing/pkg/config/defaults/defaultconfig.go index 20d86a739a4..6f0994fa2f5 100644 --- a/services/sharing/pkg/config/defaults/defaultconfig.go +++ b/services/sharing/pkg/config/defaults/defaultconfig.go @@ -35,7 +35,7 @@ func DefaultConfig() *config.Config { Name: "sharing", }, Reva: shared.DefaultRevaConfig(), - EnableResharing: true, + EnableResharing: false, UserSharingDriver: "jsoncs3", UserSharingDrivers: config.UserSharingDrivers{ JSON: config.UserSharingJSONDriver{ From 5787e68d9d9962e6fb81f64b7a3d012489f43dbd Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Thu, 14 Mar 2024 17:07:10 +0100 Subject: [PATCH 2/2] enable resharing in tests --- .drone.star | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.star b/.drone.star index 8d1d8da488e..cff8d36cafe 100644 --- a/.drone.star +++ b/.drone.star @@ -1957,6 +1957,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = "OCIS_EVENTS_ENABLE_TLS": False, "MICRO_REGISTRY": "nats-js-kv", "MICRO_REGISTRY_ADDRESS": "127.0.0.1:9233", + "OCIS_ENABLE_RESHARING": True, } if deploy_type == "":