|
@@ -18,6 +18,7 @@
|
|
|
|
|
|
|
|
import json
|
|
import json
|
|
|
import logging
|
|
import logging
|
|
|
|
|
+import re
|
|
|
import urllib
|
|
import urllib
|
|
|
|
|
|
|
|
from itertools import groupby
|
|
from itertools import groupby
|
|
@@ -31,7 +32,8 @@ from desktop.lib.rest import resource
|
|
|
|
|
|
|
|
from search.conf import EMPTY_QUERY, SECURITY_ENABLED
|
|
from search.conf import EMPTY_QUERY, SECURITY_ENABLED
|
|
|
from search.api import _compute_range_facet
|
|
from search.api import _compute_range_facet
|
|
|
-import re
|
|
|
|
|
|
|
+
|
|
|
|
|
+from libsolr.conf import SSL_CERT_CA_VERIFY
|
|
|
|
|
|
|
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
LOG = logging.getLogger(__name__)
|
|
@@ -47,7 +49,7 @@ class SolrApi(object):
|
|
|
"""
|
|
"""
|
|
|
http://wiki.apache.org/solr/CoreAdmin#CoreAdminHandler
|
|
http://wiki.apache.org/solr/CoreAdmin#CoreAdminHandler
|
|
|
"""
|
|
"""
|
|
|
- def __init__(self, solr_url, user, security_enabled=SECURITY_ENABLED.get()):
|
|
|
|
|
|
|
+ def __init__(self, solr_url, user, security_enabled=SECURITY_ENABLED.get(), ssl_cert_ca_verify=SSL_CERT_CA_VERIFY.get()):
|
|
|
self._url = solr_url
|
|
self._url = solr_url
|
|
|
self._user = user
|
|
self._user = user
|
|
|
self._client = HttpClient(self._url, logger=LOG)
|
|
self._client = HttpClient(self._url, logger=LOG)
|
|
@@ -56,6 +58,8 @@ class SolrApi(object):
|
|
|
if self.security_enabled:
|
|
if self.security_enabled:
|
|
|
self._client.set_kerberos_auth()
|
|
self._client.set_kerberos_auth()
|
|
|
|
|
|
|
|
|
|
+ self._client.set_verify(ssl_cert_ca_verify)
|
|
|
|
|
+
|
|
|
self._root = resource.Resource(self._client)
|
|
self._root = resource.Resource(self._client)
|
|
|
|
|
|
|
|
# The Kerberos handshake requires two requests in order to authenticate,
|
|
# The Kerberos handshake requires two requests in order to authenticate,
|