Skip to content

Allow users to pass optional args to libcurl #1

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

Merged
patrickporto merged 1 commit into from
Aug 20, 2014
Merged

Allow users to pass optional args to libcurl #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions openid/fetchers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
USER_AGENT = "python-openid/%s (%s)" % (openid.__version__, sys.platform)
MAX_RESPONSE_KB = 1024

def fetch(url, body=None, headers=None):
def fetch(url, body=None, headers=None,cargs=None):
"""Invoke the fetch method on the default fetcher. Most users
should need only this method.

@raises Exception: any exceptions that may be raised by the default fetcher
"""
fetcher = getDefaultFetcher()
return fetcher.fetch(url, body, headers)
return fetcher.fetch(url, body, headers,cargs)

def createHTTPFetcher():
"""Create a default HTTP fetcher instance
Expand Down Expand Up @@ -285,7 +285,7 @@ def _checkURL(self, url):
# XXX: make sure url is well-formed and routeable
return _allowedURL(url)

def fetch(self, url, body=None, headers=None):
def fetch(self, url, body=None, headers=None,cargs=None):
stop = int(time.time()) + self.ALLOWED_TIME
off = self.ALLOWED_TIME

Expand All @@ -307,6 +307,10 @@ def fetch(self, url, body=None, headers=None):
if header_list:
c.setopt(pycurl.HTTPHEADER, header_list)

if cargs is not None:
for key,val in cargs.iteritems():
c.setopt(getattr(pycurl,key),val)

# Presence of a body indicates that we should do a POST
if body is not None:
c.setopt(pycurl.POST, 1)
Expand Down
7 changes: 5 additions & 2 deletions openid/yadis/discover.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,16 @@ def isXRDS(self):
return (self.usedYadisLocation() or
self.content_type == YADIS_CONTENT_TYPE)

def discover(uri):
def discover(uri,cargs=None):
"""Discover services for a given URI.

@param uri: The identity URI as a well-formed http or https
URI. The well-formedness and the protocol are not checked, but
the results of this function are undefined if those properties
do not hold.
@param cargs: dictionary where keys are optional flags to libcurl,
and values are the actual values.
ex: cargs['CAINFO']='path-to-custom CA bundle'

@return: DiscoveryResult object

Expand All @@ -69,7 +72,7 @@ def discover(uri):
@raises DiscoveryFailure: When the HTTP response does not have a 200 code.
"""
result = DiscoveryResult(uri)
resp = fetchers.fetch(uri, headers={'Accept': YADIS_ACCEPT_HEADER})
resp = fetchers.fetch(uri, headers={'Accept': YADIS_ACCEPT_HEADER},cargs=cargs)
if resp.status not in (200, 206):
raise DiscoveryFailure(
'HTTP Response status from identity URL host is not 200. '
Expand Down