mirror of
https://github.com/haiwen/seahub.git
synced 2025-10-22 11:43:33 +00:00
* delete thridpart/social_django
* delete social_django in seahub/urls.py
* delete social_django in seahub/settings.py
* delete seahub/notifications/management/commands/send_wxwork_notices.py
* delete social_django in code annotation
* delete seahub/social_core
* delete tests/seahub/social_core
* delete social_core in seahub/urls.py
* delete social_core in seahub/settings.py
* change app_label to auth in SocialAuthUser model
* 2to3 asserts
* 2to3 basestring
* 2to3 dict
* 2to3 except
* 2to3 filter
* 2to3 future
* 2to3 has_key
* 2to3 idioms
* 2to3 import
* 2to3 imports
* 2to3 long
* 2to3 map
* 2to3 next
* 2to3 numliterals
* 2to3 print
* 2to3 raise
* 2to3 raw_input
* 2to3 reduce
* 2to3 reload
* 2to3 set_literal
* 2to3 unicode
* 2to3 urllib
* 2to3 ws_comma
* 2to3 xrange
* 2to3 zip
* add pymysql in __init__.py
* fix encode and decode in seahub/cconvert.py
* fix seafserv_rpc.is_passwd_set in seahub/views/__init__.py
* fix smart_unicode to smart_text
* fix force_unicode to force_text
* delete seaserv.get_session_info
* delete seaserv.ccnet_rpc
* fix indent error in seahub/auth/middleware.py
* update dev-requirements
* update test-requirements
* update requirements
* fix StringIO to BytesIO in thumbnail
* fix seaserv.list_inner_pub_repos to seafile_api.get_inner_pub_repo_list
* fix seaserv.list_org_inner_pub_repos to seafile_api.list_org_inner_pub_repos
* add logger in seahub/utils/__init__.py
* fix sort cmp in seahub/views/__init__.py
* fix sort cmp in seahub/base/management/commands/export_file_access_log.py
* fix sort cmp in seahub/api2/endpoints/repo_trash.py
* fix sort cmp in seahub/api2/endpoints/shared_repos.py
* fix sort cmp in seahub/api2/endpoints/shared_folders.py
* fix sort cmp in seahub/wiki/views.py
* fix sort cmp in seahub/api2/endpoints/wiki_pages.py
* fix sort cmp in seahub/api2/endpoints/group_libraries.py
* fix sort cmp in seahub/base/models.py
* fix sort cmp in seahub/api2/endpoints/upload_links.py
* fix sort cmp in seahub/views/ajax.py
* fix sort cmp in seahub/api2/views.py
* fix sort cmp in seahub/views/wiki.py
* fix sort cmp in seahub/api2/endpoints/repos.py
* fix sort cmp in seahub/api2/endpoints/starred_items.py
* fix sort cmp in seahub/views/file.py
* fix sort cmp in seahub/api2/endpoints/dir.py
* fix sort cmp in seahub/api2/endpoints/share_links.py
* fix cmp to cmp_to_key in seahub/api2/endpoints/admin/device_trusted_ip.py
* fix cmp to cmp_to_key in tests/api/endpoints/admin/test_device_trusted_ip.py
* delete encode('utf-8') in seafile_api.list_dir_by_commit_and_path
* delete encode('utf-8') in is_file_starred
* delete encode('utf-8') in seafile_api.list_dir_by_path
* delete path.encode('utf-8') in seahub/views/file.py
* fix os.write to add encode('utf-8')
* add encode('utf-8') for hashlib
* add encode('utf-8') for hmac
* fix with open(file, 'wb') for binary file
* fix encode and decode in seahub/utils/hasher.py
* fix next in thirdpart/shibboleth/views.py
* fix next in seahub/profile/views.py
* fix next in seahub/notifications/views.py
* fix next in seahub/institutions/views.py
* fix next in seahub/options/views.py
* fix next in seahub/share/views.py
* fix next in seahub/avatar/views.py
* fix next in seahub/views/__init__.py
* fix next in seahub/group/views.py
* fix next in seahub/views/wiki.py
* fix next in seahub/views/sysadmin.py
* fix next in seahub/views/file.py
* fix string.lowercase to string.ascii_lowercase in test
* fix open file add 'rb' in test
* fix self.user.username in test
* add migrations in file_participants
* fix list_org_inner_pub_repos to list_org_inner_pub_repos_by_owner
* fix from seaserv import is_passwd_set to seafile_api.is_password_set
* fix assert bytes resp.content in test
* fix seafile_api.get_inner_pub_repo_list to seafile_api.list_inner_pub_repos_by_owner
* fix seafile_api.is_passwd_set to seafile_api.is_password_set
* fix AccountsApiTest assert length
* rewrite sort_devices cmp to operator.lt
* fix bytes + str in seahub/api2/views.py
* fix assert bytes resp.content in test
* fix hashlib encode in seahub/thirdpart/registration/models.py
* change app_label to base in SocialAuthUser
* fix base64 encode in seahub/base/database_storage/database_storage.py
* fix assert bytes resp.content
* remove path.decode in def mkstemp()
* remove path.decode in FpathToLinkTest
* remove str decode in FileTagTest
* remove mock_write_xls.assert_called_once() in SysUserAdminExportExcelTest
* fix urllib assert in FilesApiTest
* fix link fields in FileCommentsTest
* fix get_related_users_by_repo()
* fix assert list in GetRepoSharedUsersTest
* fix create user in AccountTest
* fix repeated key in dict seahub/api2/views.py
* add drone.yml
* update nginx conf in test
* update test conf in test
* update dist and push after test success
* update drone conf to dist and push
* fix assert in BeSharedReposTest
* fix seafile_api.list_org_inner_pub_repos_by_owner(org_id, username) to seafile_api.list_org_inner_pub_repos(org_id)
* fix seafile_api.list_inner_pub_repos_by_owner(username) to seafile_api.get_inner_pub_repo_list()
* update pyjwt requirement
* update dist branch in drone
* add SKIP in dist and push
* fix StringIO to BytesIO in seahub/avatar/models.py
* fix if org_id > 0 to if org_id and org_id > 0
* remove payment
* fix StringIO to BytesIO in seahub/base/database_storage/database_storage.py
* fix send_message to seafile_api.publish_event in seahub/drafts/utils.py
* fix send_message to seafile_api.publish_event in seahub/api2/views.py
* fix send_message to seafile_api.publish_event in seahub/api2/endpoints/repos.py
* fix send_message to seafile_api.publish_event in seahub/views/file.py
* fix send_message to seafile_api.publish_event in seahub/utils/__init__.py
* fix image_file.read encode in seahub/base/database_storage/database_storage.py
* fix DatabaseStorageTest
* remove .travis.yml
* drone branch include master
79 lines
3.3 KiB
Python
79 lines
3.3 KiB
Python
import json
|
|
from functools import cmp_to_key
|
|
|
|
from mock import patch
|
|
from django.core.urlresolvers import reverse
|
|
from django.test import override_settings
|
|
from seahub.test_utils import BaseTestCase
|
|
from seahub.trusted_ip.models import TrustedIP
|
|
from seahub.api2.endpoints.admin.device_trusted_ip import cmp_ip
|
|
|
|
@override_settings(ENABLE_LIMIT_IPADDRESS=True)
|
|
class DeviceAccessibleIpSetting(BaseTestCase):
|
|
def setUp(self):
|
|
self.url = reverse('api-v2.1-admin-device-trusted-ip')
|
|
self.test_ip = '123.213.132.111'
|
|
TrustedIP.objects.get_or_create('127.0.0.1')
|
|
TrustedIP.objects.get_or_create('1.1.1.1')
|
|
self.login_as(self.admin)
|
|
|
|
@patch('seahub.api2.permissions.IsProVersion.has_permission')
|
|
def test_can_get(self, mock_IsProVersion):
|
|
mock_IsProVersion.return_value= True
|
|
resp = self.client.get(self.url)
|
|
assert resp.status_code == 200
|
|
json_resp = json.loads(resp.content)
|
|
assert '127.0.0.1' in [x['ip'] for x in json_resp]
|
|
|
|
@patch('seahub.api2.permissions.IsProVersion.has_permission')
|
|
def test_can_post(self, mock_IsProVersion):
|
|
mock_IsProVersion.return_value= True
|
|
resp = self.client.post(self.url, {'ipaddress': self.test_ip})
|
|
assert resp.status_code == 201
|
|
resp = self.client.get(self.url)
|
|
json_resp = json.loads(resp.content)
|
|
assert self.test_ip in [x['ip'] for x in json_resp]
|
|
|
|
@patch('seahub.api2.permissions.IsProVersion.has_permission')
|
|
def test_can_delete(self, mock_IsProVersion):
|
|
mock_IsProVersion.return_value= True
|
|
data = 'ipaddress=1.1.1.1'
|
|
resp = self.client.delete(self.url, data, 'application/x-www-form-urlencoded')
|
|
assert resp.status_code == 200
|
|
resp = self.client.get(self.url)
|
|
json_resp = json.loads(resp.content)
|
|
assert '1.1.1.1' not in [x['ip'] for x in json_resp]
|
|
|
|
def test_cmp_ip(self):
|
|
ip_list = [{'ip': '200.1.1.1'}, {'ip': '192.1.1.1'}, {'ip': '111.1.1.1'}]
|
|
new_ip_list = sorted(ip_list, key=cmp_to_key(cmp_ip))
|
|
assert new_ip_list == ip_list[::-1]
|
|
|
|
ip_list = [{'ip': '192.1.1.1'}, {'ip': '192.*.1.1'}]
|
|
new_ip_list = sorted(ip_list, key=cmp_to_key(cmp_ip))
|
|
assert new_ip_list == ip_list
|
|
|
|
ip_list = [{'ip': '192.*.1.1'}, {'ip': '192.1.1.1'}]
|
|
new_ip_list = sorted(ip_list, key=cmp_to_key(cmp_ip))
|
|
assert new_ip_list == ip_list[::-1]
|
|
|
|
ip_list = [{'ip': '111.1.1.1'}, {'ip': '111.8.1.1'}]
|
|
new_ip_list = sorted(ip_list, key=cmp_to_key(cmp_ip))
|
|
assert new_ip_list == ip_list
|
|
|
|
ip_list = [{'ip': '111.1.*.2'}, {'ip': '111.1.*.1'}]
|
|
new_ip_list = sorted(ip_list, key=cmp_to_key(cmp_ip))
|
|
assert new_ip_list == ip_list[::-1]
|
|
|
|
ip_list = [{'ip': '111.1.*.2'}, {'ip': '111.2.*.1'}, {'ip': '111.1.*.2'}]
|
|
new_ip_list = sorted(ip_list, key=cmp_to_key(cmp_ip))
|
|
assert new_ip_list == [ip_list[0], ip_list[2], ip_list[1]]
|
|
|
|
ip_list = [{'ip': '111.1.*.2'}, {'ip': '112.2.*.1'}, {'ip': '110.1.*.2'}]
|
|
new_ip_list = sorted(ip_list, key=cmp_to_key(cmp_ip))
|
|
assert new_ip_list == [ip_list[2], ip_list[0], ip_list[1]]
|
|
|
|
ip_list = [{'ip': '111.1.*.2'}, {'ip': '111.1.*.*'}, {'ip': '111.*.*.2'}]
|
|
new_ip_list = sorted(ip_list, key=cmp_to_key(cmp_ip))
|
|
assert new_ip_list == [ip_list[0], ip_list[1], ip_list[2]]
|