pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-02-10 18:05:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch hotfix/v7.1.1 into master

Browse Source
This commit is contained in:
papacarlo
2022-06-01 16:21:09 +00:00
parent 9bc3986caa 1e355eaa6b
commit 3b6f8f473c
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Common/config/default.json
View File

@ -106,12 +106,12 @@
"limits_tempfile_upload": 104857600,
"limits_image_size": 26214400,
"limits_image_download_timeout": {
"connectionAndInactivity": "10s",
"connectionAndInactivity": "2m",
"wholeCycle": "2m"
},
"callbackRequestTimeout": {
"connectionAndInactivity": "10s",
"wholeCycle": "2m"
"connectionAndInactivity": "10m",
"wholeCycle": "10m"
},
"healthcheckfilepath": "../public/healthcheck.docx",
"savetimeoutdelay": 5000,
@ -218,13 +218,15 @@
},
"inbox": {
"header": "Authorization",
"prefix": "Bearer "
"prefix": "Bearer ",
"inBody": false
},
"outbox": {
"header": "Authorization",
"prefix": "Bearer ",
"algorithm": "HS256",
"expires": "5m",
"inBody": false,
"urlExclusionRegex": ""
},
"session": {
@ -275,7 +277,7 @@
"converter": {
"maxDownloadBytes": 104857600,
"downloadTimeout": {
"connectionAndInactivity": "10s",
"connectionAndInactivity": "2m",
"wholeCycle": "2m"
},
"downloadAttemptMaxCount": 3,

16
DocService/sources/DocsCoServer.js
View File

@ -499,7 +499,7 @@ function sendDataWarning(conn, msg) {
sendData(conn, {type: "warning", message: msg});
}
function sendDataMessage(conn, msg) {
if (false !== conn.permissions.chat) {
if (!conn.permissions || false !== conn.permissions.chat) {
sendData(conn, {type: "message", messages: msg});
} else {
logger.debug("sendDataMessage permissions.chat==false: userId = %s docId = %s", conn.user && conn.user.id, conn.docId);
@ -1867,14 +1867,10 @@ exports.install = function(server, callbackFunction) {
}
return name;
}
function isEditMode(permissions, mode, def) {
if (permissions && mode) {
//as in web-apps/apps/documenteditor/main/app/controller/Main.js
return mode !== 'view' && (permissions.edit !== false || permissions.review === true ||
function isEditMode(permissions, mode) {
//as in web-apps/apps/documenteditor/main/app/controller/Main.js
return (!mode || mode !== 'view') && (!permissions || permissions.edit !== false || permissions.review === true ||
permissions.comment === true || permissions.fillForms === true);
} else {
return def;
}
}
function fillDataFromWopiJwt(decoded, data) {
let res = true;
@ -1934,7 +1930,7 @@ exports.install = function(server, callbackFunction) {
var res = "";
if (!decoded?.document?.key) {
res = "document.key";
} else if (!decoded?.document?.permissions) {
} else if (data.permissions && !decoded?.document?.permissions) {
res = "document.permissions";
} else if (!decoded?.document?.url) {
res = "document.url";
@ -2178,7 +2174,7 @@ exports.install = function(server, callbackFunction) {
idOriginal: curUserIdOriginal,
username: fillUsername(data),
indexUser: curIndexUser,
view: !isEditMode(data.permissions, data.mode, !data.view)
view: !isEditMode(data.permissions, data.mode)
};
conn.isCloseCoAuthoring = data.isCloseCoAuthoring;
conn.isEnterCorrectPassword = data.isEnterCorrectPassword;