Skip to content
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

[test-only] enable again denyAccess tests #11959

Merged
merged 2 commits into from
Nov 26, 2024
Merged

[test-only] enable again denyAccess tests #11959

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
a4e701e
enable again denyAccess tests
ScharfViktor Nov 25, 2024
36c6b04
fix
ScharfViktor Nov 25, 2024
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
2 changes: 1 addition & 1 deletion .drone.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# The version of OCIS to use in pipelines that test against OCIS
OCIS_COMMITID=fbb319f3babdd8fbd82d5bd4becf8feb3a456fa4
OCIS_COMMITID=b5decc675cd515e2a272abddb3ecddf5445c32bc
OCIS_BRANCH=master
3 changes: 1 addition & 2 deletions .drone.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,11 +949,10 @@ def ocisService(extra_env_config = {}, deploy_type = "ocis"):
"PROXY_ENABLE_BASIC_AUTH": True,
"WEB_ASSET_CORE_PATH": "%s/dist" % dir["web"],
"FRONTEND_SEARCH_MIN_LENGTH": "2",
"FRONTEND_OCS_ENABLE_DENIALS": True,
"OCIS_PASSWORD_POLICY_BANNED_PASSWORDS_LIST": "%s/tests/drone/banned-passwords.txt" % dir["web"],
"PROXY_CSP_CONFIG_FILE_LOCATION": "%s/tests/drone/csp.yaml" % dir["web"],
# Needed for enabling all roles
"GRAPH_AVAILABLE_ROLES": "b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5,a8d5fe5e-96e3-418d-825b-534dbdf22b99,fb6c3e19-e378-47e5-b277-9732f9de6e21,58c63c02-1d89-4572-916a-870abc5a1b7d,2d00ce52-1fc2-4dbc-8b95-a73b73395f5a,1c996275-f1c9-4e71-abdf-a42f6495e960,312c0871-5ef7-4b3a-85b6-0e4074c64049,aa97fe03-7980-45ac-9e50-b325749fd7e6",
"GRAPH_AVAILABLE_ROLES": "b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5,a8d5fe5e-96e3-418d-825b-534dbdf22b99,fb6c3e19-e378-47e5-b277-9732f9de6e21,58c63c02-1d89-4572-916a-870abc5a1b7d,2d00ce52-1fc2-4dbc-8b95-a73b73395f5a,1c996275-f1c9-4e71-abdf-a42f6495e960,312c0871-5ef7-4b3a-85b6-0e4074c64049,aa97fe03-7980-45ac-9e50-b325749fd7e6,63e64e19-8d43-42ec-a738-2b6af2610efa",
}

if deploy_type == "federation":
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ services:
COLLABORA_DOMAIN: host.docker.internal:9980
FRONTEND_APP_HANDLER_SECURE_VIEW_APP_ADDR: com.owncloud.api.collaboration.Collabora
# Needed for enabling all roles
GRAPH_AVAILABLE_ROLES: b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5,a8d5fe5e-96e3-418d-825b-534dbdf22b99,fb6c3e19-e378-47e5-b277-9732f9de6e21,58c63c02-1d89-4572-916a-870abc5a1b7d,2d00ce52-1fc2-4dbc-8b95-a73b73395f5a,1c996275-f1c9-4e71-abdf-a42f6495e960,312c0871-5ef7-4b3a-85b6-0e4074c64049,aa97fe03-7980-45ac-9e50-b325749fd7e6
GRAPH_AVAILABLE_ROLES: b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5,a8d5fe5e-96e3-418d-825b-534dbdf22b99,fb6c3e19-e378-47e5-b277-9732f9de6e21,58c63c02-1d89-4572-916a-870abc5a1b7d,2d00ce52-1fc2-4dbc-8b95-a73b73395f5a,1c996275-f1c9-4e71-abdf-a42f6495e960,312c0871-5ef7-4b3a-85b6-0e4074c64049,aa97fe03-7980-45ac-9e50-b325749fd7e6,63e64e19-8d43-42ec-a738-2b6af2610efa
labels:
traefik.enable: true
traefik.http.routers.ocis.tls: true
Expand Down
81 changes: 41 additions & 40 deletions tests/e2e/cucumber/features/shares/denyShareAccess.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,43 @@
Feature: deny share access

# FIXME: enable as soon as sharing NG supports it
# Scenario: deny and grant access
# Given "Admin" creates following users using API
# | id |
# | Alice |
# | Brian |
# When "Alice" logs in
# And "Alice" creates the following folder in personal space using API
# | name |
# | folder_to_shared |
# | folder_to_shared/folder |
# | folder_to_shared/folder_to_deny |
# And "Alice" opens the "files" app
# And "Alice" shares the following resource using the quick action
# | resource | recipient | type | role | resourceType |
# | folder_to_shared | Brian | user | Can view | folder |
# And "Alice" opens folder "folder_to_shared"
# When "Alice" denies access to the following resources for user "Brian" using the sidebar panel
# | resource |
# | folder_to_deny |
# And "Brian" logs in
# And "Brian" opens the "files" app
# And "Brian" navigates to the shared with me page
# And "Brian" opens folder "folder_to_shared"
# Then following resources should not be displayed in the files list for user "Brian"
# | resource |
# | folder_to_deny |
# And "Alice" opens the "files" app
# And "Alice" opens folder "folder_to_shared"
# When "Alice" grants access to the following resources for user "Brian" using the sidebar panel
# | resource |
# | folder_to_deny |
# And "Brian" opens the "files" app
# And "Brian" navigates to the shared with me page
# And "Brian" opens folder "folder_to_shared"
# Then following resources should be displayed in the files list for user "Brian"
# | resource |
# | folder_to_deny |
# And "Brian" logs out
# And "Alice" logs out
Scenario: deny and grant access
Given "Admin" creates following users using API
| id |
| Alice |
| Brian |
When "Alice" logs in
And "Alice" creates the following folder in personal space using API
| name |
| folder_to_shared |
| folder_to_shared/folder |
| folder_to_shared/folder_to_deny |
And "Alice" opens the "files" app
And "Alice" shares the following resource using the quick action
| resource | recipient | type | role | resourceType |
| folder_to_shared | Brian | user | Can view | folder |
And "Alice" opens folder "folder_to_shared"
# deny access
When "Alice" shares the following resource using the sidebar panel
| resource | recipient | type | role | resourceType |
| folder_to_deny | Brian | user | Cannot access | folder |
And "Brian" logs in
And "Brian" opens the "files" app
And "Brian" navigates to the shared with me page
And "Brian" opens folder "folder_to_shared"
Then following resources should not be displayed in the files list for user "Brian"
| resource |
| folder_to_deny |
And "Alice" opens the "files" app
And "Alice" opens folder "folder_to_shared"
# allow access - deleting "Cannot access" share
When "Alice" removes following sharee
| resource | recipient |
| folder_to_deny | Brian |
And "Brian" opens the "files" app
And "Brian" navigates to the shared with me page
And "Brian" opens folder "folder_to_shared"
Then following resources should be displayed in the files list for user "Brian"
| resource |
| folder_to_deny |
And "Brian" logs out
And "Alice" logs out
46 changes: 46 additions & 0 deletions tests/e2e/cucumber/features/spaces/denySpaceAccess.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
Feature: deny space access

Scenario: deny and grant access
Given "Admin" creates following users using API
| id |
| Alice |
| Brian |
And "Admin" assigns following roles to the users using API
| id | role |
| Alice | Space Admin |
And "Alice" logs in
And "Alice" creates the following project space using API
| name | id |
| sales | sales |
And "Alice" creates the following folder in space "sales" using API
| name |
| f1 |
| f2 |
And "Alice" adds the following members to the space "sales" using API
| user | role | shareType |
| Brian | Can edit | user |

When "Alice" navigates to the project space "sales"
# deny access
When "Alice" shares the following resource using the sidebar panel
| resource | recipient | type | role | resourceType |
| f1 | Brian | user | Cannot access | folder |
And "Brian" logs in
And "Brian" navigates to the project space "sales"
Then following resources should not be displayed in the files list for user "Brian"
| resource |
| f1 |
But following resources should be displayed in the files list for user "Brian"
| resource |
| f2 |
# allow access - deleting "Cannot access" share
When "Alice" removes following sharee
| resource | recipient |
| f1 | Brian |
And "Brian" navigates to the project space "sales"
Then following resources should be displayed in the files list for user "Brian"
| resource |
| f1 |
| f2 |
And "Brian" logs out
And "Alice" logs out
29 changes: 0 additions & 29 deletions tests/e2e/cucumber/steps/ui/shares.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,35 +237,6 @@ Then(
}
)

When(
/^"([^"]*)" (grants|denies) access to the following resources(?:s)? for (group|user) "([^"]*)" using the sidebar panel?$/,
async function (
this: World,
stepUser: string,
actionType: string,
collaboratorType: 'user' | 'group',
collaborator: string,
stepTable: DataTable
): Promise<void> {
const { page } = this.actorsEnvironment.getActor({ key: stepUser })
const shareObject = new objects.applicationFiles.Share({ page })

for (const { resource } of stepTable.hashes()) {
await shareObject.setDenyShare({
resource,
deny: actionType === 'denies',
collaborator: {
collaborator:
collaboratorType === 'group'
? this.usersEnvironment.getGroup({ key: collaborator })
: this.usersEnvironment.getUser({ key: collaborator }),
type: collaboratorType
} as ICollaborator
})
}
}
)

When(
/^"([^"]*)" sets the expiration date of share "([^"]*)" of (group|user) "([^"]*)" to "([^"]*)"?$/,
async function (
Expand Down
4 changes: 3 additions & 1 deletion tests/e2e/support/api/share/share.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@ export const shareRoles: Readonly<{
'Can edit': string
'Can view': string
'Secret File Drop': string
'Cannot access': string
}> = {
'Invited people': 'internal',
'Can upload': 'contributor',
'Can manage': 'manager',
'Can edit': 'editor',
'Can view': 'viewer',
'Secret File Drop': 'uploader'
'Secret File Drop': 'uploader',
'Cannot access': 'denied'
} as const

export const linkShareRoles: Readonly<{
Expand Down
13 changes: 0 additions & 13 deletions tests/e2e/support/objects/app-files/share/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,19 +203,6 @@ export const checkSharee = async (args: ShareArgs): Promise<void> => {
}
}

export interface setDenyShareArgs {
page: Page
resource: string
deny: boolean
collaborator: ICollaborator
}

export const setDenyShare = async (args: setDenyShareArgs): Promise<void> => {
const { page, resource, deny, collaborator } = args
await openSharingPanel(page, resource)
await Collaborator.setDenyShareForCollaborator({ page, deny, collaborator })
}

export const addExpirationDate = async (args: {
page: Page
resource: string
Expand Down
33 changes: 1 addition & 32 deletions tests/e2e/support/objects/app-files/share/collaborator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ export default class Collaborator {

await page
.locator(util.format(Collaborator.collaboratorEditDropdownButton, collaboratorRow))
.first()
.click()
await page.locator(util.format(Collaborator.removeCollaboratorButton, collaboratorRow)).click()

Expand Down Expand Up @@ -304,38 +305,6 @@ export default class Collaborator {
: util.format(Collaborator.collaboratorUserSelector, collaborator.displayName)
}

static async setDenyShareForCollaborator(args: SetDenyShareForCollaboratorArgs): Promise<void> {
const {
page,
collaborator: { collaborator, type },
deny
} = args
const collaboratorRow = Collaborator.getCollaboratorUserOrGroupSelector(collaborator, type)
await page.locator(collaboratorRow).waitFor()

await page
.locator(util.format(Collaborator.collaboratorEditDropdownButton, collaboratorRow))
.click()

await Promise.all([
page.waitForResponse(
(resp) =>
resp.url().includes('shares') &&
resp.status() === 200 &&
resp.request().method() === (deny ? 'POST' : 'DELETE')
),
page
.locator(
util.format(
Collaborator.denyShareCollaboratorButton,
collaboratorRow,
deny ? 'false' : 'true'
)
)
.click()
])
}

static async getAccessDetails(
page: Page,
recipient: Omit<ICollaborator, 'role'>
Expand Down
6 changes: 0 additions & 6 deletions tests/e2e/support/objects/app-files/share/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,6 @@ export class Share {
return await resourceIsSynced({ page: this.#page, resource })
}

async setDenyShare(args: Omit<po.setDenyShareArgs, 'page'>): Promise<void> {
const startUrl = this.#page.url()
await po.setDenyShare({ ...args, page: this.#page })
await this.#page.goto(startUrl)
}

async addExpirationDate({
resource,
collaborator,
Expand Down