files: fix files permissions #754
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jma
force-pushed
the
maj-fix-files-permissions
branch
6 times, most recently
from
7c94764 to
85e3eb3
Compare
jma
changed the title
jma
force-pushed
the
maj-fix-files-permissions
branch
2 times, most recently
from
54b1ee9 to
c56134b
Compare
jma
requested review from
BadrAly,
Garfield-fr,
mmo,
rerowep,
vgranata and
zannkukai
and removed request for
zannkukai and
BadrAly
jma
force-pushed
the
maj-fix-files-permissions
branch
from
c56134b to
0ce3750
Compare
Garfield-fr
approved these changes
Jan 26, 2022
| """Update permission check. | ||
|
|
||
| :param user: Current user record. | ||
| :param recor: Record to check. |
There was a problem hiding this comment.
:param record: Record to check.
There was a problem hiding this comment.
I will fix it with a find and replace.
| """Delete permission check. | ||
|
|
||
| :param user: Current user record. | ||
| :param recor: Record to check. |
There was a problem hiding this comment.
:param record: Record to check.
sonar/modules/documents/utils.py
Outdated
Comment on lines
115
to
116
| :param for_permission: True if it is used to compute permissions. | ||
| :param file: File dict. | ||
| :param organisations: List of organisations. |
There was a problem hiding this comment.
:param file: File dict.
:param organisations: List of organisations.
:param for_permission: True if it is used to compute permissions.
| Mainly the same behavior than the corresponding organisation record. | ||
|
|
||
| :param user: Current user record. | ||
| :param recor: Record to check. |
There was a problem hiding this comment.
:param record: Record to check.
| """Delete permission check. | ||
|
|
||
| :param user: Current user record. | ||
| :param recor: Record to check. |
There was a problem hiding this comment.
:param record: Record to check.
zannkukai
reviewed
Jan 26, 2022
Comment on lines
159
to
163
| if deposit: | ||
| can = DepositPermission.read(user, deposit) | ||
| if can: | ||
| return True | ||
| return False |
Comment on lines
177
to
180
| if deposit: | ||
| can = DepositPermission.update(user, deposit) | ||
| if can: | ||
| return True |
Comment on lines
195
to
199
| if deposit: | ||
| can = DepositPermission.delete(user, deposit) | ||
| if can: | ||
| return True | ||
| return False |
Comment on lines
157
to
159
| if document: | ||
| can_read_document = DocumentPermission.read(user, document) | ||
| if not can_read_document: |
Comment on lines
138
to
141
| if organisation: | ||
| can = OrganisationPermission.update(user, organisation) | ||
| if can: | ||
| return True |
sonar/modules/permissions.py
Outdated
Comment on lines
156
to
169
| (pid, rec) = request.view_args.get('pid_value').data | ||
| if pid.pid_type == 'doc': | ||
| from .documents.permissions import DocumentFilesPermission | ||
| return DocumentFilesPermission.create_permission(obj, action) | ||
| if pid.pid_type == 'coll': | ||
| from .collections.permissions import FilesPermission as CollectionFilesPermission | ||
| return CollectionFilesPermission.create_permission(obj, action) | ||
| if pid.pid_type == 'org': | ||
| from .organisations.permissions import OrganisationFilesPermission | ||
| return OrganisationFilesPermission.create_permission(obj, action) | ||
| if pid.pid_type == 'depo': | ||
| from .deposits.permissions import DepositFilesPermission | ||
| return DepositFilesPermission.create_permission(obj, action) | ||
| return FilesPermission.create_permission(obj, action) |
There was a problem hiding this comment.
Maybe a good idea to create an utils function returning the FilesPermissions subclass based on pid_type.
The code should be simplifer
permission_class = utils_get_permissions_class(pid_type) // should return FilePermission as default value
return permission_class.create_permission(obj, action)There was a problem hiding this comment.
I have create a config instead.
jma
force-pushed
the
maj-fix-files-permissions
branch
from
0ce3750 to
68ff0fd
Compare
zannkukai
approved these changes
Jan 26, 2022
sonar/modules/permissions.py
Outdated
| if request.view_args.get('pid_value'): | ||
| (pid, rec) = request.view_args.get('pid_value').data | ||
| pid_type = pid.pid_type | ||
| print('===============>', |
jma
force-pushed
the
maj-fix-files-permissions
branch
2 times, most recently
from
339a8f2 to
a0e5c5c
Compare
|
jma
force-pushed
the
maj-fix-files-permissions
branch
5 times, most recently
from
7647014 to
bbae1bd
Compare
* Adds files restriction for documents. * Adds files restriction for deposits. * Adds files restriction for organisations. * Adds files restriction for collections. * Fixes document restrictions. * Closes rero#746. Co-Authored-by: Johnny Mariéthoz <[email protected]>
jma
force-pushed
the
maj-fix-files-permissions
branch
from
bbae1bd to
0d0046c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Johnny Mariéthoz [email protected]
Why are you opening this PR?
How to test?
Code review check list