Create galaxy_ng specific Roles #1058

bmclaughlin · 2021-11-16T18:55:17Z

Before:

galaxy_ng=# select pulp_id, name, description, locked from core_role;
               pulp_id                |        name        |         description          | locked 
--------------------------------------+--------------------+------------------------------+--------
 f471e6df-ecb2-457e-b6f1-92b9b31ca9bd | core.group_creator |                              | t
 e9f09348-f77f-4047-a180-b35cd2981902 | core.group_owner   |                              | t
 de17876c-32ab-4d46-97da-492a566663dd | core.group_viewer  |                              | t
 170ac59c-b34c-4c5e-aa22-c8504232569d | core.task_owner    | Allow all actions on a task. | t
 cb9e3ed5-14ba-471e-a245-ffc28404e7f7 | core.task_viewer   |                              | t
(5 rows)

galaxy_ng=# select * from core_role_permissions;
 id |               role_id                | permission_id 
----+--------------------------------------+---------------
  1 | f471e6df-ecb2-457e-b6f1-92b9b31ca9bd |            54
  2 | e9f09348-f77f-4047-a180-b35cd2981902 |            56
  3 | e9f09348-f77f-4047-a180-b35cd2981902 |            57
  4 | e9f09348-f77f-4047-a180-b35cd2981902 |            55
  5 | de17876c-32ab-4d46-97da-492a566663dd |            57
  6 | 170ac59c-b34c-4c5e-aa22-c8504232569d |           168
  7 | 170ac59c-b34c-4c5e-aa22-c8504232569d |           169
  8 | 170ac59c-b34c-4c5e-aa22-c8504232569d |           170
  9 | 170ac59c-b34c-4c5e-aa22-c8504232569d |           167
 10 | cb9e3ed5-14ba-471e-a245-ffc28404e7f7 |           169
(10 rows)

After:

galaxy_ng=# select pulp_id, name, description, locked from core_role;
               pulp_id                |           name           |         description          | locked 
--------------------------------------+--------------------------+------------------------------+--------
 43b605e5-c4e9-478d-a696-5fa5b0e543e0 | core.group_creator       |                              | t
 37684011-d3bc-4a6b-ae2c-87f89659c14a | core.group_owner         |                              | t
 cafdd558-dd56-4ee7-9aec-c0b1607c8172 | core.group_viewer        |                              | t
 3a1ecb09-d19e-47da-b1c4-957540516fe8 | core.task_owner          | Allow all actions on a task. | t
 92d3c988-ec43-438b-b892-b6d05067b88a | core.task_viewer         |                              | t
 ee9bfb71-2af7-46bc-a911-33e6d799f60b | galaxy.namespace_creator |                              | t
 53e54e0a-851e-46c7-bbed-f90b5d9430eb | galaxy.namespace_owner   |                              | t
 40fa672b-f4ed-46a5-a17c-f889c0b3e75a | galaxy.namespace_updater |                              | t
 9c4a5986-c1aa-44ac-be05-b7dfa13c7329 | galaxy.collection_delete |                              | t
 67378630-3911-4ff0-b792-036dde01b64d | galaxy.collection_mover  |                              | t
(10 rows)

galaxy_ng=# select * from core_role_permissions;
 id |               role_id                | permission_id 
----+--------------------------------------+---------------
  1 | 43b605e5-c4e9-478d-a696-5fa5b0e543e0 |            54
  2 | 37684011-d3bc-4a6b-ae2c-87f89659c14a |            56
  3 | 37684011-d3bc-4a6b-ae2c-87f89659c14a |            57
  4 | 37684011-d3bc-4a6b-ae2c-87f89659c14a |            55
  5 | cafdd558-dd56-4ee7-9aec-c0b1607c8172 |            57
  6 | 3a1ecb09-d19e-47da-b1c4-957540516fe8 |           168
  7 | 3a1ecb09-d19e-47da-b1c4-957540516fe8 |           169
  8 | 3a1ecb09-d19e-47da-b1c4-957540516fe8 |           170
  9 | 3a1ecb09-d19e-47da-b1c4-957540516fe8 |           167
 10 | 92d3c988-ec43-438b-b892-b6d05067b88a |           169
 11 | ee9bfb71-2af7-46bc-a911-33e6d799f60b |           324
 12 | 53e54e0a-851e-46c7-bbed-f90b5d9430eb |           324
 13 | 53e54e0a-851e-46c7-bbed-f90b5d9430eb |           325
 14 | 53e54e0a-851e-46c7-bbed-f90b5d9430eb |           326
 15 | 40fa672b-f4ed-46a5-a17c-f889c0b3e75a |           325
 16 | 9c4a5986-c1aa-44ac-be05-b7dfa13c7329 |            19
 17 | 67378630-3911-4ff0-b792-036dde01b64d |            33
(17 rows)

Issue: AAH-1092

mdellweg · 2021-11-17T08:50:11Z

galaxy_ng/app/signals/handlers.py

+        locked_roles = GALAXY_VIEWSETS[viewset]['LOCKED_ROLES']
+        if locked_roles is not None:
+            desired_roles.update(locked_roles or {})
+    adjust_roles(apps, role_prefix, desired_roles, 0)


I would use either of these (or if you really want to shut it up pass it as kwarg verbosity=0.)

Suggested change

adjust_roles(apps, role_prefix, desired_roles, 0)

adjust_roles(apps, role_prefix, desired_roles)

Suggested change

adjust_roles(apps, role_prefix, desired_roles, 0)

adjust_roles(apps, role_prefix, desired_roles, verbosity=kwargs.get("verbosity", 0))

Thanks for catching this. I meant to correct it before opening the PR...

bmclaughlin · 2022-01-06T20:53:04Z

@mdellweg Can adjust_roles be made available via pulpcore.plugin?

mdellweg · 2022-01-07T10:54:16Z

@mdellweg Can adjust_roles be made available via pulpcore.plugin?

I guess so. can you file a request for this?

bmclaughlin · 2022-01-07T14:06:39Z

@mdellweg Created https://pulp.plan.io/issues/9665

mdellweg · 2022-01-07T14:30:17Z

galaxy_ng/app/signals/handlers.py

@@ -48,6 +50,26 @@ def create_namespace_if_not_present(sender, instance, created, **kwargs):
    Namespace.objects.get_or_create(name=instance.namespace)


+def set_role_definitions(sender, **kwargs):


I just realized, you could do

Suggested change

def set_role_definitions(sender, **kwargs):

def set_role_definitions(sender, apps=None, verbosity=1, **kwargs):

instead of the kwargs.get. (Just a matter of preference...)

mdellweg · 2022-01-07T14:34:58Z

@mdellweg Created https://pulp.plan.io/issues/9665

pulp/pulpcore#1802

bmclaughlin · 2022-01-13T15:44:44Z

/retest

bmclaughlin · 2022-03-08T15:42:46Z

/retest

bmclaughlin · 2022-03-09T19:43:58Z

/retest

Update to pulpcore 3.17.3 Issue: AAH-1092

Issue: AAH-1092

mdellweg · 2022-03-18T08:54:49Z

🗞️ 🎢 🛼
So glad to see this work in action!

Revert "Create galaxy_ng specific Roles (ansible#1058)" This reverts commit 3fefab0. No-Issue

* Revert "Remove django guardian (#1057)". This reverts commit d84dee6. * Revert "Create galaxy_ng specific Roles (#1058)". This reverts commit 3fefab0. No-Issue

bmclaughlin requested a review from newswangerd November 16, 2021 18:55

mdellweg reviewed Nov 17, 2021

View reviewed changes

bmclaughlin force-pushed the aah-1092-poc-define-system-roles branch from 3a8521e to 02666fc Compare January 6, 2022 20:31

mdellweg reviewed Jan 7, 2022

View reviewed changes

bmclaughlin changed the title ~~PoC to create galaxy_ng specific Roles~~ Create galaxy_ng specific Roles Jan 10, 2022

bmclaughlin force-pushed the aah-1092-poc-define-system-roles branch 3 times, most recently from fcc5e8e to 126156c Compare January 13, 2022 15:31

bmclaughlin marked this pull request as ready for review January 13, 2022 15:49

newswangerd approved these changes Jan 28, 2022

View reviewed changes

bmclaughlin requested a review from chr-stian March 2, 2022 15:20

bmclaughlin force-pushed the aah-1092-poc-define-system-roles branch 4 times, most recently from aad4e50 to 0b8f56f Compare March 7, 2022 14:45

chr-stian approved these changes Mar 7, 2022

View reviewed changes

bmclaughlin force-pushed the aah-1092-poc-define-system-roles branch 9 times, most recently from 6d74484 to 509d1a3 Compare March 7, 2022 19:48

bmclaughlin force-pushed the aah-1092-poc-define-system-roles branch 4 times, most recently from 743f987 to 36ef4c4 Compare March 8, 2022 15:21

bmclaughlin force-pushed the aah-1092-poc-define-system-roles branch 5 times, most recently from 3f4d717 to 5fc46da Compare March 9, 2022 19:22

bmclaughlin added 7 commits March 16, 2022 10:11

Create galaxy_ng specific Roles

82099a9

Update to pulpcore 3.17.3 Issue: AAH-1092

Correct verbosity parameter

05c12f1

Issue: AAH-1092

Add default LOCKED_ROLES

d314038

Issue: AAH-1092

Added roles: galaxy.collection_admin, galaxy.execution_environment_admin

c5f0784

Issue: AAH-1092

Import adjust_roles from pulpcore plugin api

661d640

Issue: AAH-1092

Integration test to verify expected galaxy locked roles exist

a5e440b

Issue: AAH-1092

Mark test as standalone_only for time being.

1b2e1e8

Issue: AAH-1092

bmclaughlin force-pushed the aah-1092-poc-define-system-roles branch from 5fc46da to 1b2e1e8 Compare March 16, 2022 14:12

awcrosby merged commit 3fefab0 into ansible:master Mar 17, 2022

bmclaughlin deleted the aah-1092-poc-define-system-roles branch March 17, 2022 18:59

newswangerd added a commit to newswangerd/galaxy_ng that referenced this pull request Apr 11, 2022

Revert RBAC changes.

550efdb

Revert "Create galaxy_ng specific Roles (ansible#1058)" This reverts commit 3fefab0. No-Issue

newswangerd added a commit that referenced this pull request Apr 11, 2022

Revert RBAC Roles (#1205)

67dbd31

* Revert "Remove django guardian (#1057)". This reverts commit d84dee6. * Revert "Create galaxy_ng specific Roles (#1058)". This reverts commit 3fefab0. No-Issue

himdel mentioned this pull request Apr 24, 2022

[rbac] New UI for object permission assignment ansible/ansible-hub-ui#1863

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Create galaxy_ng specific Roles #1058

Create galaxy_ng specific Roles #1058

bmclaughlin commented Nov 16, 2021

mdellweg Nov 17, 2021

bmclaughlin Nov 17, 2021

bmclaughlin commented Jan 6, 2022

mdellweg commented Jan 7, 2022

bmclaughlin commented Jan 7, 2022

mdellweg Jan 7, 2022

mdellweg commented Jan 7, 2022

bmclaughlin commented Jan 13, 2022

bmclaughlin commented Mar 8, 2022

bmclaughlin commented Mar 9, 2022

mdellweg commented Mar 18, 2022

	adjust_roles(apps, role_prefix, desired_roles, 0)
	adjust_roles(apps, role_prefix, desired_roles)

		@@ -48,6 +50,26 @@ def create_namespace_if_not_present(sender, instance, created, **kwargs):
		Namespace.objects.get_or_create(name=instance.namespace)


		def set_role_definitions(sender, **kwargs):

	def set_role_definitions(sender, **kwargs):
	def set_role_definitions(sender, apps=None, verbosity=1, **kwargs):

Create galaxy_ng specific Roles #1058

Create galaxy_ng specific Roles #1058

Conversation

bmclaughlin commented Nov 16, 2021

mdellweg Nov 17, 2021

Choose a reason for hiding this comment

bmclaughlin Nov 17, 2021

Choose a reason for hiding this comment

bmclaughlin commented Jan 6, 2022

mdellweg commented Jan 7, 2022

bmclaughlin commented Jan 7, 2022

mdellweg Jan 7, 2022

Choose a reason for hiding this comment

mdellweg commented Jan 7, 2022

bmclaughlin commented Jan 13, 2022

bmclaughlin commented Mar 8, 2022

bmclaughlin commented Mar 9, 2022

mdellweg commented Mar 18, 2022