haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-04 16:31:13 +00:00
Code Issues Releases Wiki Activity

client side keygen: update create repo api

Browse Source
This commit is contained in:
Shuai Lin
2015-08-29 21:04:58 +08:00
parent 981db6618f
commit 7532ed394a
2 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
seahub/api2/views.py
View File

@@ -820,24 +820,23 @@ class Repos(APIView):
return api_error(status.HTTP_400_BAD_REQUEST,
'Library name is required.')
repo_desc = request.DATA.get("desc", '')
passwd = request.DATA.get("passwd", None)
if not passwd:
passwd = None
# create a repo
org_id = -1
try:
if is_org_context(request):
org_id = request.user.org.org_id
repo_id = seafile_api.create_org_repo(repo_name, repo_desc,
username, passwd, org_id)
repo_id = request.DATA.get('repo_id', '')
try:
if repo_id:
# client generates magic and random key
repo_id, error = self._create_enc_repo(request, repo_id, repo_name, repo_desc, username, org_id)
else:
repo_id = seafile_api.create_repo(repo_name, repo_desc,
username, passwd)
repo_id, error = self._create_repo(request, repo_name, repo_desc, username, org_id)
except SearpcError as e:
logger.error(e)
return api_error(HTTP_520_OPERATION_FAILED,
'Failed to create library.')
if error is not None:
return error
if not repo_id:
return api_error(HTTP_520_OPERATION_FAILED,
'Failed to create library.')
@@ -855,6 +854,40 @@ class Repos(APIView):
# resp['Location'] = reverse('api2-repo', args=[repo_id])
return resp
def _create_repo(self, request, repo_name, repo_desc, username, org_id):
passwd = request.DATA.get("passwd", None) or None
if org_id > 0:
repo_id = seafile_api.create_org_repo(repo_name, repo_desc,
username, passwd, org_id)
else:
repo_id = seafile_api.create_repo(repo_name, repo_desc,
username, passwd)
return repo_id, None
def _create_enc_repo(self, request, repo_id, repo_name, repo_desc, username, org_id):
if not _REPO_ID_PATTERN.match(repo_id):
return api_error(status.HTTP_400_BAD_REQUEST, 'Repo id must be a valid uuid')
magic = request.DATA.get('magic', '')
random_key = request.DATA.get('random_key', '')
try:
enc_version = int(request.DATA.get('enc_version', 0))
except ValueError:
return None, api_error(status.HTTP_400_BAD_REQUEST,
'Invalid enc_version param.')
if len(magic) != 64 or len(random_key) != 96 or enc_version < 0:
return None, api_error(status.HTTP_400_BAD_REQUEST,
'You must provide magic, random_key and enc_version.')
if org_id > 0:
repo_id = seafile_api.create_org_enc_repo(repo_id, repo_name, repo_desc,
username, magic, random_key, enc_version, org_id)
else:
repo_id = seafile_api.create_enc_repo(
repo_id, repo_name, repo_desc, username,
magic, random_key, enc_version)
return repo_id, None
class PubRepos(APIView):
authentication_classes = (TokenAuthentication, SessionAuthentication)
permission_classes = (IsAuthenticated,)

19
tests/api/test_repos.py
View File

@@ -188,31 +188,32 @@ class ReposApiTest(ApiTestBase):
'repo/%s/permission-check/?op=upload' % repo_id)
self.get(url, use_token=False, headers=headers, **kwargs)
@pytest.mark.xfail
def create_encrypted_repo(self):
# @pytest.mark.xfail
def test_create_encrypted_repo(self):
"""Test create an encrypted repo with the secure keys generated on client
side.
"""
repo_id = str(uuid.uuid4())
password = randstring(16)
magic, random_key = seafile_api.generate_magic_and_random_key(repo_id, password).split('\t')
enc_version = 2
enc_info = seafile_api.generate_magic_and_random_key(enc_version, repo_id, password)
data = {
'name': 'enc-test',
'encrypted': '1',
'repo_id': repo_id,
'magic': magic,
'random_key': random_key,
'enc_version': enc_version,
'magic': enc_info.magic,
'random_key': enc_info.random_key,
}
res = self.post(REPOS_URL, data=data)
repo = res.json()
assert repo['repo_id'] == repo_id
assert repo['encrypted']
assert repo['magic'] == magic
assert repo['random_key'] == random_key
assert repo['magic'] == enc_info.magic
assert repo['random_key'] == enc_info.random_key
# validate the password on server
set_password_url = apiurl('/api2/repos/{}/'.format(repo['repo_id']))
self.post(set_password_url, data={'password': password})
# do some file operation
self.create_file(repo)
self.create_file(repo['repo_id'])