haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-05 08:53:14 +00:00
Code Issues Releases Wiki Activity

update share dept repo

Browse Source 
add 'cloud-edit', 'preview' permission
support 'cloud-edit', 'preview' and custom permission when modify share
This commit is contained in:
lian
2022-07-13 16:40:15 +08:00
parent 3371d5cb5b
commit 9a962255f0
3 changed files with 58 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/components/dialog/share-to-group.js
View File

@@ -124,9 +124,12 @@ class ShareToGroup extends React.Component {
} else if (itemType === 'dir') { } else if (itemType === 'dir') {
this.permissions = ['rw', 'r', 'cloud-edit', 'preview']; this.permissions = ['rw', 'r', 'cloud-edit', 'preview'];
} }
if (this.props.isGroupOwnedRepo || !isPro) { if (!isPro) {
this.permissions = ['rw', 'r']; this.permissions = ['rw', 'r'];
} }
if (this.props.isGroupOwnedRepo) {
this.permissions = ['rw', 'r', 'cloud-edit', 'preview'];
}
} }
handleSelectChange = (option) => { handleSelectChange = (option) => {

5
frontend/src/components/dialog/share-to-user.js
View File

@@ -154,9 +154,12 @@ class ShareToUser extends React.Component {
} else if (this.props.itemType === 'dir') { } else if (this.props.itemType === 'dir') {
this.permissions = ['rw', 'r', 'cloud-edit', 'preview']; this.permissions = ['rw', 'r', 'cloud-edit', 'preview'];
} }
if (this.props.isGroupOwnedRepo || !isPro) { if (!isPro) {
this.permissions = ['rw', 'r']; this.permissions = ['rw', 'r'];
} }
if (this.props.isGroupOwnedRepo) {
this.permissions = ['rw', 'r', 'cloud-edit', 'preview'];
}
} }
handleSelectChange = (option) => { handleSelectChange = (option) => {

77
seahub/api2/endpoints/group_owned_libraries.py
View File

@@ -39,7 +39,8 @@ from seahub.share.utils import share_dir_to_user, share_dir_to_group, update_use
check_user_share_out_permission, update_group_dir_permission, \ check_user_share_out_permission, update_group_dir_permission, \
check_group_share_out_permission, check_user_share_in_permission, \ check_group_share_out_permission, check_user_share_in_permission, \
normalize_custom_permission_name normalize_custom_permission_name
from seahub.constants import PERMISSION_READ, PERMISSION_READ_WRITE from seahub.constants import PERMISSION_READ, PERMISSION_READ_WRITE, \
PERMISSION_PREVIEW, PERMISSION_PREVIEW_EDIT
from seahub.views import check_folder_permission from seahub.views import check_folder_permission
from seahub.settings import ENABLE_STORAGE_CLASSES, STORAGE_CLASS_MAPPING_POLICY, \ from seahub.settings import ENABLE_STORAGE_CLASSES, STORAGE_CLASS_MAPPING_POLICY, \
@@ -47,6 +48,7 @@ from seahub.settings import ENABLE_STORAGE_CLASSES, STORAGE_CLASS_MAPPING_POLICY
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
def get_group_owned_repo_info(request, repo_id): def get_group_owned_repo_info(request, repo_id):
repo = seafile_api.get_repo(repo_id) repo = seafile_api.get_repo(repo_id)
@@ -72,6 +74,7 @@ def get_group_owned_repo_info(request, repo_id):
return repo_info return repo_info
class GroupOwnedLibraries(APIView): class GroupOwnedLibraries(APIView):
authentication_classes = (TokenAuthentication, SessionAuthentication) authentication_classes = (TokenAuthentication, SessionAuthentication)
permission_classes = (IsAuthenticated, IsProVersion) permission_classes = (IsAuthenticated, IsProVersion)
@@ -123,8 +126,7 @@ class GroupOwnedLibraries(APIView):
group_id = int(group_id) group_id = int(group_id)
if is_pro_version() and ENABLE_STORAGE_CLASSES: if is_pro_version() and ENABLE_STORAGE_CLASSES:
if STORAGE_CLASS_MAPPING_POLICY in ('USER_SELECT', if STORAGE_CLASS_MAPPING_POLICY in ('USER_SELECT', 'ROLE_BASED'):
'ROLE_BASED'):
storages = get_library_storages(request) storages = get_library_storages(request)
storage_id = request.data.get("storage_id", None) storage_id = request.data.get("storage_id", None)
@@ -132,9 +134,12 @@ class GroupOwnedLibraries(APIView):
error_msg = 'storage_id invalid.' error_msg = 'storage_id invalid.'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
repo_id = seafile_api.add_group_owned_repo(group_id, repo_name, repo_id = seafile_api.add_group_owned_repo(group_id,
permission, password, enc_version=ENCRYPTED_LIBRARY_VERSION, repo_name,
storage_id=storage_id) permission,
password,
enc_version=ENCRYPTED_LIBRARY_VERSION,
storage_id=storage_id)
else: else:
# STORAGE_CLASS_MAPPING_POLICY == 'REPO_ID_MAPPING' # STORAGE_CLASS_MAPPING_POLICY == 'REPO_ID_MAPPING'
repo_id = SeafileAPI.add_group_owned_repo( repo_id = SeafileAPI.add_group_owned_repo(
@@ -147,19 +152,21 @@ class GroupOwnedLibraries(APIView):
username = request.user.username username = request.user.username
library_template = request.data.get("library_template", '') library_template = request.data.get("library_template", '')
repo_created.send(sender=None, org_id=org_id, creator=username, repo_created.send(sender=None, org_id=org_id, creator=username,
repo_id=repo_id, repo_name=repo_name, repo_id=repo_id, repo_name=repo_name,
library_template=library_template) library_template=library_template)
# for notification # for notification
repo = seafile_api.get_repo(repo_id) repo = seafile_api.get_repo(repo_id)
share_repo_to_group_successful.send(sender=None, from_user=username, share_repo_to_group_successful.send(sender=None, from_user=username,
group_id=group_id, repo=repo, path='/', org_id=org_id) group_id=group_id, repo=repo,
path='/', org_id=org_id)
info = get_group_owned_repo_info(request, repo_id) info = get_group_owned_repo_info(request, repo_id)
# TODO # TODO
info['permission'] = permission info['permission'] = permission
return Response(info) return Response(info)
class GroupOwnedLibrary(APIView): class GroupOwnedLibrary(APIView):
authentication_classes = (TokenAuthentication, SessionAuthentication) authentication_classes = (TokenAuthentication, SessionAuthentication)
permission_classes = (IsAuthenticated, IsProVersion) permission_classes = (IsAuthenticated, IsProVersion)
@@ -241,6 +248,7 @@ def get_group_id_by_repo_owner(repo_owner):
return int(repo_owner.split('@')[0]) return int(repo_owner.split('@')[0])
class GroupOwnedLibraryUserFolderPermission(APIView): class GroupOwnedLibraryUserFolderPermission(APIView):
authentication_classes = (TokenAuthentication, SessionAuthentication) authentication_classes = (TokenAuthentication, SessionAuthentication)
permission_classes = (IsAuthenticated, IsProVersion) permission_classes = (IsAuthenticated, IsProVersion)
@@ -508,7 +516,7 @@ class GroupOwnedLibraryUserFolderPermission(APIView):
try: try:
seafile_api.rm_folder_user_perm(repo_id, path, user) seafile_api.rm_folder_user_perm(repo_id, path, user)
send_perm_audit_msg('delete-repo-perm', username, send_perm_audit_msg('delete-repo-perm', username,
user, repo_id, path, permission) user, repo_id, path, permission)
return Response({'success': True}) return Response({'success': True})
except Exception as e: except Exception as e:
logger.error(e) logger.error(e)
@@ -885,7 +893,8 @@ class GroupOwnedLibraryUserShare(APIView):
# parameter check # parameter check
permission = request.data.get('permission', PERMISSION_READ) permission = request.data.get('permission', PERMISSION_READ)
if permission not in [PERMISSION_READ, PERMISSION_READ_WRITE]: if permission not in [PERMISSION_READ, PERMISSION_READ_WRITE,
PERMISSION_PREVIEW, PERMISSION_PREVIEW_EDIT]:
permission = normalize_custom_permission_name(permission) permission = normalize_custom_permission_name(permission)
if not permission: if not permission:
error_msg = 'permission invalid.' error_msg = 'permission invalid.'
@@ -976,11 +985,12 @@ class GroupOwnedLibraryUserShare(APIView):
# send a signal when sharing repo successful # send a signal when sharing repo successful
share_repo_to_user_successful.send(sender=None, share_repo_to_user_successful.send(sender=None,
from_user=username, to_user=to_user, from_user=username, to_user=to_user,
repo=repo, path=path, org_id=org_id) repo=repo, path=path, org_id=org_id)
send_perm_audit_msg('add-repo-perm', send_perm_audit_msg('add-repo-perm',
username, to_user, repo_id, path, permission) username, to_user,
repo_id, path, permission)
return Response(result) return Response(result)
@@ -1003,9 +1013,12 @@ class GroupOwnedLibraryUserShare(APIView):
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
permission = request.data.get('permission', PERMISSION_READ) permission = request.data.get('permission', PERMISSION_READ)
if permission not in [PERMISSION_READ, PERMISSION_READ_WRITE]: if permission not in [PERMISSION_READ, PERMISSION_READ_WRITE,
error_msg = 'permission invalid.' PERMISSION_PREVIEW, PERMISSION_PREVIEW_EDIT]:
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) permission = normalize_custom_permission_name(permission)
if not permission:
error_msg = 'permission invalid.'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
# resource check # resource check
repo = seafile_api.get_repo(repo_id) repo = seafile_api.get_repo(repo_id)
@@ -1158,9 +1171,12 @@ class GroupOwnedLibraryGroupShare(APIView):
# parameter check # parameter check
permission = request.data.get('permission', PERMISSION_READ) permission = request.data.get('permission', PERMISSION_READ)
if permission not in [PERMISSION_READ, PERMISSION_READ_WRITE]: if permission not in [PERMISSION_READ, PERMISSION_READ_WRITE,
error_msg = 'permission invalid.' PERMISSION_PREVIEW, PERMISSION_PREVIEW_EDIT]:
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) permission = normalize_custom_permission_name(permission)
if not permission:
error_msg = 'permission invalid.'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
# resource check # resource check
repo = seafile_api.get_repo(repo_id) repo = seafile_api.get_repo(repo_id)
@@ -1221,8 +1237,11 @@ class GroupOwnedLibraryGroupShare(APIView):
}) })
share_repo_to_group_successful.send(sender=None, share_repo_to_group_successful.send(sender=None,
from_user=username, group_id=gid, repo=repo, path=path, from_user=username,
org_id=org_id) group_id=gid,
repo=repo,
path=path,
org_id=org_id)
send_perm_audit_msg('add-repo-perm', username, gid, send_perm_audit_msg('add-repo-perm', username, gid,
repo_id, path, permission) repo_id, path, permission)
@@ -1250,9 +1269,12 @@ class GroupOwnedLibraryGroupShare(APIView):
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
permission = request.data.get('permission', PERMISSION_READ) permission = request.data.get('permission', PERMISSION_READ)
if permission not in [PERMISSION_READ, PERMISSION_READ_WRITE]: if permission not in [PERMISSION_READ, PERMISSION_READ_WRITE,
error_msg = 'permission invalid.' PERMISSION_PREVIEW, PERMISSION_PREVIEW_EDIT]:
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) permission = normalize_custom_permission_name(permission)
if not permission:
error_msg = 'permission invalid.'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
# resource check # resource check
repo = seafile_api.get_repo(repo_id) repo = seafile_api.get_repo(repo_id)
@@ -1285,7 +1307,8 @@ class GroupOwnedLibraryGroupShare(APIView):
repo_id, path, repo_owner, to_group_id, permission, org_id) repo_id, path, repo_owner, to_group_id, permission, org_id)
send_perm_audit_msg('modify-repo-perm', send_perm_audit_msg('modify-repo-perm',
username, to_group_id, repo_id, path, permission) username, to_group_id,
repo_id, path, permission)
return Response({'success': True}) return Response({'success': True})
@@ -1370,6 +1393,6 @@ class GroupOwnedLibraryUserShareInLibrary(APIView):
permission = check_user_share_in_permission(repo_id, username, is_org) permission = check_user_share_in_permission(repo_id, username, is_org)
send_perm_audit_msg('delete-repo-perm', repo_owner, username, send_perm_audit_msg('delete-repo-perm', repo_owner, username,
repo_id, '/', permission) repo_id, '/', permission)
return Response({'success': True}) return Response({'success': True})