[bug] Fix downloadFile for wopi; For bug https://bugzilla.onlyoffice.…

…com/show_bug.cgi?id=66818
ONLYOFFICE · Mar 11, 2024 · 7326335 · 7326335
1 parent 41d6ab3
commit 7326335
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/DocService/sources/canvasservice.js b/DocService/sources/canvasservice.js
@@ -1613,6 +1613,14 @@ exports.downloadFile = function(req, res) {
           isInJwtToken = true;
         } else if (wopiClient.isWopiJwtToken(decoded)) {
           ({url, headers} = wopiClient.getWopiFileUrl(ctx, decoded.fileInfo, decoded.userAuth));
+          let filterStatus = yield wopiClient.checkIpFilter(ctx, url);
+          if (0 === filterStatus) {
+            //todo false? (true because it passed checkIpFilter for wopi)
+            //todo use directIfIn
+            isInJwtToken = true;
+          } else {
+            errorDescription = 'access deny';
+          }
         } else if (!tenTokenEnableBrowser) {
           //todo token required
           if (decoded.url) {

diff --git a/DocService/sources/wopiClient.js b/DocService/sources/wopiClient.js
@@ -748,7 +748,8 @@ function checkFileInfo(ctx, wopiSrc, access_token, opt_sc) {
       }
       fillStandardHeaders(ctx, headers, uri, access_token);
       ctx.logger.debug('wopi checkFileInfo request uri=%s headers=%j', uri, headers);
-      //todo false?
+      //todo false? (true because it passed checkIpFilter for wopi)
+      //todo use directIfIn
       let isInJwtToken = true;
       let getRes = yield utils.downloadUrlPromise(ctx, uri, tenDownloadTimeout, undefined, undefined, isInJwtToken, headers);
       ctx.logger.debug(`wopi checkFileInfo headers=%j body=%s`, getRes.response.headers, getRes.body);
@@ -969,6 +970,7 @@ function dummyOk(req, res) {
   res.sendStatus(200);
 }
 
+exports.checkIpFilter = checkIpFilter;
 exports.discovery = discovery;
 exports.collaboraCapabilities = collaboraCapabilities;
 exports.parseWopiCallback = parseWopiCallback;