haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-17 07:41:26 +00:00
Code Issues Releases Wiki Activity

[api2] update ENABLE_ENCRYPTED_LIBRARY

Browse Source
This commit is contained in:
lian
2015-10-22 16:08:45 +08:00
parent ce6030cdfe
commit d0c8235f13
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
seahub/api2/views.py
View File

@@ -701,6 +701,12 @@ class Repos(APIView):
def _create_repo(self, request, repo_name, repo_desc, username, org_id): def _create_repo(self, request, repo_name, repo_desc, username, org_id):
passwd = request.DATA.get("passwd", None) passwd = request.DATA.get("passwd", None)
# to avoid 'Bad magic' error when create repo, passwd should be 'None'
# not an empty string when create unencrypted repo
if not passwd:
passwd = None
if (passwd is not None) and (not config.ENABLE_ENCRYPTED_LIBRARY): if (passwd is not None) and (not config.ENABLE_ENCRYPTED_LIBRARY):
return api_error(status.HTTP_403_FORBIDDEN, return api_error(status.HTTP_403_FORBIDDEN,
'NOT allow to create encrypted library.') 'NOT allow to create encrypted library.')
@@ -786,8 +792,16 @@ class PubRepos(APIView):
'Library name is required.') 'Library name is required.')
repo_desc = request.DATA.get("desc", '') repo_desc = request.DATA.get("desc", '')
passwd = request.DATA.get("passwd", None) passwd = request.DATA.get("passwd", None)
# to avoid 'Bad magic' error when create repo, passwd should be 'None'
# not an empty string when create unencrypted repo
if not passwd: if not passwd:
passwd = None passwd = None
if (passwd is not None) and (not config.ENABLE_ENCRYPTED_LIBRARY):
return api_error(status.HTTP_403_FORBIDDEN,
'NOT allow to create encrypted library.')
permission = request.DATA.get("permission", 'r') permission = request.DATA.get("permission", 'r')
if permission != 'r' and permission != 'rw': if permission != 'r' and permission != 'rw':
return api_error(status.HTTP_400_BAD_REQUEST, 'Invalid permission') return api_error(status.HTTP_400_BAD_REQUEST, 'Invalid permission')
@@ -3533,8 +3547,16 @@ class GroupRepos(APIView):
repo_name = request.DATA.get("name", None) repo_name = request.DATA.get("name", None)
repo_desc = request.DATA.get("desc", '') repo_desc = request.DATA.get("desc", '')
passwd = request.DATA.get("passwd", None) passwd = request.DATA.get("passwd", None)
# to avoid 'Bad magic' error when create repo, passwd should be 'None'
# not an empty string when create unencrypted repo
if not passwd: if not passwd:
passwd = None passwd = None
if (passwd is not None) and (not config.ENABLE_ENCRYPTED_LIBRARY):
return api_error(status.HTTP_403_FORBIDDEN,
'NOT allow to create encrypted library.')
permission = request.DATA.get("permission", 'r') permission = request.DATA.get("permission", 'r')
if permission != 'r' and permission != 'rw': if permission != 'r' and permission != 'rw':
return api_error(status.HTTP_400_BAD_REQUEST, 'Invalid permission') return api_error(status.HTTP_400_BAD_REQUEST, 'Invalid permission')