From 4cbc5a9346e908cd70e556e9c21034ceef5a6e9a Mon Sep 17 00:00:00 2001 From: lian Date: Tue, 11 May 2021 11:44:32 +0800 Subject: [PATCH 1/4] pyjwt==2.1.* --- requirements.txt | 2 +- seahub/utils/__init__.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index bc8229a0fa..64870825cb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,6 +14,6 @@ djangorestframework==3.11.1 python-dateutil requests pillow -pyjwt +pyjwt==2.1.* pycryptodome requests_oauthlib diff --git a/seahub/utils/__init__.py b/seahub/utils/__init__.py index df3a4700f5..64261e4d33 100644 --- a/seahub/utils/__init__.py +++ b/seahub/utils/__init__.py @@ -1121,7 +1121,7 @@ if HAS_OFFICE_CONVERTER: def add_office_convert_task(file_id, doctype, raw_path): payload = {'exp': int(time.time()) + 300, } token = jwt.encode(payload, seahub.settings.SECRET_KEY, algorithm='HS256') - headers = {"Authorization": "Token %s" % token.decode()} + headers = {"Authorization": "Token %s" % token} params = {'file_id': file_id, 'doctype': doctype, 'raw_path': raw_path} url = urljoin(OFFICE_CONVERTOR_ROOT, '/add-task') requests.get(url, params, headers=headers) @@ -1130,7 +1130,7 @@ if HAS_OFFICE_CONVERTER: def query_office_convert_status(file_id, doctype): payload = {'exp': int(time.time()) + 300, } token = jwt.encode(payload, seahub.settings.SECRET_KEY, algorithm='HS256') - headers = {"Authorization": "Token %s" % token.decode()} + headers = {"Authorization": "Token %s" % token} params = {'file_id': file_id, 'doctype': doctype} url = urljoin(OFFICE_CONVERTOR_ROOT, '/query-status') d = requests.get(url, params, headers=headers) @@ -1158,7 +1158,7 @@ if HAS_OFFICE_CONVERTER: url = urljoin(OFFICE_CONVERTOR_ROOT, '/get-converted-page') payload = {'exp': int(time.time()) + 300, } token = jwt.encode(payload, seahub.settings.SECRET_KEY, algorithm='HS256') - headers = {"Authorization": "Token %s" % token.decode()} + headers = {"Authorization": "Token %s" % token} params = {'static_filename': static_filename, 'file_id': file_id} try: ret = requests.get(url, params, headers=headers) From 2451fe9593e8c49357cf195365f8c3b062d60618 Mon Sep 17 00:00:00 2001 From: lian Date: Fri, 14 May 2021 18:20:02 +0800 Subject: [PATCH 2/4] update watermark logig when view file via wopi --- seahub/templates/view_file_wopi.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/seahub/templates/view_file_wopi.html b/seahub/templates/view_file_wopi.html index af5f265643..b67c7fb923 100644 --- a/seahub/templates/view_file_wopi.html +++ b/seahub/templates/view_file_wopi.html @@ -45,7 +45,9 @@ document.getElementById('office_form').submit(); document.getElementById('office_frame').className = ''; +{% if enable_watermark %} +{% endif %} From 620d929545e2ba843becaa1a5b8f5e172cccad7f Mon Sep 17 00:00:00 2001 From: lian Date: Thu, 20 May 2021 10:55:50 +0800 Subject: [PATCH 3/4] update requirements.txt django-webpack_loader==0.7.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 64870825cb..90ff23b030 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ Django==1.11.29 future captcha django-statici18n -django-webpack_loader +django-webpack_loader==0.7.0 gunicorn pymysql django-picklefield==2.1.1 From 19ff00dbc434dbcc51f7c7cac3420e3f8bfeba1a Mon Sep 17 00:00:00 2001 From: lian Date: Thu, 20 May 2021 10:57:42 +0800 Subject: [PATCH 4/4] update onlyoffice always show watermark if enabled --- seahub/onlyoffice/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seahub/onlyoffice/utils.py b/seahub/onlyoffice/utils.py index 9717a2df07..08b8a9c735 100644 --- a/seahub/onlyoffice/utils.py +++ b/seahub/onlyoffice/utils.py @@ -107,7 +107,7 @@ def get_onlyoffice_dict(request, username, repo_id, file_path, file_id='', 'can_download': can_download, 'username': username, 'onlyoffice_force_save': ONLYOFFICE_FORCE_SAVE, - 'enable_watermark': ENABLE_WATERMARK and not can_edit, + 'enable_watermark': ENABLE_WATERMARK, } if ONLYOFFICE_JWT_SECRET: