Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support for custom SSL/TLS certificates #147

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added support for custom SSL/TLS certificates #147

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddf7d0e
custom certs allowed
syats Mar 17, 2020
5706360
custom certs allowed
syats Mar 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions SPARQLWrapper/Wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import re
import sys
import warnings
import ssl

import json
from KeyCaseInsensitiveDict import KeyCaseInsensitiveDict
Expand Down Expand Up @@ -209,7 +210,8 @@ class SPARQLWrapper(object):
pattern = re.compile(r"(?P<queryType>(CONSTRUCT|SELECT|ASK|DESCRIBE|INSERT|DELETE|CREATE|CLEAR|DROP|LOAD|COPY|MOVE|ADD))", re.VERBOSE | re.IGNORECASE)
comments_pattern = re.compile(r"(^|\n)\s*#.*?\n")

def __init__(self, endpoint, updateEndpoint=None, returnFormat=XML, defaultGraph=None, agent=__agent__):
def __init__(self, endpoint, updateEndpoint=None, returnFormat=XML, defaultGraph=None, agent=__agent__,
custom_cert_filename=None):
"""
Class encapsulating a full SPARQL call.

Expand All @@ -235,6 +237,7 @@ def __init__(self, endpoint, updateEndpoint=None, returnFormat=XML, defaultGraph
self._defaultGraph = defaultGraph
self.onlyConneg = False # Only Content Negotiation
self.customHttpHeaders = {}
self.custom_cert_filename = custom_cert_filename

if returnFormat in _allowedFormats:
self._defaultReturnFormat = returnFormat
Expand Down Expand Up @@ -456,7 +459,7 @@ def setCredentials(self, user, passwd, realm="SPARQL"):
:param realm: realm. Only used for :data:`DIGEST` authentication. The **default** value is ``SPARQL``
:type realm: string

.. versionchanged:: 1.8.3
.. versionchanged:: 1.8.3
Added :attr:`realm` parameter.
"""
self.user = user
Expand All @@ -482,7 +485,7 @@ def setHTTPAuth(self, auth):

def setQuery(self, query):
"""
Set the SPARQL query text.
Set the SPARQL query text.

.. note::
No check is done on the validity of the query
Expand Down Expand Up @@ -755,12 +758,15 @@ def _query(self):
:raises urllib2.HTTPError: If the HTTP return code is different to ``400``, ``401``, ``404``, ``414``, ``500``.
"""
request = self._createRequest()
ctx = ssl.create_default_context()
if self.custom_cert_filename is not None:
ctx.load_verify_locations(cafile=self.custom_cert_filename)

try:
if self.timeout:
response = urlopener(request, timeout=self.timeout)
response = urlopener(request, timeout=self.timeout, context=ctx)
else:
response = urlopener(request)
response = urlopener(request, context=ctx)
return response, self.returnFormat
except urllib2.HTTPError as e:
if e.code == 400:
Expand Down Expand Up @@ -829,7 +835,7 @@ class QueryResult(object):

If used directly: the class gives access to the direct HTTP request results
``response`` obtained from the call to :func:`urllib.urlopen`.
It is a file-like object with two additional methods:
It is a file-like object with two additional methods:

* ``geturl()`` to return the URL of the resource retrieved
* ``info()`` that returns the meta-information of the HTTP result as a dictionary-like object.
Expand Down