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] Use "requestDefaults" options for requests to client-s3; Fix bug 70400

Browse Source
This commit is contained in:
Sergey Konovalov
2024-09-24 15:46:03 +03:00
parent c750dbcfea
commit c8b259302d
4 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Common/npm-shrinkwrap.json generated
View File

@ -2771,6 +2771,15 @@
}
}
},
"@aws-sdk/node-http-handler": {
"version": "3.374.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.374.0.tgz",
"integrity": "sha512-v1Z6m0wwkf65/tKuhwrtPRqVoOtNkDTRn2MBMtxCwEw+8V8Q+YRFqVgGN+J1n53ktE0G5OYVBux/NHiAjJHReQ==",
"requires": {
"@smithy/node-http-handler": "^1.0.2",
"tslib": "^2.5.0"
}
},
"@aws-sdk/region-config-resolver": {
"version": "3.614.0",
"resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.614.0.tgz",

1
Common/package.json
View File

@ -5,6 +5,7 @@
"private": true,
"dependencies": {
"@aws-sdk/client-s3": "3.637.0",
"@aws-sdk/node-http-handler": "3.374.0",
"@aws-sdk/s3-request-presigner": "3.370.0",
"amqplib": "0.8.0",
"co": "4.6.0",

9
Common/sources/storage-s3.js
View File

@ -33,11 +33,13 @@
'use strict';
const fs = require('fs');
const url = require('url');
const { Agent } = require('https');
const path = require('path');
const { S3Client, ListObjectsCommand, HeadObjectCommand} = require("@aws-sdk/client-s3");
const { GetObjectCommand, PutObjectCommand, CopyObjectCommand} = require("@aws-sdk/client-s3");
const { DeleteObjectsCommand, DeleteObjectCommand } = require("@aws-sdk/client-s3");
const { getSignedUrl } = require("@aws-sdk/s3-request-presigner");
const { NodeHttpHandler } = require("@aws-sdk/node-http-handler");
const mime = require('mime');
const config = require('config');
const utils = require('./utils');
@ -45,6 +47,7 @@ const ms = require('ms');
const commonDefines = require('./../../Common/sources/commondefines');
const cfgExpSessionAbsolute = ms(config.get('services.CoAuthoring.expire.sessionabsolute'));
const cfgRequestDefaults = config.get('services.CoAuthoring.requestDefaults');
//This operation enables you to delete multiple objects from a bucket using a single HTTP request. You may specify up to 1000 keys.
const MAX_DELETE_OBJECTS = 1000;
@ -71,6 +74,12 @@ function getS3Client(storageCfg) {
configS3.tls = storageCfg.sslEnabled;
configS3.forcePathStyle = storageCfg.s3ForcePathStyle;
}
//todo dedicated options?
const agent = new Agent(cfgRequestDefaults);
configS3.requestHandler = new NodeHttpHandler({
httpAgent: agent,
httpsAgent: agent
});
let configJson = JSON.stringify(configS3);
let client = clients[configJson];
if (!client) {