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

ignore repos that are no longer accessible when regenerating tokens

Browse Source
This commit is contained in:
Shuai Lin 2015-03-13 11:01:13 +08:00
parent 18bc135a53
commit f4ed79bd3e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
seahub/api2/views.py
View File

@ -3592,13 +3592,10 @@ class RepoTokensView(APIView):
if any([not _REPO_ID_PATTERN.match(repo) for repo in repos]): if any([not _REPO_ID_PATTERN.match(repo) for repo in repos]):
return api_error(status.HTTP_400_BAD_REQUEST, "Libraries ids are invalid") return api_error(status.HTTP_400_BAD_REQUEST, "Libraries ids are invalid")
if any([not seafile_api.check_repo_access_permission(
repo, request.user.username) for repo in repos]):
return api_error(status.HTTP_403_FORBIDDEN,
"You do not have permission to access those libraries")
tokens = {} tokens = {}
for repo in repos: for repo in repos:
if not seafile_api.check_repo_access_permission(repo, request.user.username):
continue
tokens[repo] = seafile_api.generate_repo_token(repo, request.user.username) tokens[repo] = seafile_api.generate_repo_token(repo, request.user.username)
return tokens return tokens

5
tests/api/test_repos.py
View File

@ -3,6 +3,7 @@
Test repos api. Test repos api.
""" """
import uuid
import unittest import unittest
from tests.api.apitestbase import ApiTestBase from tests.api.apitestbase import ApiTestBase
@ -163,10 +164,12 @@ class ReposApiTest(ApiTestBase):
def test_generate_repo_tokens(self): def test_generate_repo_tokens(self):
with self.get_tmp_repo() as ra: with self.get_tmp_repo() as ra:
with self.get_tmp_repo() as rb: with self.get_tmp_repo() as rb:
repo_ids = ','.join([ra.repo_id, rb.repo_id]) fake_repo_id = str(uuid.uuid4())
repo_ids = ','.join([ra.repo_id, rb.repo_id, fake_repo_id])
tokens = self.get(GET_REPO_TOKENS_URL + '?repos=%s' % repo_ids).json() tokens = self.get(GET_REPO_TOKENS_URL + '?repos=%s' % repo_ids).json()
assert ra.repo_id in tokens assert ra.repo_id in tokens
assert rb.repo_id in tokens assert rb.repo_id in tokens
assert fake_repo_id not in tokens
for repo_id, token in tokens.iteritems(): for repo_id, token in tokens.iteritems():
self._get_repo_info(token, repo_id) self._get_repo_info(token, repo_id)