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

share permission refactor (#1843)

Browse Source 
* rebuild

* share admin

* use seafile_api

* rebase 6.2

* complete test

* api changed

* some error

* break up to two method

* review

* js review
This commit is contained in:
zMingGit
2017-11-01 18:13:51 +08:00
committed by xiez
parent a28b1f05c4
commit f5d1be1f59
13 changed files with 854 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

285
tests/api/endpoints/test_dir_shared_items.py
View File

@@ -1,11 +1,15 @@
import os
import json
import pytest
from mock import patch
import seaserv
from seaserv import seafile_api
from tests.common.utils import randstring
from seahub.test_utils import BaseTestCase
from seahub.test_utils import BaseTestCase, TRAVIS
class DirSharedItemsTest(BaseTestCase):
@@ -21,6 +25,8 @@ class DirSharedItemsTest(BaseTestCase):
def tearDown(self):
self.remove_repo()
self.remove_group()
if not TRAVIS:
self.remove_org_repo()
def share_repo_to_user_and_group(self):
@@ -32,6 +38,14 @@ class DirSharedItemsTest(BaseTestCase):
seafile_api.set_group_repo(self.repo_id,
self.group_id, self.user_name, 'rw')
def share_org_repo_to_org_user_and_org_group(self):
seaserv.seafserv_threaded_rpc.org_add_share(self.org.org_id, self.org_repo.repo_id,
self.org_user.username, self.org_admin.username,
'rw')
seafile_api.add_org_group_repo(self.org_repo.repo_id, self.org.org_id,
self.org_group.id, self.org_user.username, 'rw')
def share_folder_to_user_and_group(self):
# share folder to user
@@ -42,6 +56,18 @@ class DirSharedItemsTest(BaseTestCase):
seafile_api.share_subdir_to_group(self.repo_id,
self.folder_path, self.user_name, self.group_id, 'rw')
def share_org_folder_to_org_user_and_org_group(self):
seafile_api.org_share_subdir_to_user(self.org.org_id,
self.org_repo.repo_id,
self.org_folder,
self.org_user.username,
self.org_admin.username,
'rw')
seafile_api.org_share_subdir_to_group(self.org.org_id, self.org_repo.repo_id,
self.org_folder, self.org_user.username,
self.org_group.id, 'rw')
# test get request
def test_can_list_repo_share_info(self):
@@ -116,6 +142,29 @@ class DirSharedItemsTest(BaseTestCase):
json_resp = json.loads(resp.content)
assert 'has been shared to' in json_resp['failed'][0]['error_msg']
@pytest.mark.skipif(TRAVIS, reason="") # pylint: disable=E1101
def test_can_share_repo_to_org_users(self):
self.login_as(self.org_user)
resp = self.client.put(
'/api2/repos/%s/dir/shared_items/?p=/' % self.org_repo.id,
"share_type=user&username=%s" % self.org_admin.email,
'application/x-www-form-urlencoded',
)
self.assertEqual(200, resp.status_code)
json_resp = json.loads(resp.content)
assert len(json_resp['success']) == 1
assert json_resp['success'][0]['permission'] == 'r'
# test share failed when share the same item to the same user
resp = self.client.put(
'/api2/repos/%s/dir/shared_items/?p=/' % self.org_repo.id,
"share_type=user&username=%s" % self.org_admin.email,
'application/x-www-form-urlencoded',
)
self.assertEqual(200, resp.status_code)
json_resp = json.loads(resp.content)
assert 'has been shared to' in json_resp['failed'][0]['error_msg']
def test_can_share_folder_to_users(self):
self.login_as(self.user)
@@ -141,6 +190,32 @@ class DirSharedItemsTest(BaseTestCase):
json_resp = json.loads(resp.content)
assert 'has been shared to' in json_resp['failed'][0]['error_msg']
@pytest.mark.skipif(TRAVIS, reason="") # pylint: disable=E1101
def test_can_share_folder_to_org_users(self):
self.login_as(self.org_user)
resp = self.client.put(
'/api2/repos/%s/dir/shared_items/?p=%s' % (self.org_repo.id,
self.org_folder),
"share_type=user&username=%s" % self.org_admin.email,
'application/x-www-form-urlencoded',
)
self.assertEqual(200, resp.status_code)
json_resp = json.loads(resp.content)
assert len(json_resp['success']) == 1
assert json_resp['success'][0]['permission'] == 'r'
# test share failed when share the same item to the same user
resp = self.client.put(
'/api2/repos/%s/dir/shared_items/?p=%s' % (self.org_repo.id,
self.org_folder),
"share_type=user&username=%s" % self.org_admin.email,
'application/x-www-form-urlencoded',
)
self.assertEqual(200, resp.status_code)
json_resp = json.loads(resp.content)
assert 'has been shared to' in json_resp['failed'][0]['error_msg']
def test_can_share_repo_to_groups(self):
self.login_as(self.user)
@@ -168,6 +243,33 @@ class DirSharedItemsTest(BaseTestCase):
json_resp = json.loads(resp.content)
assert 'has been shared to' in json_resp['failed'][0]['error_msg']
@pytest.mark.skipif(TRAVIS, reason="") # pylint: disable=E1101
def test_can_share_repo_to_org_groups(self):
self.login_as(self.org_user)
grp1 = self.org_group
grp2 = self.create_org_group(group_name='test-org-grp2',
username=self.org_user.username)
resp = self.client.put(
'/api2/repos/%s/dir/shared_items/?p=/' % (self.org_repo.id),
"share_type=group&group_id=%d&group_id=%d&permission=rw" % (grp1.id, grp2.id),
'application/x-www-form-urlencoded',
)
self.assertEqual(200, resp.status_code)
json_resp = json.loads(resp.content)
assert len(json_resp['success']) == 2
assert json_resp['success'][0]['permission'] == 'rw'
# test share failed when share the same item to the same group
resp = self.client.put(
'/api2/repos/%s/dir/shared_items/?p=/' % (self.org_repo.id),
"share_type=group&group_id=%d&group_id=%d&permission=rw" % (grp1.id, grp2.id),
'application/x-www-form-urlencoded',
)
self.assertEqual(200, resp.status_code)
json_resp = json.loads(resp.content)
assert 'has been shared to' in json_resp['failed'][0]['error_msg']
def test_can_share_folder_to_groups(self):
self.login_as(self.user)
@@ -197,6 +299,35 @@ class DirSharedItemsTest(BaseTestCase):
json_resp = json.loads(resp.content)
assert 'has been shared to' in json_resp['failed'][0]['error_msg']
@pytest.mark.skipif(TRAVIS, reason="") # pylint: disable=E1101
def test_can_share_folder_to_org_groups(self):
self.login_as(self.org_user)
grp1 = self.org_group
grp2 = self.create_org_group(group_name="test-org-grp2",
username=self.org_user.username)
resp = self.client.put(
'/api2/repos/%s/dir/shared_items/?p=%s' % (self.org_repo.id,
self.org_folder),
"share_type=group&group_id=%d&group_id=%d&permission=rw" % (grp1.id, grp2.id),
'application/x-www-form-urlencoded',
)
self.assertEqual(200, resp.status_code)
json_resp = json.loads(resp.content)
assert len(json_resp['success']) == 2
assert json_resp['success'][0]['permission'] == 'rw'
# test share failed when share the same item to the same group
resp = self.client.put(
'/api2/repos/%s/dir/shared_items/?p=%s' % (self.org_repo.id,
self.org_folder),
"share_type=group&group_id=%d&group_id=%d&permission=rw" % (grp1.id, grp2.id),
'application/x-www-form-urlencoded',
)
self.assertEqual(200, resp.status_code)
json_resp = json.loads(resp.content)
def test_share_to_group_if_not_group_member(self):
self.login_as(self.user)
@@ -300,6 +431,24 @@ class DirSharedItemsTest(BaseTestCase):
json_resp = json.loads(resp.content)
assert json_resp[0]['permission'] == 'r'
@pytest.mark.skipif(TRAVIS, reason="") # pylint: disable=E1101
def test_can_modify_org_user_repo_share_perm(self):
self.share_org_repo_to_org_user_and_org_group()
self.login_as(self.org_user)
resp = self.client.post('/api2/repos/%s/dir/shared_items/?p=/&share_type=user&username=%s' % (
self.org_repo.id,
self.org_admin.username), {
'permission': 'r'
}
)
json_resp = json.loads(resp.content)
assert json_resp['success'] is True
resp = self.client.get('/api2/repos/%s/dir/shared_items/?p=/&share_type=user' % self.org_repo.repo_id)
json_resp = json.loads(resp.content)
assert json_resp[0]['permission'] == 'r'
def test_can_modify_user_folder_share_perm(self):
self.share_folder_to_user_and_group()
self.login_as(self.user)
@@ -320,6 +469,28 @@ class DirSharedItemsTest(BaseTestCase):
json_resp = json.loads(resp.content)
assert json_resp[0]['permission'] == 'r'
@pytest.mark.skipif(TRAVIS, reason="") # pylint: disable=E1101
def test_can_modify_org_user_folder_share_perm(self):
self.share_org_folder_to_org_user_and_org_group()
self.login_as(self.org_user)
resp = self.client.post('/api2/repos/%s/dir/shared_items/?p=%s&share_type=user&username=%s' % (
self.org_repo.id,
self.org_folder,
self.org_admin.username), {
'permission': 'r'
}
)
json_resp = json.loads(resp.content)
assert json_resp['success'] is True
resp = self.client.get('/api2/repos/%s/dir/shared_items/?p=%s&share_type=user' % (
self.org_repo.id,
self.org_folder))
json_resp = json.loads(resp.content)
assert json_resp[0]['permission'] == 'r'
def test_can_modify_group_repo_share_perm(self):
self.share_repo_to_user_and_group()
self.login_as(self.user)
@@ -337,6 +508,24 @@ class DirSharedItemsTest(BaseTestCase):
json_resp = json.loads(resp.content)
assert json_resp[0]['permission'] == 'r'
@pytest.mark.skipif(TRAVIS, reason="") # pylint: disable=E1101
def test_can_modify_org_group_repo_share_perm(self):
self.share_org_repo_to_org_user_and_org_group()
self.login_as(self.org_user)
resp = self.client.post('/api2/repos/%s/dir/shared_items/?p=/&share_type=group&group_id=%d' % (
self.org_repo.id,
self.org_group.id), {
'permission': 'r'
}
)
json_resp = json.loads(resp.content)
assert json_resp['success'] is True
resp = self.client.get('/api2/repos/%s/dir/shared_items/?p=/&share_type=group' % self.org_repo.id)
json_resp = json.loads(resp.content)
assert json_resp[0]['permission'] == 'r'
def test_can_modify_group_folder_share_perm(self):
self.share_folder_to_user_and_group()
self.login_as(self.user)
@@ -356,6 +545,26 @@ class DirSharedItemsTest(BaseTestCase):
json_resp = json.loads(resp.content)
assert json_resp[0]['permission'] == 'r'
@pytest.mark.skipif(TRAVIS, reason="") # pylint: disable=E1101
def test_can_modify_org_group_folder_share_perm(self):
self.share_org_folder_to_org_user_and_org_group()
self.login_as(self.org_user)
resp = self.client.post('/api2/repos/%s/dir/shared_items/?p=%s&share_type=group&group_id=%d' % (
self.org_repo.id,
self.org_folder,
self.org_group.id), {
'permission': 'r'
}
)
json_resp = json.loads(resp.content)
assert json_resp['success'] is True
resp = self.client.get('/api2/repos/%s/dir/shared_items/?p=%s&share_type=group' %
(self.org_repo.id, self.org_folder))
json_resp = json.loads(resp.content)
assert json_resp[0]['permission'] == 'r'
def test_modify_with_invalid_email(self):
self.share_folder_to_user_and_group()
self.login_as(self.user)
@@ -419,6 +628,21 @@ class DirSharedItemsTest(BaseTestCase):
json_resp = json.loads(resp.content)
assert len(json_resp) == 0
@pytest.mark.skipif(TRAVIS, reason="") # pylint: disable=E1101
def test_can_unshare_org_repo_to_org_user(self):
self.share_org_repo_to_org_user_and_org_group()
self.login_as(self.org_user)
resp = self.client.delete('/api2/repos/%s/dir/shared_items/?p=/&share_type=user&username=%s' % (
self.org_repo.id, self.org_admin.username))
self.assertEqual(200, resp.status_code)
json_resp = json.loads(resp.content)
assert json_resp['success'] is True
resp = self.client.get('/api2/repos/%s/dir/shared_items/?p=/&share_type=user' % self.org_repo.id)
json_resp = json.loads(resp.content)
assert len(json_resp) == 0
def test_can_unshare_folder_to_user(self):
self.share_folder_to_user_and_group()
self.login_as(self.user)
@@ -439,6 +663,27 @@ class DirSharedItemsTest(BaseTestCase):
json_resp = json.loads(resp.content)
assert len(json_resp) == 0
@pytest.mark.skipif(TRAVIS, reason="") # pylint: disable=E1101
def test_can_unshare_org_folder_to_org_user(self):
self.share_org_folder_to_org_user_and_org_group()
self.login_as(self.org_user)
resp = self.client.delete('/api2/repos/%s/dir/shared_items/?p=%s&share_type=user&username=%s' % (
self.org_repo.id,
self.org_folder,
self.org_admin.username
))
self.assertEqual(200, resp.status_code)
json_resp = json.loads(resp.content)
assert json_resp['success'] is True
resp = self.client.get('/api2/repos/%s/dir/shared_items/?p=%s&share_type=user' % (
self.org_repo.id,
self.org_folder))
json_resp = json.loads(resp.content)
assert len(json_resp) == 0
def test_can_unshare_repo_to_group(self):
self.share_repo_to_user_and_group()
self.login_as(self.user)
@@ -456,6 +701,24 @@ class DirSharedItemsTest(BaseTestCase):
json_resp = json.loads(resp.content)
assert len(json_resp) == 0
@pytest.mark.skipif(TRAVIS, reason="") # pylint: disable=E1101
def test_can_unshare_org_repo_to_org_group(self):
self.share_org_repo_to_org_user_and_org_group()
self.login_as(self.org_user)
resp = self.client.delete('/api2/repos/%s/dir/shared_items/?p=/&share_type=group&group_id=%d' % (
self.org_repo.id,
self.org_group.id
))
self.assertEqual(200, resp.status_code)
json_resp = json.loads(resp.content)
assert json_resp['success'] is True
resp = self.client.get('/api2/repos/%s/dir/shared_items/?p=/&share_type=group' % self.org_repo.id)
json_resp = json.loads(resp.content)
assert len(json_resp) == 0
def test_can_unshare_folder_to_group(self):
self.share_folder_to_user_and_group()
self.login_as(self.user)
@@ -475,6 +738,26 @@ class DirSharedItemsTest(BaseTestCase):
json_resp = json.loads(resp.content)
assert len(json_resp) == 0
@pytest.mark.skipif(TRAVIS, reason="") # pylint: disable=E1101
def test_can_unshare_org_folder_to_org_group(self):
self.share_org_folder_to_org_user_and_org_group()
self.login_as(self.org_user)
resp = self.client.delete('/api2/repos/%s/dir/shared_items/?p=%s&share_type=group&group_id=%d' % (
self.org_repo.id,
self.org_folder,
self.org_group.id
))
self.assertEqual(200, resp.status_code)
json_resp = json.loads(resp.content)
assert json_resp['success'] is True
resp = self.client.get('/api2/repos/%s/dir/shared_items/?p=%s&share_type=group' % (
self.org_repo.id, self.org_folder))
json_resp = json.loads(resp.content)
assert len(json_resp) == 0
def test_unshare_with_invalid_email(self):
self.share_folder_to_user_and_group()
self.login_as(self.user)