# HG changeset patch # User ymh # Date 1437290344 -7200 # Node ID f40668870c7ad7ed157b1785b824e0fa55900e35 # Parent 55bf9e654eb4f4b228005bf559354da3b4ae36a8 add setting to disable httplib2 verification of certificates diff -r 55bf9e654eb4 -r f40668870c7a src/ldt/ldt/__init__.py --- a/src/ldt/ldt/__init__.py Sat Jul 18 14:13:31 2015 +0200 +++ b/src/ldt/ldt/__init__.py Sun Jul 19 09:19:04 2015 +0200 @@ -1,6 +1,6 @@ __all__ = ["VERSION", "get_version", "__version__"] -VERSION = (1, 56, 06, "final", 0) +VERSION = (1, 56, 07, "final", 0) def get_version(): diff -r 55bf9e654eb4 -r f40668870c7a src/ldt/ldt/settings.py --- a/src/ldt/ldt/settings.py Sat Jul 18 14:13:31 2015 +0200 +++ b/src/ldt/ldt/settings.py Sun Jul 19 09:19:04 2015 +0200 @@ -116,3 +116,6 @@ HAYSTACK_SIGNAL_PROCESSOR = getattr(settings, 'HAYSTACK_SIGNAL_PROCESSOR', 'ldt.indexation.signals.LdtSignalProcessor') +HTTPLIB2_DISABLE_SSL_CERTIFICATE_VALIDATION = getattr(settings,'HTTPLIB2_DISABLE_SSL_CERTIFICATE_VALIDATION', False) + + diff -r 55bf9e654eb4 -r f40668870c7a src/ldt/ldt/utils/url.py --- a/src/ldt/ldt/utils/url.py Sat Jul 18 14:13:31 2015 +0200 +++ b/src/ldt/ldt/utils/url.py Sun Jul 19 09:19:04 2015 +0200 @@ -1,13 +1,15 @@ +from ldt import settings +from ldt.utils.web_url_management import get_web_url +import re +import urlparse + +from django.conf import settings as djangosettings from django.contrib.staticfiles.storage import staticfiles_storage from django.core.urlresolvers import reverse, get_script_prefix from django.utils.encoding import iri_to_uri -from ldt.utils.web_url_management import get_web_url -from ldt import settings -from django.conf import settings as djangosettings +from django.utils.http import urlquote import httplib2 -import re -import urlparse -from django.utils.http import urlquote + def static(path): return staticfiles_storage.url(path) @@ -33,7 +35,7 @@ return urlparse.urljoin(domain, path) def request_with_auth(url, method='GET'): - h = httplib2.Http() + h = httplib2.Http(disable_ssl_certificate_validation=settings.HTTPLIB2_DISABLE_SSL_CERTIFICATE_VALIDATION) web_auth = settings.WEB_AUTH if settings.WEB_AUTH else [] for entry in web_auth: if not isinstance(entry, dict):