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

add MULTI_TENANCY check when admin transfer a repo

Browse Source
This commit is contained in:
lian
2016-08-20 11:12:15 +08:00
parent b66e1b8364
commit 0ed0919599
2 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
seahub/api2/endpoints/admin/libraries.py
View File

@@ -9,7 +9,6 @@ from rest_framework import status
from django.template.defaultfilters import filesizeformat
from django.utils.translation import ugettext as _
import seaserv
from seaserv import ccnet_api, seafile_api, seafserv_threaded_rpc
from seahub.views import get_system_default_repo_id
@@ -18,6 +17,11 @@ from seahub.api2.authentication import TokenAuthentication
from seahub.api2.throttling import UserRateThrottle
from seahub.api2.utils import api_error
try:
from seahub.settings import MULTI_TENANCY
except ImportError:
MULTI_TENANCY = False
logger = logging.getLogger(__name__)
def get_repo_info(repo):
@@ -170,18 +174,19 @@ class AdminLibrary(APIView):
error_msg = 'User %s not found.' % new_owner
return api_error(status.HTTP_404_NOT_FOUND, error_msg)
try:
if seafserv_threaded_rpc.get_org_id_by_repo_id(repo_id) > 0:
error_msg = 'Can not transfer organization library.'
return api_error(status.HTTP_403_FORBIDDEN, error_msg)
if MULTI_TENANCY:
try:
if seafserv_threaded_rpc.get_org_id_by_repo_id(repo_id) > 0:
error_msg = 'Can not transfer organization library.'
return api_error(status.HTTP_403_FORBIDDEN, error_msg)
if ccnet_api.get_orgs_by_user(new_owner):
error_msg = 'Can not transfer library to organization user %s' % new_owner
return api_error(status.HTTP_403_FORBIDDEN, error_msg)
except Exception as e:
logger.error(e)
error_msg = 'Internal Server Error'
return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
if ccnet_api.get_orgs_by_user(new_owner):
error_msg = 'Can not transfer library to organization user %s' % new_owner
return api_error(status.HTTP_403_FORBIDDEN, error_msg)
except Exception as e:
logger.error(e)
error_msg = 'Internal Server Error'
return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
repo_owner = seafile_api.get_repo_owner(repo_id)
@@ -225,8 +230,7 @@ class AdminLibrary(APIView):
if repo_id != pub_repo.id:
continue
seaserv.seafserv_threaded_rpc.set_inner_pub_repo(
repo_id, pub_repo.permission)
seafile_api.add_inner_pub_repo(repo_id, pub_repo.permission)
break

24
seahub/views/sysadmin.py
View File

@@ -1523,18 +1523,19 @@ def sys_repo_transfer(request):
messages.error(request, _(u'Failed to transfer, user %s not found') % new_owner)
return HttpResponseRedirect(next)
try:
if seafserv_threaded_rpc.get_org_id_by_repo_id(repo_id) > 0:
messages.error(request, _(u'Can not transfer organization library'))
return HttpResponseRedirect(next)
if MULTI_TENANCY:
try:
if seafserv_threaded_rpc.get_org_id_by_repo_id(repo_id) > 0:
messages.error(request, _(u'Can not transfer organization library'))
return HttpResponseRedirect(next)
if ccnet_api.get_orgs_by_user(new_owner):
messages.error(request, _(u'Can not transfer library to organization user %s') % new_owner)
if ccnet_api.get_orgs_by_user(new_owner):
messages.error(request, _(u'Can not transfer library to organization user %s') % new_owner)
return HttpResponseRedirect(next)
except Exception as e:
logger.error(e)
messages.error(request, 'Internal Server Error')
return HttpResponseRedirect(next)
except Exception as e:
logger.error(e)
messages.error(request, 'Internal Server Error')
return HttpResponseRedirect(next)
repo_owner = seafile_api.get_repo_owner(repo_id)
@@ -1578,8 +1579,7 @@ def sys_repo_transfer(request):
if repo_id != pub_repo.id:
continue
seaserv.seafserv_threaded_rpc.set_inner_pub_repo(
repo_id, pub_repo.permission)
seafile_api.add_inner_pub_repo(repo_id, pub_repo.permission)
break