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 bug with using built-in Root CAs instead of Windows Store.

Browse Source
This commit is contained in:
Sergey Konovalov
2022-09-25 15:52:04 +03:00
parent 6f1ebe82e8
commit 1d383ee6dc
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Common/sources/utils.js
View File

@ -59,7 +59,13 @@ const logger = require('./logger');
const forwarded = require('forwarded');
const { RequestFilteringHttpAgent, RequestFilteringHttpsAgent } = require("request-filtering-agent");
const openpgp = require('openpgp');
require('win-ca');
const https = require('https');
const ca = require('win-ca/api');
if(!ca.disabled) {
ca({inject: true});
}
const contentDisposition = require('content-disposition');
var configIpFilter = config.get('services.CoAuthoring.ipfilter');
@ -80,7 +86,7 @@ const cfgTokenOutboxUrlExclusionRegex = config.get('services.CoAuthoring.token.o
const cfgPasswordEncrypt = config.get('openpgpjs.encrypt');
const cfgPasswordDecrypt = config.get('openpgpjs.decrypt');
const cfgPasswordConfig = config.get('openpgpjs.config');
const cfgRequesFilteringAgent = config.get('services.CoAuthoring.request-filtering-agent');
const cfgRequesFilteringAgent = Object.assign({}, https.globalAgent.options, config.get('services.CoAuthoring.request-filtering-agent'));
const cfgStorageExternalHost = config.get('storage.externalHost');
Object.assign(openpgp.config, cfgPasswordConfig);
@ -298,6 +304,9 @@ function downloadUrlPromiseWithoutRedirect(ctx, uri, optTimeout, optLimit, opt_A
var options = {uri: urlParsed, encoding: null, timeout: connectionAndInactivity, followRedirect: false};
if (opt_filterPrivate) {
options.agent = getRequestFilterAgent(uri, cfgRequesFilteringAgent);
} else {
//baseRequest creates new agent(win-ca injects in globalAgent)
options.agentOptions = https.globalAgent.options;
}
if (opt_Authorization) {
options.headers = {};
@ -392,6 +401,8 @@ function postRequestPromise(uri, postData, postDataStream, postDataSize, optTime
}
let connectionAndInactivity = optTimeout && optTimeout.connectionAndInactivity && ms(optTimeout.connectionAndInactivity);
var options = {uri: urlParsed, encoding: 'utf8', headers: headers, timeout: connectionAndInactivity};
//baseRequest creates new agent(win-ca injects in globalAgent)
options.agentOptions = https.globalAgent.options;
if (postData) {
options.body = postData;
}