0001-api-add-basic-auth-support-to-formdefs-56690.patch

Lauréline Guérin, 14 septembre 2021 15:57

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

Subject: [PATCH] api: add basic auth support to formdefs (#56690)

 tests/api/test_formdef.py | 54 +++++++++++++++++++++++++++++++++------
 wcs/api.py                |  7 +++--
 2 files changed, 51 insertions(+), 10 deletions(-)

     import os
     import time
     import urllib.parse
     from functools import partial
     from unittest import mock
     import pytest
-...
     from quixote import get_publisher
     from wcs import fields, qommon
     from wcs.api_access import ApiAccess
     from wcs.api_utils import sign_url
     from wcs.categories import Category
     from wcs.data_sources import NamedDataSource
-...
         return user
     def _get_url(url, app, auth, access, user, **kwargs):
         if auth == 'http-basic':
             app.set_authorization(('Basic', ('test', '12345')))
             return app.get(url, **kwargs)
         else:
             return app.get(
                 sign_uri(url, user=user, orig=access.access_identifier, key=access.access_key), **kwargs
+            )
     @pytest.fixture
     def access(pub):
         ApiAccess.wipe()
         access = ApiAccess()
         access.name = 'test'
         access.access_identifier = 'test'
         access.access_key = '12345'
         access.store()
         return access
     def test_formdef_list(pub):
         pub.role_class.wipe()
         role = pub.role_class(name='Foo bar')
-...
         assert len(resp.json['data']) == 2
     def test_limited_formdef_list(pub, local_user):
     @pytest.mark.parametrize('auth', ['signature', 'http-basic'])
     def test_limited_formdef_list(pub, local_user, access, auth):
         pub.role_class.wipe()
         role = pub.role_class(name='Foo bar')
         role.id = '14'
-...
         formdef.fields = []
         formdef.store()
         app = get_app(pub)
         get_url = partial(_get_url, app=app, auth=auth, access=access, user=local_user)
         resp = get_app(pub).get(sign_uri('/api/formdefs/'))
         assert resp.json['err'] == 0
         assert len(resp.json['data']) == 1
-...
         resp = get_app(pub).get(sign_uri('/api/formdefs/'))
         resp2 = get_app(pub).get(sign_uri('/api/formdefs/?NameID='))
         resp3 = get_app(pub).get(sign_uri('/api/formdefs/?NameID=XXX'))
         resp4 = get_app(pub).get(sign_uri('/api/formdefs/?NameID=%s' % local_user.name_identifiers[0]))
         resp4 = get_url('/api/formdefs/')
         assert resp.json['err'] == 0
         assert len(resp.json['data']) == 1  # advertised in naked calls (as done from combo)
         assert len(resp2.json['data']) == 0  # not advertised otherwise
-...
         # unless user has correct roles
         local_user.roles = [role.id]
         local_user.store()
         resp = get_app(pub).get(sign_uri('/api/formdefs/?NameID=%s' % local_user.name_identifiers[0]))
         if auth == 'http-basic':
             access.roles = [role]
             access.store()
         resp = get_url('/api/formdefs/')
         assert resp.json['err'] == 0
         assert len(resp.json['data']) == 1
         local_user.roles = []
         local_user.store()
         if auth == 'http-basic':
             access.roles = []
             access.store()
         # check it's also included in anonymous/signed calls, but marked for
         # authentication
-...
         resp = get_app(pub).get(sign_uri('/api/formdefs/'))
         resp2 = get_app(pub).get(sign_uri('/api/formdefs/?NameID='))
         resp3 = get_app(pub).get(sign_uri('/api/formdefs/?NameID=XXX'))
         resp4 = get_app(pub).get(sign_uri('/api/formdefs/?NameID=%s' % local_user.name_identifiers[0]))
         resp4 = get_url('/api/formdefs/')
         assert resp.json['err'] == 0
         assert len(resp.json['data']) == 1
         assert resp.json['data'][0]['authentication_required']
-...
         assert 'count' not in resp1.json['data'][0]
     def test_backoffice_submission_formdef_list(pub, local_user):
     @pytest.mark.parametrize('auth', ['signature', 'http-basic'])
     def test_backoffice_submission_formdef_list(pub, local_user, access, auth):
         pub.role_class.wipe()
         role = pub.role_class(name='Foo bar')
         role.id = '14'
-...
         formdef2.fields = []
         formdef2.store()
         app = get_app(pub)
         get_url = partial(_get_url, app=app, auth=auth, access=access, user=local_user)
         resp = get_app(pub).get(sign_uri('/api/formdefs/?backoffice-submission=on'))
         assert resp.json['err'] == 0
         assert len(resp.json['data']) == 0
-...
         # ... unless user has correct roles
         local_user.roles = [role.id]
         local_user.store()
         resp = get_app(pub).get(
             sign_uri('/api/formdefs/?backoffice-submission=on&NameID=%s' % local_user.name_identifiers[0])
+        )
         if auth == 'http-basic':
             access.roles = [role]
             access.store()
         resp = get_url('/api/formdefs/?backoffice-submission=on')
         assert resp.json['err'] == 0
         assert len(resp.json['data']) == 1
         assert 'backoffice_submission_url' in resp.json['data'][0]

                 # signed URL with a None user is considered like an appropriate
                 # webservice call.
                 user = False
             if not is_url_signed():
             url_signed = is_url_signed()
             if user and user.is_api_user:
                 pass  # API users are ok
             elif not url_signed:
                 if not (get_request().user and get_request().user.is_admin):
                     raise AccessForbiddenError('user not authenticated')
                 user = get_request().user
             list_all_forms = (user and user.is_admin) or (is_url_signed() and user is None)
             list_all_forms = (user and user.is_admin) or (url_signed and user is None)
             backoffice_submission = get_request().form.get('backoffice-submission') == 'on'
             list_forms = self.get_list_forms(user, list_all_forms, backoffice_submission=backoffice_submission)
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-api-add-basic-auth-support-to-formdefs-56690.patch