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

Emmanuel Cazenave, 01 novembre 2018 13:37

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

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

 passerelle/utils/__init__.py   |  9 +++++++--
 passerelle/views.py            |  2 ++
 tests/test_generic_endpoint.py | 30 ++++++++++++++++++++++++++++++
 tests/test_requests.py         | 25 +++++++++++++++++++++++++
 tests/utils.py                 |  4 ++--
 5 files changed, 66 insertions(+), 4 deletions(-)

             if 'timeout' not in kwargs:
                 kwargs['timeout'] = settings.REQUESTS_TIMEOUT
             # don't use persistent cookies
             self.cookies.clear()
             # persist cookie for the endpoint duration
             if self.resource and hasattr(self.resource, 'cookiejar'):
                 self.cookies = self.resource.cookiejar
             response = super(Request, self).request(method, url, **kwargs)
             if getattr(self, 'cookies', None) and self.resource \
                and hasattr(self.resource, 'cookiejar'):
                 self.resource.cookiejar = self.cookies
             if method == 'GET' and cache_duration and (response.status_code // 100 == 2):
                 cache.set(cache_key, {
                     'content': response.content,

     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):
         @endpoint(methods=['get'])
         def httpcall(obj, request):
             headers = {'Set-Cookie': 'somecookie=somecookievalue'}
             with utils.mock_url('http://some.example.org/', 'ok', headers):
                 response = obj.requests.get('http://some.example.org/')
                 cookie1 = response.request.headers.get('Cookie')
                 response = obj.requests.get('http://some.example.org/')
                 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'] == 'somecookie=somecookievalue'
         # 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'] == 'somecookie=somecookievalue'

     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(caplog):
         resource = MockResource()
         resource.cookiejar = requests.cookies.cookiejar_from_dict({})
         logger = logging.getLogger('requests')
         request = Request(resource=resource, logger=logger)
         headers = {'Set-Cookie': 'somecookie=somecookievalue'}
         with utils.mock_url('http://some.example.org/', 'ok', headers):
             response = request.get('http://some.example.org/')
             assert response.cookies['somecookie'] == 'somecookievalue'
             # cookies are stored on the resource
             assert resource.cookiejar == response.cookies
         with utils.mock_url('http://some.example.org/', 'ok'):
             # cookies are sent back
             response = request.get('http://some.example.org/')
             assert response.request.headers['Cookie'] == 'somecookie=somecookievalue'
             # cookies sent back even with a new Request obj
             request = Request(resource=resource, logger=logger)
             response = request.get('http://some.example.org/')
             assert response.request.headers['Cookie'] == 'somecookie=somecookievalue'

             return json.loads(self.content)
     def mock_url(url, response):
     def mock_url(url, response, headers=None):
         parsed = urlparse.urlparse(url)
         if not isinstance(response ,str):
             response = json.dumps(response)
         @httmock.urlmatch(netloc=parsed.netloc, path=parsed.path)
         def mocked(url, request):
             return httmock.response(200, response, request=request)
             return httmock.response(200, response, request=request, headers=headers)
         return httmock.HTTMock(mocked)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

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