|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
42ab4cc |
From fd9ab446d8479360d2c1c8252508d97d58ed3e0e Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
From: Jeremy Cline <jeremy@jcline.org>
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
Date: Mon, 19 Jun 2017 16:09:02 -0400
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
Subject: [PATCH] Patch requests/certs.py to use the system CA bundle
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
Signed-off-by: Jeremy Cline <jeremy@jcline.org>
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
---
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
requests/certs.py | 11 ++++++++++-
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
42ab4cc |
setup.py | 1 -
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
42ab4cc |
2 files changed, 10 insertions(+), 2 deletions(-)
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
diff --git a/requests/certs.py b/requests/certs.py
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
index d1a378d..7b103ba 100644
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
--- a/requests/certs.py
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
+++ b/requests/certs.py
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
@@ -11,8 +11,17 @@ only one — the one from the certifi package.
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
If you are packaging Requests, e.g., for a Linux distribution or a managed
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
environment, you can change the definition of where() to return a separately
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
packaged CA bundle.
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
+
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
+This Fedora-patched package returns "/etc/pki/tls/certs/ca-bundle.crt" provided
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
+by the ca-certificates RPM package.
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
"""
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
-from certifi import where
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
+try:
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
+ from certifi import where
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
+except ImportError:
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
+ def where():
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
+ """Return the absolute path to the system CA bundle."""
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
+ return '/etc/pki/tls/certs/ca-bundle.crt'
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
+
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
if __name__ == '__main__':
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
print(where())
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
42ab4cc |
diff --git a/setup.py b/setup.py
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
42ab4cc |
index 93a8507..2db9569 100755
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
42ab4cc |
--- a/setup.py
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
42ab4cc |
+++ b/setup.py
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
42ab4cc |
@@ -45,7 +45,6 @@ requires = [
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
42ab4cc |
'chardet>=3.0.2,<3.1.0',
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
c281f15 |
'idna>=2.5,<2.7',
|
|
![](https://seccdn.libravatar.org/avatar/522f0859d72d8d86c8d610f3d46a8d3efe6fd2fe35ddd2512e51a8506ba62906?s=16&d=retro) |
33a34fd |
'urllib3>=1.21.1,<1.23',
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
42ab4cc |
- 'certifi>=2017.4.17'
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
42ab4cc |
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
42ab4cc |
]
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
42ab4cc |
test_requirements = ['pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock', 'pytest-xdist', 'PySocks>=1.5.6, !=1.5.7', 'pytest>=2.8.0']
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
--
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
2.9.4
|
|
![](https://seccdn.libravatar.org/avatar/ec5e3ca2442f47821d80c5b7dd3858a706819f6800956f7a99f342248cc078bf?s=16&d=retro) |
2c9580b |
|