Commit Graph
2163 Commits
Author SHA1 Message Date
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
Matthew Jones f286dc7486 Fix an issue with the email notifier
Incorrect body format assumptions in the email notifier
2016-03-21 15:40:41 -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
Graham Mainwaring 1e8e53e811 Merge branch 'devel' of github.com:ansible/ansible-tower into python27_el6
Conflicts:
	packaging/rpm/ansible-tower.spec
	tools/docker-compose/start_development.sh
2016-03-21 12:13:50 -04:00
Matthew Jones 46bbc83d0d Changes for Tower virtualenv support
* Break requirements down into ansible and tower reqs
* Generate separate Ansible and Tower virtual environments
* Install appropriate requirements files into each one
* Modify development tools to use these venvs instead of our old
  site-packages
* Modify settings to indicate venv enablement and location of venvs
* Modify tasks to use the proper virtual environment for its purpose
2016-03-21 12:11:19 -04:00
AlanCoding fcc02f7678 rebase and rename migrations corresponding to devel change 2016-03-18 16:45:06 -04:00
AlanCoding f4b1de766d Adding OpenStack v3 cred type 2016-03-18 16:41:09 -04:00
AlanCoding c807d5dcf3 Add keystone v3 support via new domain field on credential 2016-03-18 16:41:09 -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 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
Wayne Witzel III 752416f4d8 Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-03-18 11:21:13 -04:00
Akita Noek 13dd27ac52 Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-03-18 11:17:04 -04:00
Wayne Witzel III b5ca6b891b Implements issue #1061, allow org admins (or higher) job delete 2016-03-18 10:28:38 -04:00
Wayne Witzel III 766190fb80 Use getattrd instead of reduce 2016-03-17 16:27:47 -04:00
Wayne Witzel III 6d249f38a7 Fix credential assertions and rename migration helpers 2016-03-17 15:41:46 -04:00
Akita Noek ccfb73766c Code de-dup 2016-03-17 13:25:04 -04:00
Wayne Witzel III 74e2c440a5 Rename credential migration helpers 2016-03-17 11:37:59 -04:00
Wayne Witzel III b59e960b46 Credential migration and initial tests 2016-03-17 11:21:10 -04:00
Akita Noek 1827de48af more deprecated_users -> member_role.members fixes in tests 2016-03-17 08:56:02 -04:00
Akita Noek ecf4d2872a Fixes for schedule tests 2016-03-17 08:55:32 -04:00
Akita Noek 3ca016faaf Revert ScheduleAccess can_* methods to route through other *Access classes
This takes care of all the polymorphic cases, which we'd have to
otherwise handle
2016-03-17 08:53:40 -04:00
Akita Noek c0245317b3 flake8 2016-03-16 16:48:07 -04:00
Akita Noek a1202a20ab Added .all()'s needed after active flag filter removal 2016-03-16 16:47:35 -04:00
Akita Noek 8fb9ef37c2 Permission -> RBAC fixes in our inventory tests 2016-03-16 16:43:54 -04:00
Akita Noek cf3c988330 Missing import 2016-03-16 16:43:13 -04:00
Akita Noek e770a1f225 Removed unused dashboard inventory graph, doubly useless now that active flag is gone 2016-03-16 15:56:23 -04:00
Akita Noek d9c80dade6 Active flag removal fallout fixes 2016-03-16 15:55:24 -04:00
Akita Noek 098ff82e7c Updated inventory tests to use new rbac system 2016-03-16 15:07:16 -04:00
Akita Noek 1face5aa28 Dropped unused ResourceMixin from InventorySource 2016-03-16 14:19:31 -04:00
Akita Noek 99d3481976 Ported ad_hoc.py tests to use new RBAC system 2016-03-16 13:46:48 -04:00
Akita Noek 9e79cf733f Added missing permission grants on a Inventory updater and executor roles 2016-03-16 13:46:15 -04:00
Akita Noek 55564cc2b4 Fix Credential admin_role to add itself under the user.admin_role when it exists 2016-03-16 13:16:26 -04:00
Akita Noek 46cb51ba2f typo fix 2016-03-16 11:56:58 -04:00
Akita Noek c308c07579 Removed Permission reference in the activity stream query 2016-03-16 11:37:21 -04:00
Akita Noek 598d5ba5ef Fixed up JobAccess.get_queryset to use new RBAC system 2016-03-16 11:36:19 -04:00
Akita Noek 8d439c9468 Fixed up AdHocCommandAccess to not use old Permission query 2016-03-16 11:21:19 -04:00
Akita Noek 60fcbd78f1 Another users -> members_role.members fix 2016-03-16 10:54:35 -04:00
Akita Noek 7ec3b3b8b5 Fixed up User.accessible_objects to return a User queryset
Was returnning a RolePermission qs, needed to be a User qs to match.
Also bolted on the role_permissions GenericRelation so we could just
reuse the ResourceMixin accessible_objects code
2016-03-16 10:26:53 -04:00
Alan Rominger 96517d2381 Merge pull request #1230 from AlanCoding/647_org_summary_numbers
Provide counts of organization resources in list view
2016-03-16 10:07:25 -04:00
Akita Noek 9909ea90c1 Fixed post delete behavior for roles, added test 2016-03-16 09:13:33 -04:00
Akita Noek 67b37e17cb flake8 fixes 2016-03-16 08:54:59 -04:00
Akita Noek 7e0d2e6729 more .users -> member_role.members 2016-03-15 17:00:20 -04:00
Akita Noek defe4a4fd8 Made credentials accessible by system administrators and auditors 2016-03-15 16:51:44 -04:00