From b136ff88fbbe9b33ca1358af8117b8c1feb088b8 Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Thu, 2 Nov 2023 18:43:46 +0300 Subject: [PATCH 01/10] fix bug 64787 --- config/appsettings.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/appsettings.json b/config/appsettings.json index 178cee0333..bd4ce565fd 100644 --- a/config/appsettings.json +++ b/config/appsettings.json @@ -257,10 +257,12 @@ ], "index": [".pptx", ".xlsx", ".docx"], "oform": { - "url": "https://cmsoforms.teamlab.info/api/oforms/", + "domain": "https://cmsoforms.teamlab.info/", + "path": "/api/oforms/", "ext": ".oform", "upload": { - "url": "https://oforms.teamlab.info/api/upload", + "domain": "https://oforms.teamlab.info/", + "path": "/api/upload", "ext": ".docxf" } } From d7fe0c18d3bf43a894705597005290172a387003 Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Tue, 7 Nov 2023 15:28:04 +0300 Subject: [PATCH 02/10] OFormSettings: added dashboard path --- config/appsettings.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config/appsettings.json b/config/appsettings.json index bd4ce565fd..16e816b385 100644 --- a/config/appsettings.json +++ b/config/appsettings.json @@ -257,13 +257,14 @@ ], "index": [".pptx", ".xlsx", ".docx"], "oform": { - "domain": "https://cmsoforms.teamlab.info/", + "domain": "https://cmsoforms.teamlab.info", "path": "/api/oforms/", "ext": ".oform", "upload": { - "domain": "https://oforms.teamlab.info/", + "domain": "https://oforms.teamlab.info", "path": "/api/upload", - "ext": ".docxf" + "ext": ".docxf", + "dashboard": "/dashboard/api" } } }, From 374099b1e5cdb6c9b2db8d29ad1b4ef80c403d5d Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Wed, 8 Nov 2023 19:19:04 +0300 Subject: [PATCH 03/10] csp only for html --- config/nginx/onlyoffice.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/nginx/onlyoffice.conf b/config/nginx/onlyoffice.conf index 8041d92980..7c9808b3fe 100644 --- a/config/nginx/onlyoffice.conf +++ b/config/nginx/onlyoffice.conf @@ -94,7 +94,8 @@ server { set $csp ""; access_by_lua ' - if ngx.req.get_method() == "GET" then + local accept_header = ngx.req.get_headers()["Accept"] + if ngx.req.get_method() == "GET" and not accept_header == ngx.null and string.find(accept_header, "html") then local key = string.format("csp:%s",ngx.var.host) local redis = require "resty.redis" local red = redis:new() From ae6e20522ae713e043ea7243c00f4a6450fe9cf3 Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Wed, 8 Nov 2023 23:53:42 +0300 Subject: [PATCH 04/10] csp only for html --- config/nginx/onlyoffice.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/nginx/onlyoffice.conf b/config/nginx/onlyoffice.conf index 7c9808b3fe..1eb7b4c51c 100644 --- a/config/nginx/onlyoffice.conf +++ b/config/nginx/onlyoffice.conf @@ -95,7 +95,7 @@ server { set $csp ""; access_by_lua ' local accept_header = ngx.req.get_headers()["Accept"] - if ngx.req.get_method() == "GET" and not accept_header == ngx.null and string.find(accept_header, "html") then + if ngx.req.get_method() == "GET" and accept_header ~= nil and string.find(accept_header, "html") then local key = string.format("csp:%s",ngx.var.host) local redis = require "resty.redis" local red = redis:new() From 02ccda1bc003d7614d4a5fc914af1d3efec5d733 Mon Sep 17 00:00:00 2001 From: Nasrullo Nurullaev <61620246+nasrullonurullaev@users.noreply.github.com> Date: Thu, 9 Nov 2023 14:03:03 +0500 Subject: [PATCH 05/10] Fix issue with sed file in config folder (#47) --- install/win/build-batch.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/win/build-batch.bat b/install/win/build-batch.bat index b7a8b0f6c4..6dc215f341 100644 --- a/install/win/build-batch.bat +++ b/install/win/build-batch.bat @@ -55,7 +55,7 @@ del /f /q buildtools\install\win\Files\config\*.dev.json %sed% "s_\(\"samesite\":\).*,_\1 \"None\",_g" -i buildtools\install\win\Files\config\appsettings.json ::redirectUrl value replacement -%sed% "s/teamlab.info/onlyoffice.com/g" -i buildtools\install\win\Files\config/autofac.consumers.json +%sed% "s/teamlab.info/onlyoffice.com/g" -i buildtools\install\win\Files\config\autofac.consumers.json %sed% "s_\(\"wrongPortalNameUrl\":\).*,_\1 \"\",_g" -i buildtools\install\win\Files\public\scripts\config.json REM echo ######## Remove AWSTarget from nlog.config ######## From ab05bbd9ae8c439dea81235c3181db784a3e01f9 Mon Sep 17 00:00:00 2001 From: Nasrullo Nurullaev <61620246+nasrullonurullaev@users.noreply.github.com> Date: Thu, 9 Nov 2023 14:46:39 +0500 Subject: [PATCH 06/10] Fix PostgreSQL display name (#48) --- install/win/DocSpace.aip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/win/DocSpace.aip b/install/win/DocSpace.aip index da79c53627..a300defa42 100644 --- a/install/win/DocSpace.aip +++ b/install/win/DocSpace.aip @@ -1591,7 +1591,7 @@ - + From 8e8d381514261bf858bd7e2ba46a65e6f5acc511 Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Thu, 9 Nov 2023 15:17:43 +0300 Subject: [PATCH 07/10] fix bug 65011 --- config/appsettings.json | 348 +++++++++++++++++++++++++--------------- 1 file changed, 220 insertions(+), 128 deletions(-) diff --git a/config/appsettings.json b/config/appsettings.json index 0ee51cefde..92b72b0b1d 100644 --- a/config/appsettings.json +++ b/config/appsettings.json @@ -76,139 +76,231 @@ }, "docservice": { "coauthor-docs": [ - ".pptx", - ".ppsx", - ".xlsx", - ".csv", - ".docx", - ".docxf", - ".oform", - ".txt" + ".csv", + ".docm", + ".docx", + ".docxf", + ".dotm", + ".dotx", + ".oform", + ".potm", + ".potx", + ".ppsm", + ".pptm", + ".ppsx", + ".pptx", + ".txt", + ".xlsm", + ".xlsx", + ".xltm", + ".xltx" ], - "commented-docs": [".docx", ".docxf", ".xlsx", ".pptx"], + "commented-docs": [ + ".docm", + ".docx", + ".docxf", + ".dotm", + ".dotx", + ".potm", + ".potx", + ".ppsm", + ".pptm", + ".ppsx", + ".pptx", + ".xlsm", + ".xlsx", + ".xltm", + ".xltx" + ], "convert-docs": [ - ".pptm", - ".ppt", - ".ppsm", - ".pps", - ".potx", - ".potm", - ".pot", - ".odp", - ".fodp", - ".otp", - ".xlsm", - ".xls", - ".xltx", - ".xltm", - ".xlt", - ".ods", - ".fods", - ".ots", - ".docm", - ".doc", - ".dotx", - ".dotm", - ".dot", - ".odt", - ".fodt", - ".ott", - ".rtf", - ".xml" + ".doc", + ".dot", + ".dps", + ".dpt", + ".epub", + ".et", + ".ett", + ".fb2", + ".fodp", + ".fods", + ".fodt", + ".htm", + ".html", + ".mht", + ".mhtml", + ".odp", + ".ods", + ".odt", + ".otp", + ".ots", + ".ott", + ".pot", + ".pps", + ".ppt", + ".rtf", + ".stw", + ".sxc", + ".sxi", + ".sxw", + ".wps", + ".wpt", + ".xls", + ".xlsb", + ".xlt", + ".xml" ], "edited-docs": [ - ".pptx", - ".pptm", - ".ppt", - ".ppsx", - ".ppsm", - ".pps", - ".potx", - ".potm", - ".pot", - ".odp", - ".fodp", - ".otp", - ".xlsx", - ".xlsm", - ".xls", - ".xltx", - ".xltm", - ".xlt", - ".ods", - ".fods", - ".ots", - ".csv", - ".docx", - ".docxf", - ".oform", - ".docm", - ".doc", - ".dotx", - ".dotm", - ".dot", - ".odt", - ".fodt", - ".ott", - ".txt", - ".rtf", - ".mht", - ".html", - ".htm" + ".csv", + ".doc", + ".docm", + ".docx", + ".docxf", + ".dot", + ".dotm", + ".dotx", + ".dps", + ".dpt", + ".epub", + ".et", + ".ett", + ".fb2", + ".fodp", + ".fods", + ".fodt", + ".htm", + ".html", + ".mht", + ".mhtml", + ".odp", + ".ods", + ".odt", + ".oform", + ".otp", + ".ots", + ".ott", + ".pot", + ".potm", + ".potx", + ".pps", + ".ppsm", + ".ppsx", + ".ppt", + ".pptm", + ".pptx", + ".rtf", + ".stw", + ".sxc", + ".sxi", + ".sxw", + ".txt", + ".wps", + ".wpt", + ".xls", + ".xlsb", + ".xlsm", + ".xlsx", + ".xlt", + ".xltm", + ".xltx", + ".xml" ], - "encrypted-docs": [".docx", ".docxf", ".xlsx", ".pptx", ".oform"], + "encrypted-docs": + [ + ".docm", + ".docx", + ".docxf", + ".dotm", + ".dotx", + ".oform", + ".potm", + ".potx", + ".ppsm", + ".pptm", + ".ppsx", + ".pptx", + ".xlsm", + ".xlsx", + ".xltm", + ".xltx" + ], "formfilling-docs": [".oform"], - "customfilter-docs": [".xlsx"], - "reviewed-docs": [".docx", ".docxf"], - "viewed-docs": [ - ".pptx", - ".pptm", - ".ppt", - ".ppsx", - ".ppsm", - ".pps", - ".potx", - ".potm", - ".pot", - ".odp", - ".fodp", - ".otp", - ".gslides", - ".xlsx", - ".xlsm", - ".xls", - ".xltx", - ".xltm", - ".xlt", - ".ods", - ".fods", - ".ots", - ".gsheet", - ".csv", - ".docx", - ".docxf", - ".oform", - ".docm", - ".doc", - ".dotx", - ".dotm", - ".dot", - ".odt", - ".fodt", - ".ott", - ".gdoc", - ".txt", - ".rtf", - ".mht", - ".html", - ".htm", - ".xml", - ".fb2", - ".epub", - ".pdf", - ".djvu", - ".xps", - ".oxps" + "customfilter-docs": + [ + ".xlsm", + ".xlsx", + ".xltm", + ".xltx" + ], + "reviewed-docs": + [ + ".docm", + ".docx", + ".docxf", + ".dotm", + ".dotx" + ], + "viewed-docs": + [ + ".csv", + ".djvu", + ".doc", + ".docm", + ".docx", + ".docxf", + ".dot", + ".dotm", + ".dotx", + ".dps", + ".dpt", + ".epub", + ".et", + ".ett", + ".fb2", + ".fodp", + ".fods", + ".fodt", + ".gdoc", + ".gsheet", + ".gslides", + ".htm", + ".html", + ".mht", + ".mhtml", + ".odp", + ".ods", + ".odt", + ".oform", + ".otp", + ".ots", + ".ott", + ".oxps", + ".pdf", + ".pot", + ".potm", + ".potx", + ".pps", + ".ppsm", + ".ppsx", + ".ppt", + ".pptm", + ".pptx", + ".rtf", + ".stw", + ".sxc", + ".sxi", + ".sxw", + ".txt", + ".wps", + ".wpt", + ".xls", + ".xlsb", + ".xlsm", + ".xlsx", + ".xlt", + ".xltm", + ".xltx", + ".xml", + ".xps" ], "secret": { "value": "secret", @@ -476,4 +568,4 @@ "region": "us-east-1" } } -} +} \ No newline at end of file From 76cd8c871ddcb631c34531872976d0c4643a2323 Mon Sep 17 00:00:00 2001 From: Nasrullo Nurullaev <61620246+nasrullonurullaev@users.noreply.github.com> Date: Thu, 9 Nov 2023 17:32:17 +0500 Subject: [PATCH 08/10] Disable verbose logging for Windows (#52) --- install/win/DocSpace.aip | 1 - 1 file changed, 1 deletion(-) diff --git a/install/win/DocSpace.aip b/install/win/DocSpace.aip index a300defa42..03f7a2326d 100644 --- a/install/win/DocSpace.aip +++ b/install/win/DocSpace.aip @@ -56,7 +56,6 @@ - From 8ce55ae9b944a45283123c30aa40d15c2f682753 Mon Sep 17 00:00:00 2001 From: Andrey Savihin Date: Thu, 9 Nov 2023 15:35:20 +0300 Subject: [PATCH 09/10] fix Bug 64923 ( added frame-src, connect-src, media-src ) --- config/appsettings.json | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/config/appsettings.json b/config/appsettings.json index 78d87d805f..0246b7d7e7 100644 --- a/config/appsettings.json +++ b/config/appsettings.json @@ -419,20 +419,24 @@ "style": ["'self'", "'unsafe-inline'"], "img": ["'self'", "data:", "blob:"], "frame": ["'self'"], - "fonts": ["'self'", "data:"] + "fonts": ["'self'", "data:"], + "connect": ["'self'"], + "media": ["'self'"] }, "zendesk": { - "def": ["*.zdassets.com", "*.zopim.com", "*.zendesk.com", "wss:"], "script": ["*.zdassets.com", "*.zopim.com", "'unsafe-eval'"], - "img": ["*.zopim.io"] + "img": ["*.zopim.io"], + "connect": ["*.zdassets.com", "*.zendesk.com", "*.zopim.com", "wss:"], + "media": ["*.zdassets.com"] }, "firebase": { "script": ["*.googleapis.com"], - "def": ["*.googleapis.com"] + "frame": ["personal-teamlab-guru.firebaseapp.com"], + "connect": ["personal-teamlab-guru.firebaseapp.com", "*.googleapis.com"] }, "oform": { "img": ["static-oforms.teamlab.info"], - "def": ["cmsoforms.teamlab.info"] + "connect": ["cmsoforms.teamlab.info", "oforms.teamlab.info"] } }, "logocolors": [ From ed1eeae97b782a8df558706514d4d1607460fc7e Mon Sep 17 00:00:00 2001 From: Alexey Safronov Date: Fri, 10 Nov 2023 12:36:51 +0400 Subject: [PATCH 10/10] Update build-services.py Replaced archive format from "zip" to "tar" --- install/common/build-services.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/common/build-services.py b/install/common/build-services.py index aec3d154cb..31de2194a6 100755 --- a/install/common/build-services.py +++ b/install/common/build-services.py @@ -46,7 +46,7 @@ with open(file_path, 'wb') as open_file: st = os.stat(file_path) os.chmod(file_path, st.st_mode | stat.S_IEXEC) -format = "zip" +format = "tar" for service in BACKEND_NODEJS_SERVICES: print(f"== Build {service} project ==")