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.

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

bypass/limit permissions #976

Merged
merged 1 commit into from
Apr 6, 2022
Merged

Conversation

ArtificialOwl
Copy link
Member

(replacement for #975)

This PR allow to assign different entities to limit/bypass some permissions. Each settings is defined by a singleId. Only members (and inherited) that belongs to the Entity defined by its singleId will be affected:

  • Circle Creation via OCS API. This settings will limit the creation of a new circle only to members of the assigned Entity,
  • Bypass Circles' types: when set, members of the assigned Entity will be able to bypass the limitation defined by circle_types_block and circle_types_force
./occ config:app:set circles limit_circle_creation --value <singleId>
./occ config:app:set circles bypass_circle_types --value <singleId>

@ArtificialOwl ArtificialOwl requested review from mejo- and CarlSchwan and removed request for mejo- March 28, 2022 12:16
@ArtificialOwl ArtificialOwl force-pushed the enh/noid/limit-circle-creation branch 3 times, most recently from f1df488 to 211f585 Compare March 31, 2022 20:31
@codecov-commenter
Copy link

codecov-commenter commented Mar 31, 2022

Codecov Report

Merging #976 (d6544d4) into master (8772511) will increase coverage by 0.00%.
The diff coverage is 3.27%.

@@           Coverage Diff            @@
##             master    #976   +/-   ##
========================================
  Coverage      0.69%   0.70%           
- Complexity     5716    5735   +19     
========================================
  Files           289     290    +1     
  Lines         19766   19822   +56     
========================================
+ Hits            138     139    +1     
- Misses        19628   19683   +55     
Impacted Files Coverage Δ
lib/Command/CirclesConfig.php 0.00% <0.00%> (ø)
lib/FederatedItems/CircleConfig.php 0.00% <0.00%> (ø)
lib/Model/Member.php 0.00% <0.00%> (ø)
lib/Service/CircleService.php 0.00% <0.00%> (ø)
lib/Service/ConfigService.php 2.13% <ø> (ø)
lib/Service/PermissionService.php 0.00% <0.00%> (ø)
lib/Controller/LocalController.php 14.45% <66.66%> (+0.43%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8772511...d6544d4. Read the comment docs.

lib/Service/PermissionService.php Outdated Show resolved Hide resolved
lib/Service/PermissionService.php Outdated Show resolved Hide resolved
lib/Service/PermissionService.php Outdated Show resolved Hide resolved
lib/Service/CircleService.php Outdated Show resolved Hide resolved
lib/Service/PermissionService.php Show resolved Hide resolved
lib/Service/PermissionService.php Show resolved Hide resolved
@ArtificialOwl ArtificialOwl force-pushed the enh/noid/limit-circle-creation branch 2 times, most recently from aaa5e7d to c50d85e Compare April 4, 2022 12:13
@ArtificialOwl
Copy link
Member Author

squashed, rebased

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Co-authored-by: Carl Schwan <carl@carlschwan.eu>
@ArtificialOwl ArtificialOwl force-pushed the enh/noid/limit-circle-creation branch from 3d912bf to d6544d4 Compare April 6, 2022 15:56
@ArtificialOwl
Copy link
Member Author

/backport to stable23

@ArtificialOwl
Copy link
Member Author

/backport to stable22

@ArtificialOwl ArtificialOwl merged commit 69bc43a into master Apr 6, 2022
@delete-merged-branch delete-merged-branch bot deleted the enh/noid/limit-circle-creation branch April 6, 2022 16:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants