rpm/python-httplib2
SHA256
1
0
Fork 0
forked from pool/python-httplib2
Code Pull Requests Activity

Accepting request 373386 from home:matejcik:requests-mess

Browse Source 
- update and cleanup of httplib2-use-system-certs.patch,
  so that the passthrough is clean for python2 and so that it does
  the right thing in python3

OBS-URL: https://build.opensuse.org/request/show/373386
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-httplib2?expand=0&rev=58
This commit is contained in:
Robert Schweikert 2016-03-15 20:06:26 +00:00 committed by Git OBS Bridge
parent 401079e586
commit 8912f58546
3 changed files with 56 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
httplib2-use-system-certs.patch
View File

@ -1,7 +1,8 @@
diff -ruN a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py Index: httplib2-0.9.2/python2/httplib2/__init__.py
--- a/python2/httplib2/__init__.py 2013-03-06 21:45:31.000000000 +0100 ===================================================================
+++ b/python2/httplib2/__init__.py 2013-03-22 14:02:09.458410128 +0100 --- httplib2-0.9.2.orig/python2/httplib2/__init__.py
@@ -184,15 +184,8 @@ +++ httplib2-0.9.2/python2/httplib2/__init__.py
@@ -184,15 +184,8 @@ class CertificateHostnameMismatch(SSLHan
# requesting that URI again. # requesting that URI again.
DEFAULT_MAX_REDIRECTS = 5 DEFAULT_MAX_REDIRECTS = 5
@ -19,24 +20,57 @@ diff -ruN a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py
# Which headers are hop-by-hop headers by default # Which headers are hop-by-hop headers by default
HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade'] HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
diff -ruN a/python3/httplib2/__init__.py b/python3/httplib2/__init__.py @@ -944,8 +937,6 @@ class HTTPSConnectionWithTimeout(httplib
--- a/python3/httplib2/__init__.py 2013-03-06 21:45:31.000000000 +0100 cert_file=cert_file, strict=strict)
+++ b/python3/httplib2/__init__.py 2013-03-22 14:01:51.270409717 +0100 self.timeout = timeout
@@ -124,8 +124,8 @@ self.proxy_info = proxy_info
- if ca_certs is None:
- ca_certs = CA_CERTS
self.ca_certs = ca_certs
self.disable_ssl_certificate_validation = \
disable_ssl_certificate_validation
Index: httplib2-0.9.2/python3/httplib2/__init__.py
===================================================================
--- httplib2-0.9.2.orig/python3/httplib2/__init__.py
+++ httplib2-0.9.2/python3/httplib2/__init__.py
@@ -124,8 +124,7 @@ DEFAULT_MAX_REDIRECTS = 5
HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade'] HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
# Default CA certificates file bundled with httplib2. # Default CA certificates file bundled with httplib2.
-CA_CERTS = os.path.join( -CA_CERTS = os.path.join(
- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt") - os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
+CA_CERTS = '/etc/ssl/ca-bundle.pem' +CA_CERTS = None
+
def _get_end2end_headers(response): def _get_end2end_headers(response):
hopbyhop = list(HOP_BY_HOP) hopbyhop = list(HOP_BY_HOP)
diff -ruN a/setup.py b/setup.py @@ -833,13 +832,17 @@ class HTTPSConnectionWithTimeout(http.cl
--- a/setup.py 2013-03-06 21:45:31.000000000 +0100 ca_certs=None, disable_ssl_certificate_validation=False):
+++ b/setup.py 2013-03-22 14:02:33.031410660 +0100 self.proxy_info = proxy_info
@@ -62,7 +62,6 @@ context = None
- if ca_certs is None:
- ca_certs = CA_CERTS
- if (cert_file or ca_certs) and not disable_ssl_certificate_validation:
+ if not disable_ssl_certificate_validation:
if not hasattr(ssl, 'SSLContext'):
raise CertificateValidationUnsupportedInPython31()
- context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
- context.verify_mode = ssl.CERT_REQUIRED
+
+ cafile = ca_certs
+ capath = None
+ if cafile is not None and os.path.isdir(cafile):
+ cafile = None
+ capath = ca_certs
+
+ context = ssl.create_default_context(cafile=cafile, capath=capath)
if cert_file:
context.load_cert_chain(cert_file, key_file)
if ca_certs:
Index: httplib2-0.9.2/setup.py
===================================================================
--- httplib2-0.9.2.orig/setup.py
+++ httplib2-0.9.2/setup.py
@@ -61,7 +61,6 @@ A comprehensive HTTP client library, ``h
""", """,
package_dir=pkgdir, package_dir=pkgdir,
packages=['httplib2'], packages=['httplib2'],

7
python-httplib2.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Mar 2 16:45:18 UTC 2016 - jmatejek@suse.com
- update and cleanup of httplib2-use-system-certs.patch,
so that the passthrough is clean for python2 and so that it does
the right thing in python3
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 3 18:18:16 UTC 2015 - rjschwei@suse.com Thu Dec 3 18:18:16 UTC 2015 - rjschwei@suse.com

2
python-httplib2.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package python-httplib2 # spec file for package python-httplib2
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed