From 6e7bafb9e713cdd6ad540a5fcfbab386e2918f02 Mon Sep 17 00:00:00 2001 From: jkoberg Date: Wed, 2 Oct 2024 11:24:56 +0200 Subject: [PATCH] fix(graph): avoid panic when deleting ocm shares Signed-off-by: jkoberg --- changelog/unreleased/fix-delete-share-panic.md | 5 +++++ services/graph/pkg/service/v0/utils.go | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 changelog/unreleased/fix-delete-share-panic.md diff --git a/changelog/unreleased/fix-delete-share-panic.md b/changelog/unreleased/fix-delete-share-panic.md new file mode 100644 index 000000000..0d1ec26a8 --- /dev/null +++ b/changelog/unreleased/fix-delete-share-panic.md @@ -0,0 +1,5 @@ +Bugfix: Fix delete share panic + +Fixes a panic when deleting an ocm share + +https://github.com/owncloud/ocis/pull/10219 diff --git a/services/graph/pkg/service/v0/utils.go b/services/graph/pkg/service/v0/utils.go index 3e5174aee..b554d5267 100644 --- a/services/graph/pkg/service/v0/utils.go +++ b/services/graph/pkg/service/v0/utils.go @@ -500,10 +500,10 @@ func roleConditionForResourceType(ri *storageprovider.ResourceInfo) (string, err } func federatedRoleConditionForResourceType(ri *storageprovider.ResourceInfo) (string, error) { - switch { - case ri.Type == storageprovider.ResourceType_RESOURCE_TYPE_CONTAINER: + switch ri.GetType() { + case storageprovider.ResourceType_RESOURCE_TYPE_CONTAINER: return unifiedrole.UnifiedRoleConditionFolderFederatedUser, nil - case ri.Type == storageprovider.ResourceType_RESOURCE_TYPE_FILE: + case storageprovider.ResourceType_RESOURCE_TYPE_FILE: return unifiedrole.UnifiedRoleConditionFileFederatedUser, nil default: return "", errorcode.New(errorcode.InvalidRequest, "unsupported resource type for federated role")