{% trans "Hi," %}
-{% blocktrans %}{{ inviter }} invited you to join {{ site_name }}. Please click the link below:{% endblocktrans %} +{% blocktrans with inviter_name=inviter|email2nickname %}{{ inviter_name }} invited you to join {{ site_name }}. Please click the link below:{% endblocktrans %}
{{ url_base }}{% url 'invitations:token_view' token %} diff --git a/seahub/onlyoffice/utils.py b/seahub/onlyoffice/utils.py index 451d4f110d..8054c2e719 100644 --- a/seahub/onlyoffice/utils.py +++ b/seahub/onlyoffice/utils.py @@ -33,7 +33,7 @@ def generate_onlyoffice_cache_key(repo_id, file_path): def get_onlyoffice_dict(request, username, repo_id, file_path, file_id='', can_edit=False, can_download=True): - logger.info('{} open file {} in repo {}'.format(username, file_path, repo_id)) + logger.info('{} open file {} in repo {} with can_edit {}'.format(username, file_path, repo_id, can_edit)) repo = seafile_api.get_repo(repo_id) if repo.is_virtual: @@ -55,7 +55,7 @@ def get_onlyoffice_dict(request, username, repo_id, file_path, file_id='', file_id, 'download', username, - use_onetime=True) + use_onetime=False) if not dl_token: return None @@ -67,39 +67,52 @@ def get_onlyoffice_dict(request, username, repo_id, file_path, file_id='', else: document_type = 'text' - cache_key = generate_onlyoffice_cache_key(origin_repo_id, origin_file_path) - doc_key = cache.get(cache_key) - - logger.info('get doc_key {} from cache by cache_key {}'.format(doc_key, cache_key)) - - # temporary solution when failed to get data from cache(django_pylibmc) - # when init process for the first time - if not doc_key: - doc_key = cache.get(cache_key) - - # In theory, file is unlocked when editing finished. - # This can happend if memcache is restarted or memcache is full and doc key is deleted. - if not doc_key and if_locked_by_online_office(repo_id, file_path): - logger.warning('no doc_key in cache and file({} in {}) is locked by online office'.format(file_path, repo_id)) - - if not doc_key: + if not can_edit: info_bytes = force_bytes(origin_repo_id + origin_file_path + file_id) doc_key = hashlib.md5(info_bytes).hexdigest()[:20] - logger.info('generate new doc_key {} by info {}'.format(doc_key, info_bytes)) + else: + cache_key = generate_onlyoffice_cache_key(origin_repo_id, origin_file_path) + doc_key = cache.get(cache_key) - doc_info = json.dumps({'repo_id': origin_repo_id, - 'file_path': origin_file_path, - 'username': username}) - cache.set("ONLYOFFICE_%s" % doc_key, doc_info, None) - logger.info('set doc_key {} and doc_info {} to cache'.format(doc_key, doc_info)) + # temporary solution when failed to get data from cache(django_pylibmc) + # when init process for the first time + if not doc_key: + doc_key = cache.get(cache_key) + if doc_key: + logger.info('get doc_key {} from cache by cache_key {}'.format(doc_key, cache_key)) + else: + # In theory, file is unlocked when editing finished. + # This can happend if memcache is restarted or memcache is full and doc key is deleted. + if if_locked_by_online_office(repo_id, file_path): + logger.warning('no doc_key in cache, but file {} in {} is locked by online office'.format(file_path, repo_id)) + + # generate doc_key + info_bytes = force_bytes(origin_repo_id + origin_file_path + file_id) + doc_key = hashlib.md5(info_bytes).hexdigest()[:20] + logger.info('generate new doc_key {} by repo_id {} file_path {} file_id {}'.format(doc_key, + origin_repo_id, + origin_file_path, + file_id)) + logger.info('set cache_key {} and doc_key {} to cache'.format(cache_key, doc_key)) + cache.set(cache_key, doc_key, None) + + if not cache.get("ONLYOFFICE_%s" % doc_key): + + doc_info = json.dumps({'repo_id': origin_repo_id, + 'file_path': origin_file_path, + 'username': username}) + + cache.set("ONLYOFFICE_%s" % doc_key, doc_info, None) + logger.info('set doc_key {} and doc_info {} to cache'.format(doc_key, doc_info)) + + # for render onlyoffice html file_name = os.path.basename(file_path.rstrip('/')) doc_url = gen_file_get_url(dl_token, file_name) base_url = get_site_scheme_and_netloc() onlyoffice_editor_callback_url = reverse('onlyoffice_editor_callback') - callback_url = urllib.parse.urljoin(base_url, - onlyoffice_editor_callback_url) + callback_url = urllib.parse.urljoin(base_url, onlyoffice_editor_callback_url) return_dict = { 'repo_id': repo_id, diff --git a/seahub/onlyoffice/views.py b/seahub/onlyoffice/views.py index 53e78616e6..14e3ceee7e 100644 --- a/seahub/onlyoffice/views.py +++ b/seahub/onlyoffice/views.py @@ -77,15 +77,19 @@ def onlyoffice_editor_callback(request): post_data = json.loads(request.body) status = int(post_data.get('status', -1)) - if status not in (1, 2, 4, 6): - logger.error('onlyoffice status invalid: {}'.format(status)) + if status == 1: + logger.info('status {}'.format(status)) + return HttpResponse('{"error": 0}') + + if status not in (2, 4, 6): + logger.error('status {}: invalid status'.format(status)) return HttpResponse('{"error": 0}') # get file basic info doc_key = post_data.get('key') doc_info_from_cache = cache.get("ONLYOFFICE_%s" % doc_key) if not doc_info_from_cache: - logger.error('cache.get("ONLYOFFICE_%s" % {}) return None'.format(doc_key)) + logger.error('status {}: can not get doc_info from cache by doc_key {}'.format(status, doc_key)) return HttpResponse('{"error": 0}') doc_info = json.loads(doc_info_from_cache) @@ -136,14 +140,12 @@ def onlyoffice_editor_callback(request): logger.info('status {}: delete cache_key {} from cache'.format(status, cache_key)) cache.delete(cache_key) - if is_pro_version() and if_locked_by_online_office(repo_id, file_path): - seafile_api.unlock_file(repo_id, file_path) + logger.info('status {}: delete doc_key {} from cache'.format(status, doc_key)) + cache.delete("ONLYOFFICE_%s" % doc_key) - # 6 - document is being edited, but the current document state is saved, - if status == 6: - # cache document key when forcesave - logger.info('status {}: set cache_key {} and doc_key {} to cache'.format(status, cache_key, doc_key)) - cache.set(cache_key, doc_key, None) + if is_pro_version() and if_locked_by_online_office(repo_id, file_path): + logger.info('status {}: unlock {} in repo_id {}'.format(status, file_path, repo_id)) + seafile_api.unlock_file(repo_id, file_path) # 4 - document is closed with no changes, if status == 4: @@ -151,7 +153,11 @@ def onlyoffice_editor_callback(request): logger.info('status {}: delete cache_key {} from cache'.format(status, cache_key)) cache.delete(cache_key) + logger.info('status {}: delete doc_key {} from cache'.format(status, doc_key)) + cache.delete("ONLYOFFICE_%s" % doc_key) + if is_pro_version() and if_locked_by_online_office(repo_id, file_path): + logger.info('status {}: unlock {} in repo_id {}'.format(status, file_path, repo_id)) seafile_api.unlock_file(repo_id, file_path) return HttpResponse('{"error": 0}') diff --git a/seahub/settings.py b/seahub/settings.py index 803f602347..72b081ad9e 100644 --- a/seahub/settings.py +++ b/seahub/settings.py @@ -295,7 +295,6 @@ ENABLE_USER_CLEAN_TRASH = True LOGIN_REDIRECT_URL = '/' LOGIN_URL = '/accounts/login/' LOGIN_ERROR_DETAILS = False -LOGOUT_URL = '/accounts/logout/' LOGOUT_REDIRECT_URL = None ACCOUNT_ACTIVATION_DAYS = 7 diff --git a/seahub/templates/base_for_react.html b/seahub/templates/base_for_react.html index ba4db97bca..b099467891 100644 --- a/seahub/templates/base_for_react.html +++ b/seahub/templates/base_for_react.html @@ -40,7 +40,6 @@ siteName: '{{ site_name|escapejs }}', siteRoot: '{{ SITE_ROOT }}', loginUrl: '{{ LOGIN_URL }}', - logoutUrl: '{{ LOGOUT_URL }}', isPro: '{{ is_pro }}', isDocs: '{{ is_docs }}', lang: '{{ LANGUAGE_CODE }}', diff --git a/seahub/two_factor/views/login.py b/seahub/two_factor/views/login.py index b2587b8fd7..f22f78e347 100644 --- a/seahub/two_factor/views/login.py +++ b/seahub/two_factor/views/login.py @@ -179,7 +179,7 @@ class TwoFactorVerifyView(SessionWizardView): device = StaticDevice.objects.device_for_user(self.user.username) context['backup_tokens'] = device.token_set.count() if device else 0 - context['cancel_url'] = settings.LOGOUT_URL + context['cancel_url'] = '/accounts/logout/' context['form_prefix'] = '%s-' % self.steps.current login_bg_image_path = get_login_bg_image_path() context['login_bg_image_path'] = login_bg_image_path diff --git a/seahub/views/file.py b/seahub/views/file.py index aa0f0eb6a9..425c5dc4b2 100644 --- a/seahub/views/file.py +++ b/seahub/views/file.py @@ -819,9 +819,11 @@ def view_lib_file(request, repo_id, path): if is_pro_version() and can_edit: try: if not is_locked: + logger.info('{} lock {} in repo {} when open it via OnlyOffice.'.format(ONLINE_OFFICE_LOCK_OWNER, path, repo_id)) seafile_api.lock_file(repo_id, path, ONLINE_OFFICE_LOCK_OWNER, int(time.time()) + 40 * 60) elif locked_by_online_office: + logger.info('{} relock {} in repo {} when open it via OnlyOffice.'.format(ONLINE_OFFICE_LOCK_OWNER, path, repo_id)) seafile_api.refresh_file_lock(repo_id, path, int(time.time()) + 40 * 60) except Exception as e: diff --git a/seahub/views/repo.py b/seahub/views/repo.py index d5917ea469..34aa2f7127 100644 --- a/seahub/views/repo.py +++ b/seahub/views/repo.py @@ -24,7 +24,7 @@ from seahub.views import gen_path_link, get_repo_dirents, \ from seahub.utils import gen_dir_share_link, \ gen_shared_upload_link, user_traffic_over_limit, render_error, \ - get_file_type_and_ext, get_service_url + get_file_type_and_ext, get_service_url, normalize_dir_path from seahub.utils.repo import is_repo_owner, get_repo_owner from seahub.settings import ENABLE_UPLOAD_FOLDER, \ ENABLE_RESUMABLE_FILEUPLOAD, ENABLE_THUMBNAIL, \ @@ -57,13 +57,6 @@ def is_password_set(repo_id, username): return seafile_api.is_password_set(repo_id, username) -def get_path_from_request(request): - path = request.GET.get('p', '/') - if path[-1] != '/': - path = path + '/' - return path - - def get_next_url_from_request(request): return request.GET.get('next', None) @@ -121,7 +114,10 @@ def repo_history_view(request, repo_id): raise Http404 username = request.user.username - path = get_path_from_request(request) + + path = request.GET.get('p', '/') + path = normalize_dir_path(path) + user_perm = check_folder_permission(request, repo.id, '/') if user_perm is None: return render_error(request, _('Permission denied')) @@ -277,15 +273,14 @@ def view_shared_dir(request, fileshare): # Get path from frontend, use '/' if missing, and construct request path # with fileshare.path to real path, used to fetch dirents by RPC. req_path = request.GET.get('p', '/') - if req_path[-1] != '/': - req_path += '/' + req_path = normalize_dir_path(req_path) if req_path == '/': real_path = fileshare.path else: real_path = posixpath.join(fileshare.path, req_path.lstrip('/')) - if real_path[-1] != '/': # Normalize dir path - real_path += '/' + + real_path = normalize_dir_path(real_path) repo = get_repo(repo_id) if not repo: