mirror of
https://github.com/GNS3/gns3-server.git
synced 2024-12-24 06:56:42 +00:00
Revert "Use finer-grained control for truststore"
This reverts commit 5e1792ff4d
.
This commit is contained in:
parent
5e1792ff4d
commit
945a2c98cd
@ -21,7 +21,7 @@ import uuid
|
|||||||
import asyncio
|
import asyncio
|
||||||
import aiohttp
|
import aiohttp
|
||||||
import shutil
|
import shutil
|
||||||
import ssl
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import importlib_resources
|
import importlib_resources
|
||||||
@ -37,6 +37,14 @@ import logging
|
|||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
try:
|
||||||
|
import truststore
|
||||||
|
truststore.inject_into_ssl()
|
||||||
|
log.info("Using system certificate store for SSL connections")
|
||||||
|
except ImportError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
class ApplianceManager:
|
class ApplianceManager:
|
||||||
"""
|
"""
|
||||||
Manages appliances
|
Manages appliances
|
||||||
@ -46,13 +54,6 @@ class ApplianceManager:
|
|||||||
|
|
||||||
self._appliances = {}
|
self._appliances = {}
|
||||||
self._appliances_etag = None
|
self._appliances_etag = None
|
||||||
self._ssl_context = None
|
|
||||||
try:
|
|
||||||
import truststore
|
|
||||||
self._ssl_context = truststore.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
|
|
||||||
log.info("Using system certificate store for SSL connections")
|
|
||||||
except ImportError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def appliances_etag(self):
|
def appliances_etag(self):
|
||||||
@ -181,7 +182,7 @@ class ApplianceManager:
|
|||||||
|
|
||||||
symbol_url = "https://raw.githubusercontent.com/GNS3/gns3-registry/master/symbols/{}".format(symbol)
|
symbol_url = "https://raw.githubusercontent.com/GNS3/gns3-registry/master/symbols/{}".format(symbol)
|
||||||
async with aiohttp.ClientSession() as session:
|
async with aiohttp.ClientSession() as session:
|
||||||
async with session.get(symbol_url, ssl=self._ssl_context) as response:
|
async with session.get(symbol_url) as response:
|
||||||
if response.status != 200:
|
if response.status != 200:
|
||||||
log.warning("Could not retrieve appliance symbol {} from GitHub due to HTTP error code {}".format(symbol, response.status))
|
log.warning("Could not retrieve appliance symbol {} from GitHub due to HTTP error code {}".format(symbol, response.status))
|
||||||
else:
|
else:
|
||||||
@ -209,7 +210,6 @@ class ApplianceManager:
|
|||||||
async with aiohttp.ClientSession() as session:
|
async with aiohttp.ClientSession() as session:
|
||||||
async with session.get(
|
async with session.get(
|
||||||
'https://api.github.com/repos/GNS3/gns3-registry/contents/appliances',
|
'https://api.github.com/repos/GNS3/gns3-registry/contents/appliances',
|
||||||
ssl=self._ssl_context,
|
|
||||||
headers=headers
|
headers=headers
|
||||||
) as response:
|
) as response:
|
||||||
if response.status == 304:
|
if response.status == 304:
|
||||||
|
Loading…
Reference in New Issue
Block a user