From 63086dcb1ecdba441fd8e67d875d62565008b1a2 Mon Sep 17 00:00:00 2001
From: 2Shirt <1923621+2Shirt@users.noreply.github.com>
Date: Sat, 6 Oct 2018 22:27:33 -0600
Subject: [PATCH] Added 1201 Root CA

* Allows uploaded crash reports under Windows
---
 .bin/1201_Root_CA.crt            | 36 ++++++++++++++++++++++++++++++++
 .bin/Scripts/functions/common.py | 10 ++++++---
 .bin/Scripts/settings/main.py    |  2 ++
 3 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 .bin/1201_Root_CA.crt

diff --git a/.bin/1201_Root_CA.crt b/.bin/1201_Root_CA.crt
new file mode 100644
index 00000000..7d8ae206
--- /dev/null
+++ b/.bin/1201_Root_CA.crt
@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
diff --git a/.bin/Scripts/functions/common.py b/.bin/Scripts/functions/common.py
index e3c7ac97..92fcbc92 100644
--- a/.bin/Scripts/functions/common.py
+++ b/.bin/Scripts/functions/common.py
@@ -588,6 +588,8 @@ def upload_crash_details():
     if 'LogFile' in global_vars and global_vars['LogFile']:
         if ask('Upload crash details to {}?'.format(CRASH_SERVER['Name'])):
             with open(global_vars['LogFile']) as f:
+                certificate_authority = r'{}\{}'.format(
+                    global_vars['BinDir'], ROOT_CA_NAME)
                 data = '''{}
 #############################
 Runtime Details:
@@ -602,9 +604,11 @@ global_vars: {}'''.format(f.read(), sys.argv, global_vars)
                     CRASH_SERVER['Url'],
                     global_vars.get('Date-Time', 'Unknown Date-Time'),
                     filename)
-                r = requests.put(url, data=data,
-                    headers = {'X-Requested-With': 'XMLHttpRequest'},
-                    auth = (CRASH_SERVER['User'], CRASH_SERVER['Pass']))
+                r = requests.put(
+                    url, data=data,
+                    headers={'X-Requested-With': 'XMLHttpRequest'},
+                    auth=(CRASH_SERVER['User'], CRASH_SERVER['Pass']),
+                    verify=certificate_authority)
                 # Raise exception if upload NS
                 if not r.ok:
                     raise Exception
diff --git a/.bin/Scripts/settings/main.py b/.bin/Scripts/settings/main.py
index 3810066a..b59dce45 100644
--- a/.bin/Scripts/settings/main.py
+++ b/.bin/Scripts/settings/main.py
@@ -25,6 +25,8 @@ IMGUR_CLIENT_ID='3d1ee1d38707b85'
 MPRIME_LIMIT='7'                          # of minutes to run Prime95 during hw-diags
 ROOT_PASSWORD='1201 loves computers!'
 TECH_PASSWORD='Sorted1201'
+# Root Certificate Authority
+ROOT_CA_NAME='1201_Root_CA.crt'
 # Server IP addresses
 OFFICE_SERVER_IP='10.11.1.20'
 QUICKBOOKS_SERVER_IP='10.11.1.20'