MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-10-29 23:35:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

finally add http/s_proxy support for oidc and more in future #6616

Browse Source 
Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
si458 2025-10-28 16:42:32 +00:00
parent 7681f52ee6
commit 1bd06ccded
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webserver.js
View File

@ -58,6 +58,10 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
// Setup WebAuthn / FIDO2 // Setup WebAuthn / FIDO2
obj.webauthn = require('./webauthn.js').CreateWebAuthnModule(); obj.webauthn = require('./webauthn.js').CreateWebAuthnModule();
if (process.env['HTTP_PROXY'] || process.env['HTTPS_PROXY'] || process.env['http_proxy'] || process.env['https_proxy']) {
obj.httpsProxyAgent = new (require('https-proxy-agent').HttpsProxyAgent)(process.env['HTTP_PROXY'] || process.env['HTTPS_PROXY'] || process.env['http_proxy'] || process.env['https_proxy']);
}
// Variables // Variables
obj.args = args; obj.args = args;
obj.parent = parent; obj.parent = parent;
@ -7979,6 +7983,10 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
} }
strategy.options.params.scope = strategy.options.params.scope.join(' ') strategy.options.params.scope = strategy.options.params.scope.join(' ')
if (obj.httpsProxyAgent) {
// process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; // add using environment variables if needs be not here
strategy.obj.openidClient.custom.setHttpOptionsDefaults({ agent: obj.httpsProxyAgent });
}
// Discover additional information if available, use endpoints from config if present // Discover additional information if available, use endpoints from config if present
let issuer let issuer
try { try {
@ -8182,6 +8190,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
const options = { const options = {
'headers': { authorization: 'Bearer ' + tokenset.access_token } 'headers': { authorization: 'Bearer ' + tokenset.access_token }
} }
if (obj.httpsProxyAgent) { options.agent = obj.httpsProxyAgent; }
const req = require('https').get(url, options, (res) => { const req = require('https').get(url, options, (res) => {
let data = [] let data = []
res.on('data', (chunk) => { res.on('data', (chunk) => {