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

Fixed bug in quoting/unquoting string

Browse Source
This commit is contained in:
zhengxie 2013-02-25 16:39:20 +08:00
parent 7736b78def
commit 37f3631ad8
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api2/views.py
View File

@ -527,8 +527,7 @@ class StarredFileView(APIView):
def post(self, request, format=None): def post(self, request, format=None):
# add starred file # add starred file
repo_id = request.POST.get('repo_id', '') repo_id = request.POST.get('repo_id', '')
path = unquote(request.POST.get('p', '')) path = unquote(request.POST.get('p', '').encode('utf-8'))
if not (repo_id and path): if not (repo_id and path):
return api_error(status.HTTP_400_BAD_REQUEST, return api_error(status.HTTP_400_BAD_REQUEST,
'Repo_id or path is missing.') 'Repo_id or path is missing.')
@ -630,6 +629,7 @@ class FileView(APIView):
'The new name is the same to the old') 'The new name is the same to the old')
newname = check_filename_with_rename(repo_id, parent_dir, newname) newname = check_filename_with_rename(repo_id, parent_dir, newname)
newname_utf8 = newname.encode('utf-8')
try: try:
seafserv_threaded_rpc.rename_file (repo_id, parent_dir_utf8, seafserv_threaded_rpc.rename_file (repo_id, parent_dir_utf8,
oldname_utf8, newname, oldname_utf8, newname,
@ -643,7 +643,7 @@ class FileView(APIView):
else: else:
resp = Response('success', status=status.HTTP_301_MOVED_PERMANENTLY) resp = Response('success', status=status.HTTP_301_MOVED_PERMANENTLY)
uri = reverse('FileView', args=[repo_id], request=request) uri = reverse('FileView', args=[repo_id], request=request)
resp['Location'] = uri + '?p=' + quote(parent_dir_utf8) + quote(newname) resp['Location'] = uri + '?p=' + quote(parent_dir_utf8) + quote(newname_utf8)
return resp return resp
elif operation.lower() == 'move': elif operation.lower() == 'move':
@ -741,7 +741,7 @@ class FileSharedLinkView(APIView):
def put(self, request, repo_id, format=None): def put(self, request, repo_id, format=None):
# generate file shared link # generate file shared link
path = unquote(request.DATA.get('p', '')) path = unquote(request.DATA.get('p', '').encode('utf-8'))
if not path: if not path:
return api_error(status.HTTP_400_BAD_REQUEST, 'Path is missing.') return api_error(status.HTTP_400_BAD_REQUEST, 'Path is missing.')
@ -838,6 +838,7 @@ class DirView(APIView):
operation = request.POST.get('operation', '') operation = request.POST.get('operation', '')
if operation.lower() == 'mkdir': if operation.lower() == 'mkdir':
parent_dir = os.path.dirname(path) parent_dir = os.path.dirname(path)
parent_dir_utf8 = parent_dir.encode('utf-8')
new_dir_name = os.path.basename(path) new_dir_name = os.path.basename(path)
new_dir_name = check_filename_with_rename(repo_id, parent_dir, new_dir_name = check_filename_with_rename(repo_id, parent_dir,
new_dir_name) new_dir_name)
@ -856,7 +857,7 @@ class DirView(APIView):
else: else:
resp = Response('success', status=status.HTTP_201_CREATED) resp = Response('success', status=status.HTTP_201_CREATED)
uri = reverse('DirView', args=[repo_id], request=request) uri = reverse('DirView', args=[repo_id], request=request)
resp['Location'] = uri + '?p=' + quote(parent_dir) + \ resp['Location'] = uri + '?p=' + quote(parent_dir_utf8) + \
quote(new_dir_name_utf8) quote(new_dir_name_utf8)
return resp return resp
# elif operation.lower() == 'rename': # elif operation.lower() == 'rename':

2
views.py
View File

@ -1772,7 +1772,7 @@ def get_repo_download_url(request, repo_id):
return '', _(u"Invalid server setting") return '', _(u"Invalid server setting")
ccnet_applet_root = get_ccnetapplet_root() ccnet_applet_root = get_ccnetapplet_root()
email = urllib2.quote(request.user.username) email = urllib2.quote(request.user.username.encode('utf-8'))
url = ccnet_applet_root + "/repo/download/" url = ccnet_applet_root + "/repo/download/"