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] Get allowedCorsOrigins from runtime.json; Fix multiple event subscription; Fix proxyRequest

Browse Source
This commit is contained in:
Sergey Konovalov
2025-06-11 15:21:13 +03:00
parent f1e423d6e6
commit e1e06b6394
3 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DocService/sources/ai/aiProxyHandler.js
View File

@ -62,14 +62,16 @@ const nodeCache = new utils.NodeCache(cfgAiApiCache);
*/
function handleCorsHeaders(req, res, ctx, handleOptions = true) {
const requestOrigin = req.headers.origin;
const tenAiApiAllowedOrigins = ctx.getCfg('aiSettings.allowedCorsOrigins', cfgAiApiAllowedOrigins);
// If no origin in request or allowed origins list is empty, do nothing
if (!requestOrigin || cfgAiApiAllowedOrigins.length === 0) {
if (!requestOrigin || tenAiApiAllowedOrigins.length === 0) {
return false;
}
// If the origin is in our allowed list
if (cfgAiApiAllowedOrigins.includes(requestOrigin)) {
if (tenAiApiAllowedOrigins.includes(requestOrigin)) {
res.setHeader('Access-Control-Allow-Origin', requestOrigin);
res.setHeader('Access-Control-Allow-Credentials', 'true');
res.setHeader('Vary', 'Origin'); // Important when using dynamic origin
@ -113,7 +115,9 @@ async function proxyRequest(req, res) {
try {
ctx.logger.info('Start proxyRequest');
await ctx.initTenantCache();
const tenTokenEnableBrowser = ctx.getCfg('services.CoAuthoring.token.enable.browser', cfgTokenEnableBrowser);
const tenAiApiTimeout = ctx.getCfg('aiSettings.timeout', cfgAiApiTimeout);
const tenAiApi = ctx.getCfg('aiSettings', cfgAiSettings);
// 1. Handle CORS preflight (OPTIONS) requests if necessary
@ -134,8 +138,8 @@ async function proxyRequest(req, res) {
// Configure timeout options for the request
const timeoutOptions = {
connectionAndInactivity: cfgAiApiTimeout,
wholeCycle: cfgAiApiTimeout
connectionAndInactivity: tenAiApiTimeout,
wholeCycle: tenAiApiTimeout
};
// Get request size limit if configured