perso/syncserver
perso/syncserver
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use PyOpenSSL for requests module if available

Browse Source
This commit is contained in:
Ryan Kelly 2015-10-05 09:05:09 +11:00
parent 674a3020cf
commit a521aed39f
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
syncserver/__init__.py
View File

@ -9,6 +9,12 @@ from urlparse import urlparse, urlunparse
from pyramid.response import Response from pyramid.response import Response
from pyramid.events import NewRequest, subscriber from pyramid.events import NewRequest, subscriber
try:
import requests.packages.urllib3.contrib.pyopenssl
HAS_PYOPENSSL = True
except ImportError:
HAS_PYOPENSSL = False
import mozsvc.config import mozsvc.config
from tokenserver.util import _JSONError from tokenserver.util import _JSONError
@ -22,6 +28,11 @@ def includeme(config):
# Necessary for e.g. created-on-demand sqlite database files. # Necessary for e.g. created-on-demand sqlite database files.
os.umask(0077) 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. # Sanity-check the deployment settings and provide sensible defaults.
settings = config.registry.settings settings = config.registry.settings
public_url = settings.get("syncserver.public_url") public_url = settings.get("syncserver.public_url")