diff --git a/config/appsettings.json b/config/appsettings.json
index 1ab6f09de4..06e19e001a 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",
@@ -257,11 +349,14 @@
],
"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",
- "ext": ".docxf"
+ "domain": "https://oforms.teamlab.info",
+ "path": "/api/upload",
+ "ext": ".docxf",
+ "dashboard": "/dashboard/api"
}
}
},
@@ -419,20 +514,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", "oforms.teamlab.info"]
+ "connect": ["cmsoforms.teamlab.info", "oforms.teamlab.info"]
}
},
"logocolors": [
@@ -473,4 +572,4 @@
"region": "us-east-1"
}
}
-}
+}
\ No newline at end of file
diff --git a/config/nginx/onlyoffice.conf b/config/nginx/onlyoffice.conf
index 8041d92980..1eb7b4c51c 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 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()
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 ==")
diff --git a/install/win/DocSpace.aip b/install/win/DocSpace.aip
index da79c53627..03f7a2326d 100644
--- a/install/win/DocSpace.aip
+++ b/install/win/DocSpace.aip
@@ -56,7 +56,6 @@
|
|
|
- |
|
|
|
@@ -1591,7 +1590,7 @@
|
|
|
- |
+ |
|
|
|
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 ########