Skip to content

fix(graph): apply the role allowlist to permission updates #3964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
butonic wants to merge 2 commits into
base: workpagages
Choose a base branch
from
Draft

fix(graph): apply the role allowlist to permission updates #3964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04ac120
fix(graph): apply the role allowlist to permission updates
butonic Nov 11, 2026
f1271ef
test: drop the blank line padding in updateShareInvitations
butonic Nov 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions services/graph/pkg/service/v0/api_driveitem_permissions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,8 @@ func (api DriveItemPermissionsApi) UpdatePermission(w http.ResponseWriter, r *ht
return
}

ctx := r.Context()
// enforce the admin role allowlist on updates, same as on invites
ctx := validate.ContextWithAllowedRoleIDs(r.Context(), api.config.UnifiedRoles.AvailableRoles)
if err = validate.StructCtx(ctx, permission); err != nil {
api.logger.Debug().Err(err).Interface("Body", r.Body).Msg("invalid request body")
errorcode.InvalidRequest.Render(w, r, http.StatusBadRequest, err.Error())
Expand Down Expand Up @@ -1046,7 +1047,8 @@ func (api DriveItemPermissionsApi) UpdateSpaceRootPermission(w http.ResponseWrit
return
}

ctx := r.Context()
// enforce the admin role allowlist on updates, same as on invites
ctx := validate.ContextWithAllowedRoleIDs(r.Context(), api.config.UnifiedRoles.AvailableRoles)
if err = validate.StructCtx(ctx, permission); err != nil {
api.logger.Debug().Err(err).Interface("Body", r.Body).Msg("invalid request body")
errorcode.InvalidRequest.Render(w, r, http.StatusBadRequest, err.Error())
Expand Down
22 changes: 22 additions & 0 deletions services/graph/pkg/validate/libregraph_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,28 @@ var _ = Describe("libregraph", func() {
}),
)

// Permission is validated when updating a permission (PATCH). It must honour the
// admin role allowlist just like DriveItemInvite does.
DescribeTable("Permission",
func(factory validatableFactory[libregraph.Permission]) {
s, pass := factory()
switch err := validate.StructCtx(ctx, s); pass {
case false:
Expect(err).To(HaveOccurred())
default:
Expect(err).ToNot(HaveOccurred())
}
},
Entry("fail: disabled role rejected when allowlist is set", func() (libregraph.Permission, bool) {
ctx = validate.ContextWithAllowedRoleIDs(ctx, []string{unifiedrole.UnifiedRoleEditorID})
return libregraph.Permission{Roles: []string{unifiedrole.UnifiedRoleSecureViewerID}}, false
}),
Entry("succeed: allowed role accepted when allowlist is set", func() (libregraph.Permission, bool) {
ctx = validate.ContextWithAllowedRoleIDs(ctx, []string{unifiedrole.UnifiedRoleEditorID})
return libregraph.Permission{Roles: []string{unifiedrole.UnifiedRoleEditorID}}, true
}),
)

DescribeTable("DriveRecipient",
func(factories ...validatableFactory[libregraph.DriveRecipient]) {
for _, factory := range factories {
Expand Down
186 changes: 40 additions & 146 deletions tests/acceptance/features/apiSharingNgShareInvitation/updateShareInvitations.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1183,7 +1183,7 @@ Feature: Update permission of a share
| Manager | Space Editor |

@issue-10768
Scenario Outline: sharer updates share permissions role of a resource to Secure Viewer without enabling it
Scenario Outline: sharer tries to update share permissions role of a resource to Secure Viewer without enabling it
Given user "Alice" has created folder "folderToShare"
And user "Alice" has uploaded file with content "hello world" to "textfile.txt"
And user "Alice" has sent the following resource share invitation:
Expand All @@ -1196,67 +1196,26 @@ Feature: Update permission of a share
| permissionsRole | Secure Viewer |
| space | Personal |
| resource | <resource> |
Then the HTTP status code should be "200"
Then the HTTP status code should be "400"
And the JSON data of the response should match
"""
{
"type": "object",
"required": [
"@libre.graph.permissions.actions",
"grantedToV2",
"id",
"invitation"
],
"required": ["error"],
"properties": {
"@libre.graph.permissions.actions": {
"const": [
"libre.graph/driveItem/path/read",
"libre.graph/driveItem/children/read",
"libre.graph/driveItem/basic/read"
]
},
"grantedToV2": {
"type": "object",
"required": ["user"],
"properties": {
"user": {
"type": "object",
"required": ["displayName", "id"],
"properties": {
"displayName": {
"const": "Brian Murphy"
},
"id": {
"pattern": "^%user_id_pattern%$"
}
}
}
}
},
"id": {
"pattern": "^%permissions_id_pattern%$"
},
"invitation": {
"error": {
"type": "object",
"required": ["invitedBy"],
"required": ["code", "innererror", "message"],
"properties": {
"invitedBy": {
"code": {
"const": "invalidRequest"
},
"innererror": {
"type": "object",
"required": ["user"],
"properties": {
"user": {
"type": "object",
"required": ["displayName", "id"],
"properties": {
"displayName": {
"const": "Alice Hansen"
},
"id": {
"pattern": "^%user_id_pattern%$"
}
}
}
}
"required": ["date", "request-id"]
},
"message": {
"const": "Key: 'Permission.Roles' Error:Field validation for 'Roles' failed on the 'available_role' tag"
}
}
}
Expand All @@ -1272,7 +1231,7 @@ Feature: Update permission of a share
| textfile.txt | Viewer |

@issue-10768
Scenario Outline: sharer updates share permissions role of a resource to Denied without enabling it
Scenario Outline: sharer tries to update share permissions role of a resource to Denied without enabling it
Given user "Alice" has created folder "folderToShare"
And user "Alice" has sent the following resource share invitation:
| resource | folderToShare |
Expand All @@ -1284,63 +1243,26 @@ Feature: Update permission of a share
| permissionsRole | Denied |
| space | Personal |
| resource | folderToShare |
Then the HTTP status code should be "200"
Then the HTTP status code should be "400"
And the JSON data of the response should match
"""
{
"type": "object",
"required": [
"@libre.graph.permissions.actions",
"grantedToV2",
"id",
"invitation"
],
"required": ["error"],
"properties": {
"@libre.graph.permissions.actions": {
"const": ["none"]
},
"grantedToV2": {
"type": "object",
"required": ["user"],
"properties": {
"user": {
"type": "object",
"required": ["displayName", "id"],
"properties": {
"displayName": {
"const": "Brian Murphy"
},
"id": {
"pattern": "^%user_id_pattern%$"
}
}
}
}
},
"id": {
"pattern": "^%permissions_id_pattern%$"
},
"invitation": {
"error": {
"type": "object",
"required": ["invitedBy"],
"required": ["code", "innererror", "message"],
"properties": {
"invitedBy": {
"code": {
"const": "invalidRequest"
},
"innererror": {
"type": "object",
"required": ["user"],
"properties": {
"user": {
"type": "object",
"required": ["displayName", "id"],
"properties": {
"displayName": {
"const": "Alice Hansen"
},
"id": {
"pattern": "^%user_id_pattern%$"
}
}
}
}
"required": ["date", "request-id"]
},
"message": {
"const": "Key: 'Permission.Roles' Error:Field validation for 'Roles' failed on the 'available_role' tag"
}
}
}
Expand All @@ -1354,7 +1276,7 @@ Feature: Update permission of a share
| Viewer |

@issue-10768
Scenario Outline: sharer updates share permissions role of space to Space Editor Without Versions without enabling it
Scenario Outline: sharer tries to update share permissions role of space to Space Editor Without Versions without enabling it
Given using spaces DAV path
And the administrator has assigned the role "Space Admin" to user "Alice" using the Graph API
And user "Alice" has created a space "new-space" with the default quota using the Graph API
Expand All @@ -1368,56 +1290,28 @@ Feature: Update permission of a share
| space | new-space |
| shareType | user |
| sharee | Brian |
Then the HTTP status code should be "200"
Then the HTTP status code should be "400"
And the JSON data of the response should match
"""
{
"type": "object",
"required": [
"@libre.graph.permissions.actions",
"grantedToV2",
"id"
],
"required": ["error"],
"properties": {
"@libre.graph.permissions.actions": {
"const": [
"libre.graph/driveItem/children/create",
"libre.graph/driveItem/standard/delete",
"libre.graph/driveItem/path/read",
"libre.graph/driveItem/quota/read",
"libre.graph/driveItem/content/read",
"libre.graph/driveItem/upload/create",
"libre.graph/driveItem/permissions/read",
"libre.graph/driveItem/children/read",
"libre.graph/driveItem/deleted/read",
"libre.graph/driveItem/path/update",
"libre.graph/driveItem/deleted/update",
"libre.graph/driveItem/basic/read"
]
},
"grantedToV2": {
"error": {
"type": "object",
"required": ["user"],
"properties":{
"user": {
"required": ["code", "innererror", "message"],
"properties": {
"code": {
"const": "invalidRequest"
},
"innererror": {
"type": "object",
"required": [
"displayName",
"id"
],
"properties": {
"displayName": {
"const": "Brian Murphy"
},
"id": {
"pattern": "^%user_id_pattern%$"
}
}
"required": ["date", "request-id"]
},
"message": {
"const": "Key: 'Permission.Roles' Error:Field validation for 'Roles' failed on the 'available_role' tag"
}
}
},
"id": {
"pattern": "^%permissions_id_pattern%$"
}
}
}
Expand Down
Loading