External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 08:50:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
8,922 Commits 65 Branches 102 Tags
0d7a7ae57f986ba6990ff7825cbe7692f235765b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wayne Witzel III 27470b0648 Merge pull request #3160 from wwitzel3/api_3.0.1 
do not allow membership changes to User.admin_role
 2016-07-29 12:37:26 -04:00
Wayne Witzel III b862a13d92 update unit tetsts 2016-07-29 11:30:33 -04:00
Wayne Witzel III 9baa9594c7 use get_object_or_400 to fetch Role 2016-07-29 11:29:49 -04:00
Wayne Witzel III b127e74ae4 refactor to unit tests 2016-07-29 11:29:43 -04:00
Wayne Witzel III 52865eea6a restrict User.admin_role membership changes through RoleUsersList 2016-07-29 11:29:41 -04:00
Wayne Witzel III a431ac7854 fix test 2016-07-29 11:29:39 -04:00
Wayne Witzel III 06bb8871d7 do not allow membership changes to User.admin_role 2016-07-29 11:29:36 -04:00
Wayne Witzel III 3e0d9e4d03 Merge pull request #3126 from wwitzel3/3.0.1 
Restrict what roles you can assign to teams.
 2016-07-27 09:50:26 -04:00
Wayne Witzel III a0c563e831 flake8 fixups 2016-07-26 14:50:48 -04:00
Wayne Witzel III df1464d4bf fixing tests for new team role assignment restrictions 2016-07-26 12:10:19 -04:00
Wayne Witzel III 74b013aad0 driveby cleanup 2016-07-26 12:09:58 -04:00
Wayne Witzel III 9bad20cee3 do not allow assignment of system roles or user.admin_role to teams 2016-07-26 12:09:36 -04:00
Wayne Witzel III 633b27b66b add test for CustomInventoryScript serializer 2016-07-25 17:39:19 -04:00
Wayne Witzel III a801ee7d52 ensure system admin/auditor can see orphan inventory scripts 2016-07-25 17:39:19 -04:00
Wayne Witzel III 81c4a82db8 fix issue with rbac_migrations logger 2016-07-25 11:22:50 -04:00
Wayne Witzel III 03c3ac074c Merge pull request #3022 from wwitzel3/issue-2979 
Fix sysadmin and sysauditor viewing orphan inventory script.
 2016-07-15 15:26:33 -04:00
Wayne Witzel III b9de0b196d add test for CustomInventoryScript serializer 2016-07-15 10:35:44 -04:00
Wayne Witzel III ec2bf4476d ensure system admin/auditor can see orphan inventory scripts 2016-07-14 11:16:16 -04:00
Wayne Witzel III f9707c0ca1 Merge pull request #2922 from wwitzel3/issue-2508 
ensure CustomInventoryScripts render correctly in the ActivityStream
 2016-07-12 08:28:43 -04:00
Wayne Witzel III f7e9d07dad ensure CustomInventoryScripts render correctly in the ActivityStream 2016-07-11 15:25:35 -04:00
Wayne Witzel III c00d32d0eb Merge pull request #2714 from wwitzel3/issue-2706 
ensure the singleton roles show up for sys auditor / sys admins
 2016-07-01 11:11:58 -04:00
Wayne Witzel III 16bc0cdf0b add helper decorator to ensure signleton roles see the proper role list 2016-07-01 10:38:02 -04:00
Wayne Witzel III 47893613a2 ensure the singleton roles show up for sys auditor / sys admins 2016-06-30 10:55:54 -04:00
Wayne Witzel III eb0fc15742 Merge pull request #2690 from wwitzel3/test-refactoring 
Adding some coverage for task helpers.
 2016-06-29 21:11:30 -04:00
Wayne Witzel III 5ef385db20 add extra parametrize test and fix indent error 2016-06-29 20:17:59 -04:00
Wayne Witzel III 32d781175d add and update task unit tests 2016-06-29 12:09:15 -04:00
Wayne Witzel III 479119f3ce add more task unit tests 2016-06-29 12:09:14 -04:00
Wayne Witzel III 4f534122c5 Merge pull request #2675 from wwitzel3/issue-2244 
Do not show the read_role child for Teams
 2016-06-28 11:43:05 -04:00
Wayne Witzel III 994065d495 removing test (already had coverage), fixing test 2016-06-28 11:19:18 -04:00
Wayne Witzel III 4d3d38c4ac ensure read_role is not being returned 2016-06-28 10:56:36 -04:00
Wayne Witzel III 8e89edc27f Do not show the read_role child for Teams 2016-06-28 10:56:08 -04:00
Wayne Witzel III 5456b209ac Merge pull request #2654 from wwitzel3/issue-2485 
reduce activity stream noise
 2016-06-27 15:47:59 -04:00
Wayne Witzel III 3697ddc2d0 fixing Role is None exception 2016-06-27 13:40:50 -04:00
Wayne Witzel III e1853372f7 Adding comments to signals for rbac activity stream 2016-06-27 11:41:00 -04:00
Wayne Witzel III f0418d8841 Merge pull request #2634 from wwitzel3/issue-2560 
Disallow non-admin of a user to add a user to Roles
 2016-06-27 11:28:38 -04:00
Wayne Witzel III 5e2a3b3ef2 reduce activity stream noise by not including implicit role dis/associations 2016-06-27 11:28:06 -04:00
Wayne Witzel III ce3ce8d930 enforce read access for team/child roles 2016-06-27 11:02:07 -04:00
Wayne Witzel III fca4e75e03 missed org.auditor_role in credential read_role 2016-06-24 17:01:11 -04:00
Wayne Witzel III 089065bed1 RoleAccess.can_unattach ensures you have read access member 2016-06-24 16:55:50 -04:00
Wayne Witzel III 87ffded774 renaming Credential.owner_role -> Credential.admin_role 2016-06-24 16:55:07 -04:00
Wayne Witzel III 62293341bf Merge pull request #2592 from wwitzel3/issue-2349 
filter out duplicate entires for the ActivityStream m2m relations
 2016-06-23 11:01:42 -04:00
Wayne Witzel III 68d47cfc93 Merge pull request #2574 from wwitzel3/fix-race 
Ensure teams cannot have org roles as children.
 2016-06-22 17:31:27 -04:00
Wayne Witzel III 5277d30d14 filter out duplicate entires for the ActivityStream m2m relations 2016-06-22 17:25:27 -04:00
Wayne Witzel III 329e81b40e no need for create=True 2016-06-22 15:39:40 -04:00
Wayne Witzel III 1d329856f9 use MagicMock for content_type 2016-06-22 15:36:26 -04:00
Wayne Witzel III 67e516f263 update language in error message 2016-06-22 12:14:11 -04:00
Wayne Witzel III 54e618db2e test org role as child for team 400s 2016-06-22 12:00:32 -04:00
Wayne Witzel III e07a06e990 Teams cannot be parents of Organization roles 2016-06-22 11:59:40 -04:00
Wayne Witzel III 4278330032 Merge pull request #2565 from wwitzel3/3.0 
Fix migration hierarchy updating
 2016-06-22 10:29:47 -04:00
Wayne Witzel III 2535b1fb7c Fix migration hierarchy updating 2016-06-22 09:58:15 -04:00
Wayne Witzel III 06c74ced76 Merge pull request #2538 from wwitzel3/issue-2349 
Credential bug fixes for access and uniqueness
 2016-06-21 16:40:14 -04:00
Wayne Witzel III 52b16620cd added multi-team same credential name test 2016-06-21 16:30:06 -04:00
Wayne Witzel III dab3440275 assert org.auditor can read org credentials 2016-06-21 16:07:47 -04:00
Wayne Witzel III b4148313a0 org auditor should be able to read credential 2016-06-21 16:07:11 -04:00
Wayne Witzel III 868b6b7e36 add migration for read_role parents of credential 2016-06-21 14:44:04 -04:00
Wayne Witzel III c7cf954476 ensure org auditor can see org credentials 2016-06-21 14:43:40 -04:00
Wayne Witzel III 51150ce7fc renaming test so pytest collector stops getting confused 2016-06-21 14:17:16 -04:00
Wayne Witzel III 4799b27108 ensure organization is empty when generating a new credential 2016-06-21 13:07:58 -04:00
Wayne Witzel III bc457ccef6 assert Credential unique_togehter works 2016-06-21 11:36:31 -04:00
Wayne Witzel III 14d67d560e add Credential migration for unique_together 2016-06-21 11:35:51 -04:00
Wayne Witzel III 3575b32eab Credential should have a unique org,kind,name 2016-06-21 11:35:30 -04:00
Wayne Witzel III 67a1b8ce81 Merge pull request #2483 from wwitzel3/issue-2186 
add can_delete check method (defers to admin)
 2016-06-17 09:52:05 -04:00
Wayne Witzel III 010e688c84 Merge pull request #2484 from wwitzel3/issue-2205 
updating URL to be _ instead of /
 2016-06-17 09:51:18 -04:00
Wayne Witzel III 6f36497b6a updating URL to be _ instead of / 2016-06-16 17:05:42 -04:00
Wayne Witzel III 6b0155b3f9 add can_delete check method (defers to admin) 2016-06-16 16:54:51 -04:00
Wayne Witzel III 051d419b1f Merge pull request #2450 from wwitzel3/release_3.0.0 
Fixing Team and Credential access issues
 2016-06-16 16:36:03 -04:00
Wayne Witzel III 58c8cc1703 adjust team admin_role / member_role assertion 2016-06-16 15:32:00 -04:00
Wayne Witzel III 14809c086d added some assertions to catch cycles, updated migration 2016-06-16 15:24:07 -04:00
Wayne Witzel III 791589dab8 Fixing Team and Credential access issues 2016-06-16 15:23:50 -04:00
Wayne Witzel III 8a2c8d59a5 Merge pull request #2388 from wwitzel3/test-refactoring 
More testing clean up
 2016-06-14 13:44:53 -04:00
Wayne Witzel III 6013a853f5 Merge pull request #2387 from wwitzel3/issue-2316 
remove User.object_roles endpoint and discovery
 2016-06-14 13:43:58 -04:00
Wayne Witzel III 1b37818eba removing old, duplicated tests 2016-06-14 11:45:34 -04:00
Wayne Witzel III 203ebd20e8 remove the User.object_roles view 2016-06-14 11:42:23 -04:00
Wayne Witzel III a47f47b790 remove URL and related mapping for User.object_roles 2016-06-14 11:42:08 -04:00
Wayne Witzel III b24ad639bf Merge pull request #2354 from wwitzel3/issue-2124 
anyone with read_role should be able to view /update
 2016-06-14 10:16:19 -04:00
Wayne Witzel III db7cfb23f8 added False return for permission check 2016-06-14 09:53:07 -04:00
Wayne Witzel III 568de86423 anyone with read_role should be able to view the can_update flag for a project 2016-06-13 12:07:39 -04:00
Wayne Witzel III 74518379c6 Merge pull request #2344 from wwitzel3/issue-2327 
fix issue with Team.roles and ActivityStream
 2016-06-13 07:05:53 -07:00
Wayne Witzel III 019c5bac04 fix tests to be more specific about AS query 2016-06-13 09:39:52 -04:00
Wayne Witzel III db16478830 only special case team when sender is Role_parents 2016-06-10 17:27:11 -04:00
Wayne Witzel III 587b243ebb Merge pull request #2340 from wwitzel3/issue-2186 
fixes access issue for InventoryScript.admin_role
 2016-06-10 14:11:22 -07:00
Wayne Witzel III 00698b82fc fix issue with Team.roles and ActivityStream 2016-06-10 17:03:55 -04:00
Wayne Witzel III ca0f533b82 fixes access issue for InventoryScript.admin_role 2016-06-10 16:33:02 -04:00
Wayne Witzel III 0f59314116 Merge pull request #2329 from wwitzel3/issue-2269 
Add Organization FK to Credential
 2016-06-10 11:32:24 -07:00
Wayne Witzel III 358998c4b4 fix api test 2016-06-10 14:17:48 -04:00
Wayne Witzel III e243c8319d fix tests with refreshes 2016-06-10 13:41:22 -04:00
Wayne Witzel III 5754b4bb2c adjusting Credential model and migrations 2016-06-10 13:23:32 -04:00
Wayne Witzel III 2c05df064b adjusting API for new Credential.organization 2016-06-10 13:23:02 -04:00
Wayne Witzel III 3cf4d1feb8 Fixing Credential access issue 2016-06-10 10:30:22 -04:00
Wayne Witzel III 73acf006cf Merge pull request #2282 from wwitzel3/cred-owners 
add credential owner endpoints
 2016-06-09 12:01:09 -07:00
Wayne Witzel III 698085353b addressing review comments 2016-06-09 14:47:54 -04:00
Wayne Witzel III ccc510110d add credential owner endpoints 2016-06-09 14:41:35 -04:00
Wayne Witzel III 61fb16b8c1 Merge pull request #2222 from wwitzel3/release_3.0.0 
CredentialAccess should check for the owner_role earlier
 2016-06-08 06:11:07 -07:00
Wayne Witzel III 1fb4a68047 CredentialAccess should check for the owner_role earlier 2016-06-08 04:23:29 -04:00
Wayne Witzel III 6cc2e05ddf Merge pull request #2192 from wwitzel3/release_3.0.0 
combining job_template api tests
 2016-06-07 08:10:21 -07:00
Wayne Witzel III 112d271ccb combining job_template api tests 2016-06-07 10:13:51 -04:00
Wayne Witzel III e002062242 Merge pull request #2176 from wwitzel3/release_3.0.0 
refactoring survey spec tests and fixtures
 2016-06-06 11:17:04 -07:00
Wayne Witzel III 8f3c0ff884 refactoring survey spec tests and fixtures 2016-06-06 13:39:25 -04:00
Wayne Witzel III 7395e07221 Merge pull request #2068 from wwitzel3/issue_3.0_1990 
Fix ActivityStream when object2 is a role.
 2016-05-27 15:45:53 -04:00
Wayne Witzel III 31d3e3ec55 mock activity stream license and make query more specific 2016-05-27 15:21:24 -04:00