0001-allow-cookies-usage-in-endpoint-requests-27654.patch

Emmanuel Cazenave, 02 novembre 2018 17:58

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

Subject: [PATCH] allow cookies usage in endpoint requests (#27654)

 passerelle/utils/__init__.py   |  5 +++--
 passerelle/views.py            |  2 ++
 tests/test_generic_endpoint.py | 28 ++++++++++++++++++++++++++++
 tests/test_requests.py         | 19 +++++++++++++++++++
 tox.ini                        |  1 +
 5 files changed, 53 insertions(+), 2 deletions(-)

             if 'timeout' not in kwargs:
                 kwargs['timeout'] = settings.REQUESTS_TIMEOUT
             # don't use persistent cookies
             self.cookies.clear()
             if self.resource and hasattr(self.resource, 'cookiejar'):
                 # use cookies that will last the whole endpoint duration
                 self.cookies = self.resource.cookiejar
             response = super(Request, self).request(method, url, **kwargs)

     from django.utils.encoding import force_text
     from django.forms.models import modelform_factory
     from django.forms.widgets import ClearableFileInput
     import requests
     from dateutil import parser as date_parser
-...
         def dispatch(self, request, *args, **kwargs):
             self.init_stuff(request, *args, **kwargs)
             connector = self.get_object()
             connector.cookiejar = requests.cookies.cookiejar_from_dict({})
             self.endpoint = None
             endpoints = []
             for name, method in inspect.getmembers(connector):

         assert cache.get_calls == 5
         assert cache.set_calls == 3
         assert resp1.json_body != resp6.json_body
     def test_endpoint_cookies(app, db, monkeypatch, httpbin):
         @endpoint(methods=['get'])
         def httpcall(obj, request):
             response = obj.requests.get(httpbin.url + '/cookies/set?foo=bar', allow_redirects=False)
             cookie1 = response.request.headers.get('Cookie')
             response = obj.requests.get(httpbin.url + '/get')
             cookie2 = response.request.headers.get('Cookie')
             return {
                 'cookie1': cookie1,
                 'cookie2': cookie2
+            }
         monkeypatch.setattr(StubInvoicesConnector, 'httpcall', httpcall, raising=False)
         connector = StubInvoicesConnector(slug='fake')
         connector.save()
         json_res = app.get('/stub-invoices/fake/httpcall').json
         assert json_res['cookie1'] is None
         assert json_res['cookie2'] == 'foo=bar'
         # Do it a second time to test that no cookies are leaking from one call
         # to the other
         json_res = app.get('/stub-invoices/fake/httpcall').json
         assert json_res['cookie1'] is None
         assert json_res['cookie2'] == 'foo=bar'

     from httmock import urlmatch, HTTMock, response
     from django.test import override_settings
     import requests
     from passerelle.utils import Request, CaseInsensitiveDict
     from passerelle.utils.http_authenticators import HawkAuth
-...
             assert mocked_get.call_args[1]['timeout'] == 42
             Request(logger=logger).get('http://example.net/whatever', timeout=None)
             assert mocked_get.call_args[1]['timeout'] is None
     def test_requests_cookies(httpbin):
         resource = MockResource()
         resource.cookiejar = requests.cookies.cookiejar_from_dict({})
         logger = logging.getLogger('requests')
         request = Request(resource=resource, logger=logger)
         request.get(httpbin.url + '/cookies/set?foo=bar')
         # cookies are sent back
         response = request.get(httpbin.url + '/get')
         assert response.request.headers['Cookie'] == 'foo=bar'
         # cookies sent back even with a new Request obj
         request = Request(resource=resource, logger=logger)
         response = request.get(httpbin.url + '/get')
         assert response.request.headers['Cookie'] == 'foo=bar'

       lxml
       mohawk
       pytest-freezegun
       pytest-httpbin
     commands =
       django18: py.test {posargs: {env:FAST:} --junitxml=test_{envname}_results.xml --cov-report xml --cov-report html --cov=passerelle/ --cov-config .coveragerc tests/}
       django18: ./pylint.sh passerelle/
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-allow-cookies-usage-in-endpoint-requests-27654.patch