3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 14:37:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use certifi CA certs with urllib requests

Browse source 
CURA-6698
This commit is contained in:
Lipu Fei 2019-08-13 12:59:25 +02:00
parent 445fb59c12
commit 2ed5fd73bc
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/SliceInfoPlugin/SliceInfoJob.py
View file

@ -8,6 +8,8 @@ import ssl
import urllib.request import urllib.request
import urllib.error import urllib.error
import certifi
class SliceInfoJob(Job): class SliceInfoJob(Job):
def __init__(self, url, data): def __init__(self, url, data):
@ -20,11 +22,14 @@ class SliceInfoJob(Job):
Logger.log("e", "URL or DATA for sending slice info was not set!") Logger.log("e", "URL or DATA for sending slice info was not set!")
return return
# Submit data # CURA-6698 Create an SSL context and use certifi CA certificates for verification.
kwoptions = {"data" : self._data, "timeout" : 5} context = ssl.SSLContext(protocol = ssl.PROTOCOL_TLSv1_2)
context.load_verify_locations(cafile = certifi.where())
if Platform.isOSX(): # Submit data
kwoptions["context"] = ssl._create_unverified_context() kwoptions = {"data": self._data,
"timeout": 5,
"context": context}
Logger.log("i", "Sending anonymous slice info to [%s]...", self._url) Logger.log("i", "Sending anonymous slice info to [%s]...", self._url)
@ -35,4 +40,4 @@ class SliceInfoJob(Job):
except urllib.error.HTTPError: except urllib.error.HTTPError:
Logger.logException("e", "An HTTP error occurred while trying to send slice information") Logger.logException("e", "An HTTP error occurred while trying to send slice information")
except Exception: # We don't want any exception to cause problems except Exception: # We don't want any exception to cause problems
Logger.logException("e", "An exception occurred while trying to send slice information") Logger.logException("e", "An exception occurred while trying to send slice information")