From 1fe4fd98492e9eef9a31798ada59f111dd4bd8d2 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Thu, 30 Jan 2020 14:06:16 -0700 Subject: [PATCH] Added 1201 Root CA to fix upload sections --- scripts/wk/cfg/1201_Root_CA.crt | 36 +++++++++++++++++++++++++++++++++ scripts/wk/graph.py | 7 ++++--- scripts/wk/std.py | 1 + 3 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 scripts/wk/cfg/1201_Root_CA.crt diff --git a/scripts/wk/cfg/1201_Root_CA.crt b/scripts/wk/cfg/1201_Root_CA.crt new file mode 100644 index 00000000..7d8ae206 --- /dev/null +++ b/scripts/wk/cfg/1201_Root_CA.crt @@ -0,0 +1,36 @@ +-----BEGIN CERTIFICATE----- +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 +-----END CERTIFICATE----- diff --git a/scripts/wk/graph.py b/scripts/wk/graph.py index 8de5c3be..f15e04e7 100644 --- a/scripts/wk/graph.py +++ b/scripts/wk/graph.py @@ -9,8 +9,8 @@ import math import pathlib import time -import Gnuplot import requests +import Gnuplot from wk.cfg.net import BENCHMARK_SERVER, IMGUR_CLIENT_ID from wk.std import color_string @@ -219,8 +219,9 @@ def upload_to_nextcloud(image_path, ticket_number, dev_name): requests.put( url, data=image_data, - headers = {'X-Requested-With': 'XMLHttpRequest'}, - auth = (BENCHMARK_SERVER['User'], BENCHMARK_SERVER['Pass']), + headers={'X-Requested-With': 'XMLHttpRequest'}, + auth=(BENCHMARK_SERVER['User'], BENCHMARK_SERVER['Pass']), + verify='/usr/local/bin/wk/cfg/1201_Root_CA.crt', ) # Return folder link diff --git a/scripts/wk/std.py b/scripts/wk/std.py index 4e84a25e..d7085c3c 100644 --- a/scripts/wk/std.py +++ b/scripts/wk/std.py @@ -1053,6 +1053,7 @@ def upload_debug_report(report, compress=True, reason='DEBUG'): data=xz_report if compress else report, headers=headers, auth=(CRASH_SERVER['User'], CRASH_SERVER.get('Pass', '')), + verify='/usr/local/bin/wk/cfg/1201_Root_CA.crt', ) # Check response