0001-workflows-add-possibility-to-add-remove-a-computed-r.patch

Frédéric Péters, 14 octobre 2018 10:03

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

Subject: [PATCH] workflows: add possibility to add/remove a computed role
 (#27313)

 tests/test_workflows.py | 48 ++++++++++++++++++++++++++++++++++++++++-
 wcs/wf/dispatch.py      | 19 +++-------------
 wcs/wf/roles.py         | 44 ++++++++++++++++++++-----------------
 wcs/workflows.py        | 14 ++++++++++++
 4 files changed, 88 insertions(+), 37 deletions(-)

         item.role_id = '="foobar"'
         item.perform(formdata)
         assert not formdata.workflow_roles
         assert caplog.records[-1].message == 'error in dispatch, missing role foobar (="foobar")'
         assert caplog.records[-1].message == 'error in dispatch, missing role (="foobar")'
     def test_roles(pub):
         user = pub.user_class()
-...
         item.perform(formdata)
         assert pub.user_class.get(user.id).roles == ['2']
     def test_add_remove_computed_roles(pub):
         user = pub.user_class()
         user.store()
         formdef = FormDef()
         formdef.name = 'baz'
         formdef.store()
         formdata = formdef.data_class()()
         formdata.user_id = user.id
         role = Role(name='plop')
         role.store()
         role2 = Role(name='xxx')
         role2.store()
         item = AddRoleWorkflowStatusItem()
         item.perform(formdata)
         assert not pub.user_class.get(user.id).roles
         item.role_id = role.name
         item.perform(formdata)
         assert pub.user_class.get(user.id).roles == [role.id]
         user.roles = None
         user.store()
         item = RemoveRoleWorkflowStatusItem()
         item.perform(formdata)
         assert not pub.user_class.get(user.id).roles
         item.role_id = role.name
         item.perform(formdata)
         assert not pub.user_class.get(user.id).roles
         user.roles = [role.id]
         user.store()
         item.perform(formdata)
         assert not pub.user_class.get(user.id).roles
         user.roles = [role2.id, role.id]
         user.store()
         item.perform(formdata)
         assert pub.user_class.get(user.id).roles == [role2.id]
     def test_roles_idp(pub):
         pub.cfg['sp'] = {'idp-manage-user-attributes': True}
         pub.cfg['idp'] = {'xxx': {'metadata_url': 'http://idp.example.net/idp/saml2/metadata'}}

             if self.dispatch_type == 'manual' or not self.dispatch_type:
                 if not (self.role_id and self.role_key):
                     return
                 new_role_id = self.compute(self.role_id)
                 if not Role.has_key(new_role_id):
                     # computed value, not an id, try to get role by slug
                     new_role = Role.get_on_index(new_role_id, 'slug', ignore_errors=True)
                     if not new_role:
                         # fallback to role label
                         for role in Role.select():
                             if role.name == new_role_id:
                                 new_role = role
                                 break
                     if new_role:
                         new_role_id = new_role.id
                     else:
                         get_logger().error('error in dispatch, missing role %s (%s)' % (
                             new_role_id, self.role_id))
                         new_role_id = None
                 new_role_id = self.get_computed_role_id(self.role_id)
                 if not new_role_id:
                     get_logger().error('error in dispatch, missing role (%s)' % self.role_id)
             elif self.dispatch_type == 'automatic':
                 if not (self.role_key and self.variable and self.rules):
                     return

             super(AddRoleWorkflowStatusItem, self).add_parameters_widgets(
                     form, parameters, prefix=prefix, formdef=formdef)
             if 'role_id' in parameters:
                 form.add(SingleSelectWidget, '%srole_id' % prefix,
                          title=_('Role to Add'), value=str(self.role_id),
                 form.add(SingleSelectWidgetWithOther, '%srole_id' % prefix,
                          title=_('Role to Add'), value=str(self.role_id) if self.role_id else None,
                          options=[(None, '----', None)] + get_user_roles())
         def role_id_export_to_xml(self, item, charset, include_id=False):
-...
         def perform(self, formdata):
             if not self.role_id:
                 return
             self.role_id = str(self.role_id)
             role_id = self.get_computed_role_id(self.role_id)
             if not role_id:
                 return
             if not formdata.user_id:
                 # we can't work on anonymous forms
                 return
             user = get_publisher().user_class.get(formdata.user_id)
             self.perform_local(user, formdata)
             self.perform_local(user, formdata, role_id)
             if user.name_identifiers and is_idp_managing_user_attributes():
                 self.perform_idp(user, formdata)
                 self.perform_idp(user, formdata, role_id)
         def perform_local(self, user, formdata):
         def perform_local(self, user, formdata, role_id):
             if not user.roles:
                 user.roles = []
             if not self.role_id in user.roles:
                 user.roles.append(self.role_id)
             if not role_id in user.roles:
                 user.roles.append(role_id)
             user.store()
             request = get_request()
             if request and request.user and request.user.id == user.id:
-...
                 # changes.
                 request.user = user
         def perform_idp(self, user, formdata):
             role = Role.get(self.role_id)
         def perform_idp(self, user, formdata, role_id):
             role = Role.get(role_id)
             role_uuid = role.uuid or role.slug
             user_uuid = user.name_identifiers[0]
             try:
-...
             super(RemoveRoleWorkflowStatusItem, self).add_parameters_widgets(
                     form, parameters, prefix=prefix, formdef=formdef)
             if 'role_id' in parameters:
                 form.add(SingleSelectWidget, '%srole_id' % prefix,
                          title=_('Role to Remove'), value=self.role_id,
                 form.add(SingleSelectWidgetWithOther, '%srole_id' % prefix,
                          title=_('Role to Remove'), value=str(self.role_id) if self.role_id else None,
                          options=[(None, '----', None)] + get_user_roles())
         def perform(self, formdata):
             if not self.role_id:
                 return
             self.role_id = str(self.role_id)
             role_id = self.get_computed_role_id(self.role_id)
             if not role_id:
                 return
             if not formdata.user_id:
                 # we can't work on anonymous forms
                 return
             user = get_publisher().user_class.get(formdata.user_id)
             self.perform_local(user, formdata)
             self.perform_local(user, formdata, role_id)
             if user.name_identifiers and is_idp_managing_user_attributes():
                 self.perform_idp(user, formdata)
                 self.perform_idp(user, formdata, role_id)
         def perform_local(self, user, formdata):
             if user.roles and self.role_id in user.roles:
                 user.roles.remove(self.role_id)
         def perform_local(self, user, formdata, role_id):
             if user.roles and role_id in user.roles:
                 user.roles.remove(role_id)
                 user.store()
                 request = get_request()
                 if request and request.user and request.user.id == user.id:
-...
                     # with the changes.
                     request.user = user
         def perform_idp(self, user, formdata):
             role = Role.get(self.role_id)
         def perform_idp(self, user, formdata, role_id):
             role = Role.get(role_id)
             role_uuid = role.uuid or role.slug
             user_uuid = user.name_identifiers[0]
             try:

                     raise
                 return var
         def get_computed_role_id(self, role_id):
             new_role_id = self.compute(str(role_id))
             if Role.has_key(new_role_id):
                 return new_role_id
             # computed value, not an id, try to get role by slug
             new_role = Role.get_on_index(new_role_id, 'slug', ignore_errors=True)
             if new_role:
                 return new_role.id
             # fallback to role label
             for role in Role.select():
                 if role.name == new_role_id:
                     return role.id
             return None
         def get_substitution_variables(self, formdata):
             return {}
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-workflows-add-possibility-to-add-remove-a-computed-r.patch