From 041d333be751b749508562154eba1fd186814797 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Wed, 21 Jun 2017 14:20:42 -0700
Subject: [PATCH] Actually use certificate.disabled property

---
 app/network/certificate-url-parse.js | 11 ++++++-----
 app/network/network.js               |  4 ++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/network/certificate-url-parse.js b/app/network/certificate-url-parse.js
index 83a3126035..db385bd393 100644
--- a/app/network/certificate-url-parse.js
+++ b/app/network/certificate-url-parse.js
@@ -1,4 +1,5 @@
 import {parse as urlParse} from 'url';
+
 const WILDCARD_CHARACTER = '*';
 const WILDCARD_SUBSTITUTION = Math.random().toString().split('.')[1];
 const WILDCARD_SUBSTITUTION_PATTERN = new RegExp(`${WILDCARD_SUBSTITUTION}`, 'g');
@@ -8,18 +9,18 @@ export default function certificateUrlParse (url) {
     return urlParse(url);
   } else {
     const parsed = urlParse(url.replace(/\*/g, WILDCARD_SUBSTITUTION));
-    parsed.hostname = reinstateWildcards(parsed.hostname);
-    parsed.host = reinstateWildcards(parsed.host);
-    parsed.href = reinstateWildcards(parsed.href);
+    parsed.hostname = _reinstateWildcards(parsed.hostname);
+    parsed.host = _reinstateWildcards(parsed.host);
+    parsed.href = _reinstateWildcards(parsed.href);
 
     return parsed;
   }
 }
 
-const reinstateWildcards = (string) => {
+function _reinstateWildcards (string) {
   if (string) {
     return string.replace(WILDCARD_SUBSTITUTION_PATTERN, WILDCARD_CHARACTER);
   } else {
     return string;
   }
-};
+}
diff --git a/app/network/network.js b/app/network/network.js
index ce97adc405..269609e29d 100644
--- a/app/network/network.js
+++ b/app/network/network.js
@@ -255,6 +255,10 @@ export function _actuallySend (renderedRequest, workspace, settings) {
 
       // Set client certs if needed
       for (const certificate of workspace.certificates) {
+        if (certificate.disabled) {
+          continue;
+        }
+
         const cHostWithProtocol = setDefaultProtocol(certificate.host, 'https:');
 
         if (urlMatchesCertHost(cHostWithProtocol, renderedRequest.url)) {