haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-28 11:41:18 +00:00
Code Issues Releases Wiki Activity

update username, email check in users api (#4324)

Browse Source
This commit is contained in:
Leo 2019-11-30 12:07:23 +08:00 committed by Daniel Pan
parent ac87191ec5
commit 02c486d08b
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
seahub/api2/endpoints/admin/users.py
View File

@ -30,7 +30,7 @@ from seahub.two_factor.models import default_device
from seahub.profile.models import Profile from seahub.profile.models import Profile
from seahub.profile.settings import CONTACT_CACHE_TIMEOUT, CONTACT_CACHE_PREFIX, \ from seahub.profile.settings import CONTACT_CACHE_TIMEOUT, CONTACT_CACHE_PREFIX, \
NICKNAME_CACHE_PREFIX, NICKNAME_CACHE_TIMEOUT NICKNAME_CACHE_PREFIX, NICKNAME_CACHE_TIMEOUT
from seahub.utils import is_valid_username, is_org_context, \ from seahub.utils import is_valid_username2, is_org_context, \
is_pro_version, normalize_cache_key, is_valid_email, \ is_pro_version, normalize_cache_key, is_valid_email, \
IS_EMAIL_CONFIGURED, send_html_email, get_site_name, \ IS_EMAIL_CONFIGURED, send_html_email, get_site_name, \
gen_shared_link, gen_shared_upload_link gen_shared_link, gen_shared_upload_link
@ -395,7 +395,7 @@ class AdminUsers(APIView):
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
email = request.data.get('email', None) email = request.data.get('email', None)
if not email or not is_valid_username(email): if not email or not is_valid_email(email):
error_msg = 'email invalid.' error_msg = 'email invalid.'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
@ -435,7 +435,7 @@ class AdminUsers(APIView):
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
contact_email = request.data.get('contact_email', None) contact_email = request.data.get('contact_email', None)
if contact_email and not is_valid_username(contact_email): if contact_email and not is_valid_email(contact_email):
error_msg = 'contact_email invalid.' error_msg = 'contact_email invalid.'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
@ -849,7 +849,7 @@ class AdminUserResetPassword(APIView):
1. only admin can perform this action. 1. only admin can perform this action.
""" """
if not is_valid_username(email): if not is_valid_username2(email):
error_msg = 'email invalid' error_msg = 'email invalid'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
@ -906,10 +906,6 @@ class AdminUserGroups(APIView):
1. Admin user; 1. Admin user;
""" """
if not is_valid_username(email):
error_msg = 'email invalid.'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
try: try:
User.objects.get(email=email) User.objects.get(email=email)
except User.DoesNotExist as e: except User.DoesNotExist as e:
@ -971,9 +967,6 @@ class AdminUserShareLinks(APIView):
Permission checking: Permission checking:
1. only admin can perform this action. 1. only admin can perform this action.
""" """
if not is_valid_username(email):
error_msg = 'email invalid.'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
try: try:
User.objects.get(email=email) User.objects.get(email=email)
@ -1004,10 +997,6 @@ class AdminUserUploadLinks(APIView):
1. only admin can perform this action. 1. only admin can perform this action.
""" """
if not is_valid_username(email):
error_msg = 'email invalid.'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
try: try:
User.objects.get(email=email) User.objects.get(email=email)
except User.DoesNotExist as e: except User.DoesNotExist as e:
@ -1038,10 +1027,6 @@ class AdminUserBeSharedRepos(APIView):
1. only admin can perform this action. 1. only admin can perform this action.
""" """
if not is_valid_username(email):
error_msg = 'email invalid.'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
try: try:
User.objects.get(email=email) User.objects.get(email=email)
except User.DoesNotExist as e: except User.DoesNotExist as e:

5
seahub/utils/__init__.py
View File

@ -285,6 +285,11 @@ def is_valid_username(username):
""" """
return is_valid_email(username) return is_valid_email(username)
def is_valid_username2(username):
""" New username check function, old version is used by many others, stay put
"""
return (not username.startswith(' ')) and (not username.endswith(' '))
def is_valid_dirent_name(name): def is_valid_dirent_name(name):
"""Check whether repo/dir/file name is valid. """Check whether repo/dir/file name is valid.
""" """