Use PyOpenSSL for requests module if available
This commit is contained in:
parent
674a3020cf
commit
a521aed39f
@ -9,6 +9,12 @@ from urlparse import urlparse, urlunparse
|
||||
from pyramid.response import Response
|
||||
from pyramid.events import NewRequest, subscriber
|
||||
|
||||
try:
|
||||
import requests.packages.urllib3.contrib.pyopenssl
|
||||
HAS_PYOPENSSL = True
|
||||
except ImportError:
|
||||
HAS_PYOPENSSL = False
|
||||
|
||||
import mozsvc.config
|
||||
|
||||
from tokenserver.util import _JSONError
|
||||
@ -22,6 +28,11 @@ def includeme(config):
|
||||
# Necessary for e.g. created-on-demand sqlite database files.
|
||||
os.umask(0077)
|
||||
|
||||
# If PyOpenSSL is available, configure requests to use it.
|
||||
# This helps improve security on older python versions.
|
||||
if HAS_PYOPENSSL:
|
||||
requests.packages.urllib3.contrib.pyopenssl.inject_into_urllib3()
|
||||
|
||||
# Sanity-check the deployment settings and provide sensible defaults.
|
||||
settings = config.registry.settings
|
||||
public_url = settings.get("syncserver.public_url")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user