[ssl.ca] always treat ssl.ca as an array, Joi will convert if it is not

(cherry picked from commit 2a236bd4821a7030f2a6624a86633f935952173c)
spalger · Mar 11, 2016 · 65a0579 · 65a0579
1 parent a41619d
commit 65a0579
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/server/__tests__/proxy_config.js b/server/__tests__/proxy_config.js
@@ -39,15 +39,15 @@ describe('ProxyConfig', function () {
     it('uses ca to create sslAgent', function () {
       const config = new ProxyConfig({
         ssl: {
-          ca: 'path/to/ca'
+          ca: ['path/to/ca']
         }
       });
 
       expect(config.sslAgent).to.be.a(https.Agent);
       sinon.assert.calledOnce(https.Agent);
       const sslAgentOpts = https.Agent.firstCall.args[0];
       expect(sslAgentOpts).to.eql({
-        ca: { path: 'path/to/ca' },
+        ca: [{ path: 'path/to/ca' }],
         cert: undefined,
         key: undefined,
       });
@@ -74,7 +74,7 @@ describe('ProxyConfig', function () {
     it('uses ca, cert, and key to create sslAgent', function () {
       const config = new ProxyConfig({
         ssl: {
-          ca: 'path/to/ca',
+          ca: ['path/to/ca'],
           cert: 'path/to/cert',
           key: 'path/to/key'
         }
@@ -84,7 +84,7 @@ describe('ProxyConfig', function () {
       sinon.assert.calledOnce(https.Agent);
       const sslAgentOpts = https.Agent.firstCall.args[0];
       expect(sslAgentOpts).to.eql({
-        ca: { path: 'path/to/ca' },
+        ca: [{ path: 'path/to/ca' }],
         cert: { path: 'path/to/cert' },
         key: { path: 'path/to/key' },
       });
@@ -131,7 +131,7 @@ describe('ProxyConfig', function () {
           it('creates but does not output the agent', function () {
             const config = new ProxyConfig({
               ssl: {
-                ca: 'path/to/ca'
+                ca: ['path/to/ca']
               }
             });
 
@@ -183,7 +183,7 @@ describe('ProxyConfig', function () {
           it('creates and outputs the agent', function () {
             const config = new ProxyConfig({
               ssl: {
-                ca: 'path/to/ca'
+                ca: ['path/to/ca']
               }
             });
 

diff --git a/server/__tests__/proxy_config_collection.js b/server/__tests__/proxy_config_collection.js
@@ -132,7 +132,7 @@ describe('ProxyConfigCollection', function () {
       return new ProxyConfigCollection([
         {
           match: { host: '*.internal.org' },
-          ssl: { ca: 'path/to/ca' }
+          ssl: { ca: ['path/to/ca'] }
         },
         {
           match: { host: '*' },

diff --git a/server/proxy_config.js b/server/proxy_config.js
@@ -44,7 +44,7 @@ export class ProxyConfig {
     this.verifySsl = ssl.verify;
 
     const sslAgentOpts = {
-      ca: ssl.ca && readFileSync(ssl.ca),
+      ca: ssl.ca && ssl.ca.map(ca => readFileSync(ca)),
       cert: ssl.cert && readFileSync(ssl.cert),
       key: ssl.key && readFileSync(ssl.key),
     };