Skip to content

Add app config to allow groups of users to be lock breakers#38222

Merged
phil-davis merged 3 commits intomasterfrom
feature/lock-breaker-group
Aug 16, 2021
Merged

Add app config to allow groups of users to be lock breakers#38222
phil-davis merged 3 commits intomasterfrom
feature/lock-breaker-group

Conversation

@DeepDiver1975
Copy link
Copy Markdown
Member

@DeepDiver1975 DeepDiver1975 commented Dec 16, 2020 •
edited by JammingBen
Loading

Description

Members of the lock breaker groups can break locks of other users
The groups are setup in the admin's general settings

Related Issue

How Has This Been Tested?

  • define a group for lock breakers
  • add user A to this groups
  • user B shares folder with user A
  • B locks a file within that folder
  • A will see the lock
  • A can unlock the file aka break the lock of user B

Screenshots (if appropriate):

Screenshot from 2020-12-18 13-26-59

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

@DeepDiver1975 DeepDiver1975 force-pushed the feature/lock-breaker-group branch 2 times, most recently from cc1f096 to ca97f3d Compare December 17, 2020 14:56
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Dec 17, 2020

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@DeepDiver1975 DeepDiver1975 self-assigned this Dec 18, 2020
@DeepDiver1975 DeepDiver1975 force-pushed the feature/lock-breaker-group branch from ca97f3d to e5cf263 Compare December 18, 2020 14:41
@DeepDiver1975 DeepDiver1975 marked this pull request as ready for review December 18, 2020 14:56
@mmattel
Copy link
Copy Markdown
Contributor

mmattel commented Jan 14, 2021

Reminder: docs relevant if merged

@DeepDiver1975 DeepDiver1975 force-pushed the feature/lock-breaker-group branch from e5cf263 to 2ddccba Compare May 12, 2021 17:12
@pmaier1
Copy link
Copy Markdown
Contributor

pmaier1 commented May 21, 2021

@micbar go for 10.8?

@DeepDiver1975 DeepDiver1975 force-pushed the feature/lock-breaker-group branch from 2ddccba to e7a7662 Compare May 21, 2021 08:19
@mmattel
Copy link
Copy Markdown
Contributor

mmattel commented May 21, 2021

Reminder: docs relevant if merged, please file an issue

@DeepDiver1975 DeepDiver1975 force-pushed the feature/lock-breaker-group branch 2 times, most recently from 94e0fe7 to 50007f4 Compare May 21, 2021 13:06
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented May 21, 2021

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@micbar micbar requested review from jvillafanez and phil-davis and removed request for phil-davis May 25, 2021 08:29
@phil-davis
Copy link
Copy Markdown
Contributor

phil-davis commented May 25, 2021

There are already test scenarios in https://github.com/owncloud/core/tree/master/tests/acceptance/features/apiWebdavLocksUnlock that check who can unlock whose files/folders.

Should we add some scenarios that cover this new functionality of putting people in lock-breakers groups?

@owncloud owncloud deleted a comment from update-docs bot Jul 5, 2021
@micbar
Copy link
Copy Markdown
Contributor

micbar commented Jul 5, 2021

@DeepDiver1975 In which scope was this developed?

@DeepDiver1975
Copy link
Copy Markdown
Member Author

DeepDiver1975 commented Jul 7, 2021

I'll have a look and fix the different config keys .....

@DeepDiver1975 DeepDiver1975 force-pushed the feature/lock-breaker-group branch from 50007f4 to 48e560c Compare July 7, 2021 12:56
@DeepDiver1975
Copy link
Copy Markdown
Member Author

DeepDiver1975 commented Jul 7, 2021

rebased and issue fixed ...

@phil-davis phil-davis mentioned this pull request Jul 8, 2021
Closed
phil-davis
phil-davis reviewed Jul 8, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@phil-davis phil-davis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks OK. I did some manual testing with the webUI, and it works.

I raised issue #38851 to add some test scenarios. This PR can be merged, if needed, and the tests added later.

@DeepDiver1975 DeepDiver1975 force-pushed the feature/lock-breaker-group branch from d399238 to 3e5b396 Compare July 16, 2021 10:52
@DeepDiver1975
Copy link
Copy Markdown
Member Author

DeepDiver1975 commented Jul 16, 2021

rebased and git history cleandup ....

@JammingBen
Copy link
Copy Markdown
Contributor

JammingBen commented Jul 16, 2021

@DeepDiver1975 Can we move it to "Ready for review"? Or do you plan on adding more to it?

@DeepDiver1975
Copy link
Copy Markdown
Member Author

DeepDiver1975 commented Jul 16, 2021

Or do you plan on adding more to it?

no - I am done! THX

@SwikritiT SwikritiT mentioned this pull request Jul 19, 2021
Merged
11 tasks
@phil-davis phil-davis force-pushed the feature/lock-breaker-group branch from 1513243 to 76b9dad Compare July 19, 2021 12:58
@phil-davis
Copy link
Copy Markdown
Contributor

phil-davis commented Jul 19, 2021

I squashed all the API and UI acceptance tests into 1 commit, and rebased. This is ready for review from my PoV.

@cdamken
Copy link
Copy Markdown
Contributor

cdamken commented Jul 23, 2021

@pmaier1 @micbar @jnweiger Can we test this and put in the 10.8.1?

@phil-davis
Copy link
Copy Markdown
Contributor

phil-davis commented Jul 23, 2021

This is a "new feature", so according to semver, a release that adds this would be numbered 10.9.0

@JammingBen
Copy link
Copy Markdown
Contributor

JammingBen commented Aug 6, 2021

Merge, or any objections? Got 2 reviews already

mrow4a
mrow4a approved these changes Aug 16, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@mrow4a mrow4a left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, needs rebase and merging

@phil-davis phil-davis force-pushed the feature/lock-breaker-group branch from 76b9dad to 4350f02 Compare August 16, 2021 12:43
@phil-davis phil-davis self-requested a review August 16, 2021 12:43
@phil-davis
Copy link
Copy Markdown
Contributor

phil-davis commented Aug 16, 2021

Rebased and conflict resolved.

@mrow4a
Copy link
Copy Markdown
Contributor

mrow4a commented Aug 16, 2021

@phil-davis with tests passing shall we merge?

@phil-davis
Copy link
Copy Markdown
Contributor

phil-davis commented Aug 16, 2021

@phil-davis with tests passing shall we merge?

yes - there are acceptance tests that cover the behavior of the new option.

@ownclouders
Copy link
Copy Markdown
Contributor

ownclouders commented Aug 16, 2021

💥 Acceptance tests pipeline apiFederationToShares2-latest-mariadb10.2-php7.4 failed. The build has been cancelled.

https://drone.owncloud.com/owncloud/core/31880/119/1

@phil-davis
Copy link
Copy Markdown
Contributor

phil-davis commented Aug 16, 2021

https://drone.owncloud.com/owncloud/core/31880/119/10
drone having a bad day

@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Aug 16, 2021

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

69.2% 69.2% Coverage
0.0% 0.0% Duplication

@phil-davis phil-davis self-assigned this Aug 16, 2021
@phil-davis phil-davis merged commit 8dbda06 into master Aug 16, 2021
@delete-merged-branch delete-merged-branch bot deleted the feature/lock-breaker-group branch August 16, 2021 14:26
@mmattel mmattel mentioned this pull request Aug 16, 2021
Closed
12 tasks
This was referenced Aug 17, 2021
Closed
Merged
@phil-davis phil-davis mentioned this pull request Sep 20, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@phil-davis phil-davis phil-davis approved these changes

@mrow4a mrow4a mrow4a approved these changes

@jvillafanez jvillafanez Awaiting requested review from jvillafanez

@jnweiger jnweiger Awaiting requested review from jnweiger

+2 more reviewers

@AlexAndBear AlexAndBear AlexAndBear approved these changes

@JammingBen JammingBen JammingBen approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@DeepDiver1975 DeepDiver1975

@phil-davis phil-davis

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.