0001-misc-allow-client-side-cert-on-http_requests-59039.patch

Thomas Noël, 21 janvier 2022 18:01

Voir les différences: en ligne côte à côte

Subject: [PATCH] misc: allow client side cert on http_requests (#59039)

 tests/test_misc.py | 62 ++++++++++++++++++++++++++++++++++++++++++++++
 wcs/qommon/misc.py |  6 +++++
 wcs/settings.py    |  5 ++++
 3 files changed, 73 insertions(+)

     from wcs.qommon.http_request import HTTPRequest
     from wcs.qommon.humantime import humanduration2seconds, seconds2humanduration
     from wcs.qommon.misc import (
         _http_request,
         date_format,
         ellipsize,
         format_time,
-...
     def test_uwsgi_spooler_import():
         with pytest.raises(ImportError):
             import wcs.qommon.spooler  # noqa pylint: disable=unused-import
     @mock.patch('requests.Session.request')
     def test_http_request_global_settings(mock_request):
         response = {'err': 0, 'data': []}
         mock_json = mock.Mock(status_code=200)
         mock_json.json.return_value = response
         mock_request.return_value = mock_json
         from django.conf import settings
         response, status, data, auth_header = _http_request('https://example.com/')
         mock_request.assert_called_once_with(
             'GET', 'https://example.com/', cert=None, data=None, headers={}, proxies=None, timeout=28
+        )
         assert status == 200
         settings.REQUESTS_TIMEOUT = 42
         mock_request.reset_mock()
         response, status, data, auth_header = _http_request('https://example.com/')
         mock_request.assert_called_once_with(
             'GET', 'https://example.com/', cert=None, data=None, headers={}, proxies=None, timeout=42
+        )
         assert status == 200
         settings.REQUESTS_PROXIES = {
             'http': 'http://10.10.1.10:3128',
             'https': 'http://10.10.1.10:1080',
+        }
         mock_request.reset_mock()
         response, status, data, auth_header = _http_request('https://example.com/')
         mock_request.assert_called_once_with(
             'GET',
             'https://example.com/',
             cert=None,
             data=None,
             headers={},
             proxies=settings.REQUESTS_PROXIES,
             timeout=42,
+        )
         assert status == 200
         settings.REQUESTS_PROXIES = None
         settings.REQUESTS_CERT = {
             'https://example.com/ssl': '/path/client.pem',
+        }
         mock_request.reset_mock()
         response, status, data, auth_header = _http_request('https://example.com/ssl/')
         mock_request.assert_called_once_with(
             'GET',
             'https://example.com/ssl/',
             cert='/path/client.pem',
             data=None,
             headers={},
             proxies=None,
             timeout=42,
+        )
         mock_request.reset_mock()
         response, status, data, auth_header = _http_request('https://example.com/')
         mock_request.assert_called_once_with(
             'GET', 'https://example.com/', cert=None, data=None, headers={}, proxies=None, timeout=42
+        )

         hostname = splitted_url.netloc
         timeout = timeout or settings.REQUESTS_TIMEOUT
         if cert_file is None:
             for url_prefix, cert in settings.REQUESTS_CERT.items():
                 if url.startswith(url_prefix):
                     cert_file = cert
                     break
         # re-use HTTP adapter to get connection pooling and keep-alive.
         adapter = getattr(get_publisher(), '_http_adapter', None)
         if adapter is None:

     # we use 28s by default: timeout just before web server, which is usually 30s
     REQUESTS_TIMEOUT = 28
     # REQUESTS_CERT is a dict of 'url_prefix': cert. cert is used in python-requests call
     # https://docs.python-requests.org/en/master/user/advanced/#client-side-certificates
     # example : REQUESTS_CERT = {'https://example.net/ssl-auth/': '/path/client.pem'}
     REQUESTS_CERT = {}
     # For high availability installations with multiple instances of w.c.s.
     # components, one should disable cron jobs execution on secondary servers;
     # set the following variable True disables "cron" management command
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-misc-allow-client-side-cert-on-http_requests-59039.patch