possible proxy fix for dalicc request

Author: holycrab13

server/app/common/file-analyzer.js

@@ -1,44 +1,10 @@
 const shasum = require('js-sha256');
 const axios = require('axios');
 const UriUtils = require('./utils/uri-utils');
-const { HttpsProxyAgent } = require('https-proxy-agent');
-const { HttpProxyAgent } = require('http-proxy-agent');
+const ServerUtils = require('./utils/server-utils');
 
 var analyzer = {};
 
-function getProxyAgent(url) {
-  const target = new URL(url);
-  const host = target.hostname;
-
-  const noProxyVar =
-    process.env.NO_PROXY || process.env.no_proxy || '';
-  const noProxy = noProxyVar.split(',').map(s => s.trim()).filter(Boolean);
-
-  if (noProxy.some(np => host === np || host.endsWith('.' + np)))
-    return null;
-
-  const httpsProxy =
-    process.env.HTTPS_PROXY || process.env.https_proxy;
-  const httpProxy =
-    process.env.HTTP_PROXY || process.env.http_proxy;
-
-  const proxyUrl = target.protocol === 'https:' ? httpsProxy : httpProxy;
-
-  if (!proxyUrl) return null;
-
-  const agent =
-    target.protocol === 'https:'
-      ? new HttpsProxyAgent(proxyUrl)
-      : new HttpProxyAgent(proxyUrl);
-
-  // Allow MITM proxy certificates (testing only)
-  if (process.env.ALLOW_INSECURE_PROXY === 'true') {
-    agent.options.rejectUnauthorized = false;
-  }
-
-  return agent;
-}
-
 
 analyzer.processFile = async function (fileUri, url, webdav) {
 
@@ -143,7 +109,7 @@ analyzer.analyzeFile = async function (url) {
 
     var hash = shasum.create();
 
-    const agent = getProxyAgent(url);
+    const agent = ServerUtils.getProxyAgent(url);
 
     const response = await axios.request({
       method: 'GET',

server/app/common/utils/server-utils.js

@@ -2,9 +2,43 @@ var ASN1 = require('asn1js');
 const fs = require('fs');
 const DatabusUris = require('../../../../public/js/utils/databus-uris');
 const DatabusConstants = require('../../../../public/js/utils/databus-constants');
+const { HttpsProxyAgent } = require('https-proxy-agent');
+const { HttpProxyAgent } = require('http-proxy-agent');
 
 class ServerUtils {
 
+  static getProxyAgent(url) {
+    const target = new URL(url);
+    const host = target.hostname;
+
+    const noProxyVar =
+      process.env.NO_PROXY || process.env.no_proxy || '';
+    const noProxy = noProxyVar.split(',').map(s => s.trim()).filter(Boolean);
+
+    if (noProxy.some(np => host === np || host.endsWith('.' + np)))
+      return null;
+
+    const httpsProxy =
+      process.env.HTTPS_PROXY || process.env.https_proxy;
+    const httpProxy =
+      process.env.HTTP_PROXY || process.env.http_proxy;
+
+    const proxyUrl = target.protocol === 'https:' ? httpsProxy : httpProxy;
+
+    if (!proxyUrl) return null;
+
+    const agent =
+      target.protocol === 'https:'
+        ? new HttpsProxyAgent(proxyUrl)
+        : new HttpProxyAgent(proxyUrl);
+
+    // Allow MITM proxy certificates (testing only)
+    if (process.env.ALLOW_INSECURE_PROXY === 'true') {
+      agent.options.rejectUnauthorized = false;
+    }
+
+    return agent;
+  }
 
   static setupRequireExtensions() {
     // add a sparql file loading extension (simply read the file as a string)

server/app/webapp/modules/publish-wizard.js

@@ -5,13 +5,23 @@ const ServerUtils = require('../../common/utils/server-utils.js');
 module.exports = function (router, protector) {
   require('../../common/file-analyzer').route(router, protector);
 
-  router.get('/app/publish-wizard/licenses', protector.protect(), async function(req, res, next) {
+  router.get('/app/publish-wizard/licenses', protector.protect(), async function (req, res, next) {
     const search = new URL(`${req.protocol}://${req.get('host')}${req.originalUrl}`).search;
 
+    const url = `https://api.dalicc.net/licenselibrary/list${search}`;
+    const agent = ServerUtils.getProxyAgent(url);
+
     try {
-      const daliccRes = await axios.get(`https://api.dalicc.net/licenselibrary/list${search}`, {
-        headers: { accept: 'application/json' }
+
+      const daliccRes = await axios.request({
+        method: 'GET',
+        url,
+        headers: { accept: 'application/json' },
+        httpAgent: agent,
+        httpsAgent: agent,
+        proxy: false
       });
+
       res.status(200).send(daliccRes.data);
     } catch (err) {
       console.log(err);