mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-10 14:56:14 +01:00
Code

- respect no_proxy env variable

Browse Source
This commit is contained in:
Marcus Huewe 2011-07-15 20:10:45 +02:00
parent 182284ef49
commit af253d2eb2
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osc/conf.py
View File

@ -34,6 +34,8 @@ The configuration dictionary could look like this:
""" """
import urllib
import OscConfigParser import OscConfigParser
from osc import oscerr from osc import oscerr
from oscsslexcp import NoSecureSSLError from oscsslexcp import NoSecureSSLError
@ -401,6 +403,14 @@ def _build_opener(url):
if apiurl == _build_opener.last_opener[0]: if apiurl == _build_opener.last_opener[0]:
return _build_opener.last_opener[1] return _build_opener.last_opener[1]
# respect no_proxy env variable
if urllib.proxy_bypass(apiurl):
# initialize with empty dict
proxyhandler = urllib2.ProxyHandler({})
else:
# read proxies from env
proxyhandler = urllib2.ProxyHandler()
# workaround for http://bugs.python.org/issue9639 # workaround for http://bugs.python.org/issue9639
authhandler_class = urllib2.HTTPBasicAuthHandler authhandler_class = urllib2.HTTPBasicAuthHandler
if sys.version_info >= (2, 6, 6) and sys.version_info < (2, 7, 1) \ if sys.version_info >= (2, 6, 6) and sys.version_info < (2, 7, 1) \
@ -464,11 +474,11 @@ def _build_opener(url):
break break
ctx = oscssl.mySSLContext() ctx = oscssl.mySSLContext()
if ctx.load_verify_locations(capath=capath, cafile=cafile) != 1: raise Exception('No CA certificates found') if ctx.load_verify_locations(capath=capath, cafile=cafile) != 1: raise Exception('No CA certificates found')
opener = m2urllib2.build_opener(ctx, oscssl.myHTTPSHandler(ssl_context = ctx, appname = 'osc'), urllib2.HTTPCookieProcessor(cookiejar), authhandler) opener = m2urllib2.build_opener(ctx, oscssl.myHTTPSHandler(ssl_context = ctx, appname = 'osc'), urllib2.HTTPCookieProcessor(cookiejar), authhandler, proxyhandler)
else: else:
import sys import sys
print >>sys.stderr, "WARNING: SSL certificate checks disabled. Connection is insecure!\n" print >>sys.stderr, "WARNING: SSL certificate checks disabled. Connection is insecure!\n"
opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookiejar), authhandler) opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookiejar), authhandler, proxyhandler)
opener.addheaders = [('User-agent', 'osc/%s' % __version__)] opener.addheaders = [('User-agent', 'osc/%s' % __version__)]
_build_opener.last_opener = (apiurl, opener) _build_opener.last_opener = (apiurl, opener)
return opener return opener