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

[api] Fix bug in set repo passwod

Browse Source
This commit is contained in:
zhengxie
2014-10-20 12:00:10 +08:00
parent 85053c0a2f
commit 549d1beab7
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
seahub/api2/views.py
View File

@@ -594,23 +594,13 @@ def check_set_repo_password(request, repo):
if not check_permission(repo.id, request.user.username): if not check_permission(repo.id, request.user.username):
return api_error(status.HTTP_403_FORBIDDEN, 'Forbid to access this repo.') return api_error(status.HTTP_403_FORBIDDEN, 'Forbid to access this repo.')
password_set = False
if repo.encrypted: if repo.encrypted:
try: password = request.REQUEST.get('password', default=None)
ret = seafile_api.is_password_set(repo.id, request.user.username) if not password:
if ret == 1: return api_error(HTTP_440_REPO_PASSWD_REQUIRED,
password_set = True 'Repo password is needed.')
except SearpcError, e:
return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR,
"SearpcError:" + e.msg)
if not password_set: return set_repo_password(request, repo, password)
password = request.REQUEST.get('password', default=None)
if not password:
return api_error(HTTP_440_REPO_PASSWD_REQUIRED,
'Repo password is needed.')
return set_repo_password(request, repo, password)
def check_repo_access_permission(request, repo): def check_repo_access_permission(request, repo):
if not seafile_api.check_repo_access_permission(repo.id, if not seafile_api.check_repo_access_permission(repo.id,