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

[bug] Fix directUrl=false handling in multitenant mode

Browse Source
This commit is contained in:
Sergey Konovalov
2025-06-19 14:08:25 +03:00
parent 15280218f1
commit beb20c6394
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DocService/sources/routes/static.js
View File

@ -36,6 +36,7 @@ const { pipeline } = require('node:stream/promises');
const express = require('express');
const config = require('config');
const operationContext = require('./../../../Common/sources/operationContext');
const tenantManager = require('./../../../Common/sources/tenantManager');
const utils = require('./../../../Common/sources/utils');
const storage = require('./../../../Common/sources/storage/storage-base');
const urlModule = require("url");
@ -108,7 +109,7 @@ function createCacheMiddleware(prefix, rootPath, cfgStorage, secret, rout) {
}
const filename = urlParsed.pathname && decodeURIComponent(path.basename(urlParsed.pathname));
const filePath = decodeURI(req.url.substring(1, index));
let filePath = decodeURI(req.url.substring(1, index));
if (cfgStorage.name === 'storage-fs') {
const sendFileOptions = {
root: rootPath,
@ -129,6 +130,9 @@ function createCacheMiddleware(prefix, rootPath, cfgStorage, secret, rout) {
const ctx = new operationContext.Context();
ctx.initFromRequest(req);
await ctx.initTenantCache();
if (tenantManager.isMultitenantMode(ctx) && filePath.startsWith(ctx.tenant + '/')) {
filePath = filePath.substring(ctx.tenant.length + 1);
}
const result = await storage.createReadStream(ctx, filePath, rout);
res.setHeader('Content-Type', mime.getType(filename));