Akita Noek
7eac303ec7
Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac
2016-03-23 09:32:31 -04:00
Akita Noek
68bb342fe9
flake8
2016-03-22 22:25:50 -04:00
Akita Noek
fc25cb7e95
More .all() fixes re active flag removal
2016-03-22 22:23:32 -04:00
Akita Noek
6323e023dc
.all() fixes re active flag removal
2016-03-22 17:35:36 -04:00
Akita Noek
b9924613fa
Timing adjustment to let our large data test pass for now
...
This hack is to avoid having failure noise as we're working through
preparing to merge into devel.
There is an issue #992 to track and fix this specific problem properly,
so this change is just to squelch the test for now.
2016-03-22 15:57:51 -04:00
Akita Noek
dde2e66a2f
Fix missing .all() from active flag filter nuke
2016-03-22 15:36:07 -04:00
Akita Noek
16475dd973
Updated old/users.py tests to reflect new test expecations
2016-03-22 14:08:13 -04:00
Akita Noek
aa44ac316d
Add support for ORG_ADMINS_CAN_SEE_ALL_USERS flag
...
Completes #1293
2016-03-22 14:06:32 -04:00
Akita Noek
c42f8f98a4
Fixed user/:id/teams access control
2016-03-22 14:05:53 -04:00
Wayne Witzel III
17daade6e6
Merge pull request #1288 from anoek/rbac
...
Misc RBAC patches
2016-03-22 13:51:24 -04:00
Akita Noek
5db7383a38
Bolt on organizations and admin_of_organizations properties to User model; fix related API endpoints
...
This partially mimics the old api feel, though doesn't enable searching
through these fields via ORM queries of course.
2016-03-22 13:13:41 -04:00
Akita Noek
cb83ee3ec6
Tightened user can_admin access so only sys admins and org admins can admin users
2016-03-22 11:40:06 -04:00
Akita Noek
4dcf51e791
Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac
2016-03-22 11:10:48 -04:00
Akita Noek
f8415d06c8
Fixed scripts.py tests
2016-03-22 11:09:54 -04:00
Wayne Witzel III
c7cb9f3a2d
Merge pull request #1276 from wwitzel3/rbac
...
Implements issue #1061 , allow org admins (or higher) job delete
2016-03-22 09:47:36 -04:00
Wayne Witzel III
99ca2efc4f
Update Makefile, no more fact/tests
2016-03-22 09:31:11 -04:00
Wayne Witzel III
5313d2fcb0
Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac
2016-03-22 09:24:56 -04:00
Akita Noek
3bcabec2a3
Print garbage cleanup
2016-03-22 08:55:18 -04:00
Akita Noek
d8f527429c
flake8 fixes
2016-03-22 08:05:04 -04:00
Akita Noek
7d932b6633
Add missing .all() from filter removal
2016-03-21 22:29:16 -04:00
Akita Noek
c7234f42c7
Give SU's access to all projects to protect against unreachable orphans
2016-03-21 22:28:05 -04:00
Akita Noek
7ca516da0b
Misc fixes for old projects tests
2016-03-21 22:17:16 -04:00
Akita Noek
b111484b89
old users tests: deprecated_userse -> member_role.members changes
2016-03-21 22:16:54 -04:00
Akita Noek
8c403cf77f
Fixed SU project access
2016-03-21 22:15:08 -04:00
Akita Noek
173ae3b2db
Fixed deprecated_teams relation, and typos
2016-03-21 22:14:39 -04:00
Akita Noek
54cf4b6e02
Grant project access to teams through role parenting
2016-03-21 22:13:12 -04:00
Akita Noek
e4a1a9c3bf
Fixed user/:id/projects after ripping out Team.users
2016-03-21 22:09:55 -04:00
Akita Noek
01e16f6722
Fixed user/:id/teams endpoint after ripping out Team.users
2016-03-21 22:09:18 -04:00
Akita Noek
6d62fbc541
Add test for most recent rbac m2m binding fail
2016-03-21 21:09:58 -04:00
Akita Noek
ec851492d6
Fixed Role m2m binding so it even works all the time
2016-03-21 21:09:22 -04:00
Akita Noek
4bb2f27fe5
Prefixed User.organizations and User.admin_of_organizations with deprecated_
2016-03-21 15:43:58 -04:00
Akita Noek
91690a0eb7
Removed deprecated use of admin_of_organizations
2016-03-21 15:43:21 -04:00
Akita Noek
b46bdef732
Ported old/organizations.py tests to new rbac system
2016-03-21 15:35:08 -04:00
Akita Noek
a5c355d753
Updated UserAccess to reflect new visibility requirements (and work)
2016-03-21 15:08:10 -04:00
Akita Noek
80560fffc9
Merge pull request #1283 from anoek/rbac
...
Fixed up migrations
2016-03-18 16:33:24 -04:00
Akita Noek
e4948f210f
Fixed up migrations
2016-03-18 16:31:53 -04:00
Akita Noek
92df6b0fb2
Merge branch 'devel' into rbac
2016-03-18 16:26:45 -04:00
Akita Noek
8addccd434
Renamed migrations to be a little more descriptive
...
Mainly for sanity when merging migrations into long running branches..
but nice anyways I think
2016-03-18 16:17:58 -04:00
Akita Noek
5a444d4b2c
Merge pull request #1281 from anoek/rbac
...
Merging devel into rbac
2016-03-18 15:43:48 -04:00
Akita Noek
54aa465448
Merge remote-tracking branch 'ansible/rbac' into rbac
2016-03-18 15:42:58 -04:00
Akita Noek
beb4f95fa6
Merge remote-tracking branch 'ansible/rbac' into rbac
2016-03-18 15:42:06 -04:00
Akita Noek
9dc4f3e07d
Merge pull request #1280 from anoek/rbac
...
Refactored ImplicitRoleField
2016-03-18 15:41:54 -04:00
Akita Noek
5741b47c54
Merge remote-tracking branch 'ansible/devel' into merge-devel
2016-03-18 15:40:13 -04:00
Akita Noek
4fac1e96f4
Test that helps test the implemenation of role auto-reparenting
2016-03-18 15:11:13 -04:00
Akita Noek
23f0286669
Refactored ImplicitRoleField to be faster and avoid some bad looping cases
...
The role creation logic was a bit too lazy and caused some looping when
using other roles as parent roles. This refactor does all role
creation for a single model instance up front together, which helps
avoid these situations as well as eliminates some extra db updates and
inserts that would happen the old way.
2016-03-18 15:10:08 -04:00
Chris Meyers
69b2a3c868
Merge pull request #1275 from chrismeyersfsu/playbook_state_admin_password
...
desired state pattern for admin_password
2016-03-18 11:32:53 -04:00
Chris Meyers
523e3b7933
Merge pull request #1277 from chrismeyersfsu/playbook_fix_redis
...
fixes bringup redis
2016-03-18 11:32:40 -04:00
Wayne Witzel III
752416f4d8
Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac
2016-03-18 11:21:13 -04:00
Wayne Witzel III
8a1f21de12
Merge pull request #1265 from anoek/rbac
...
Various small fixes and progress on making 'old' tests work again on RBAC
2016-03-18 11:21:10 -04:00
Akita Noek
13dd27ac52
Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac
2016-03-18 11:17:04 -04:00
