Merge pull request #33 from jp-modernisation-gouv-fr/master

add proxy option
matrix-org · Dec 21, 2018 · 4ab98de · 4ab98de
2 parents 267c79f + 8628987
commit 4ab98de
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/config/default.config.yaml b/config/default.config.yaml
@@ -27,6 +27,9 @@ scan:
 #
 # altRemovalCmd: 'rm'
 
+# Optional. If need to use a proxy to access baseUrl
+# proxy: "http://10.228.1.1:80"
+
 middleware:
     # Configuration for using encrypted_body in POST requests.
     encryptedBody:

diff --git a/src/config.js b/src/config.js
@@ -32,6 +32,7 @@ const configSchema = Joi.object().keys({
         directDownload: Joi.boolean(),
     }).required(),
     altRemovalCmd: Joi.string(),
+    proxy: Joi.string(),
     middleware: Joi.object().keys({
         encryptedBody: Joi.object().keys({
             pickleKey: Joi.string().required(),

diff --git a/src/reporting.js b/src/reporting.js
@@ -25,6 +25,7 @@ const executeCommand = require('./execute-cmd.js');
 const decryptFile = require('./decrypt-file.js');
 
 const crypto = require('crypto');
+const { getConfig } = require('./config.js');
 
 const { getConfig } = require('./config.js');
 const fileType = require('file-type');
@@ -197,8 +198,15 @@ async function _generateReportFromDownload(console, domain, mediaId, matrixFile,
     try {
         downloadHeaders = await new Promise((resolve, reject) => {
             let responseHeaders;
+	    let connect = {url: httpUrl, encoding: null, qs: thumbnailQueryParams};
+	    const config = getConfig();
+	    const proxy = config.proxy;
+	    if (proxy != null) {
+		connect.proxy = proxy;
+	    }
+
             request
-                .get({url: httpUrl, encoding: null, qs: thumbnailQueryParams})
+                .get(connect)
                 .on('error', reject)
                 .on('response', (response) => {
                     responseHeaders = response.headers;