mirror of
https://github.com/ansible/awx.git
synced 2026-11-22 16:26:10 -03:30
Merge pull request #1299 from wwitzel3/rbac
deprecate Credential.team/user
This commit is contained in:
@@ -11,7 +11,7 @@ from django.contrib.auth.models import User
|
||||
@pytest.mark.django_db
|
||||
def test_credential_migration_user(credential, user, permissions):
|
||||
u = user('user', False)
|
||||
credential.user = u
|
||||
credential.deprecated_user = u
|
||||
credential.save()
|
||||
|
||||
migrated = rbac.migrate_credential(apps, None)
|
||||
@@ -29,7 +29,7 @@ def test_credential_usage_role(credential, user, permissions):
|
||||
def test_credential_migration_team_member(credential, team, user, permissions):
|
||||
u = user('user', False)
|
||||
team.admin_role.members.add(u)
|
||||
credential.team = team
|
||||
credential.deprecated_team = team
|
||||
credential.save()
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ def test_credential_migration_team_member(credential, team, user, permissions):
|
||||
def test_credential_migration_team_admin(credential, team, user, permissions):
|
||||
u = user('user', False)
|
||||
team.member_role.members.add(u)
|
||||
credential.team = team
|
||||
credential.deprecated_team = team
|
||||
credential.save()
|
||||
|
||||
assert not credential.accessible_by(u, permissions['usage'])
|
||||
@@ -88,7 +88,7 @@ def test_credential_access_admin(user, team, credential):
|
||||
credential.owner_role.rebuild_role_ancestor_list()
|
||||
|
||||
cred = Credential.objects.create(kind='aws', name='test-cred')
|
||||
cred.team = team
|
||||
cred.deprecated_team = team
|
||||
cred.save()
|
||||
|
||||
# should have can_change access as org-admin
|
||||
@@ -101,7 +101,7 @@ def test_cred_job_template(user, deploy_jobtemplate):
|
||||
org.admin_role.members.add(a)
|
||||
|
||||
cred = deploy_jobtemplate.credential
|
||||
cred.user = user('john', False)
|
||||
cred.deprecated_user = user('john', False)
|
||||
cred.save()
|
||||
|
||||
access = CredentialAccess(a)
|
||||
@@ -118,7 +118,7 @@ def test_cred_multi_job_template_single_org(user, deploy_jobtemplate):
|
||||
org.admin_role.members.add(a)
|
||||
|
||||
cred = deploy_jobtemplate.credential
|
||||
cred.user = user('john', False)
|
||||
cred.deprecated_user = user('john', False)
|
||||
cred.save()
|
||||
|
||||
access = CredentialAccess(a)
|
||||
@@ -197,7 +197,7 @@ def test_cred_no_org(user, credential):
|
||||
def test_cred_team(user, team, credential):
|
||||
u = user('a', False)
|
||||
team.member_role.members.add(u)
|
||||
credential.team = team
|
||||
credential.deprecated_team = team
|
||||
credential.save()
|
||||
|
||||
assert not credential.accessible_by(u, {'use':True})
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import pytest
|
||||
|
||||
from awx.main.access import TeamAccess
|
||||
from awx.main.models import Project
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_team_access_superuser(team, user):
|
||||
@@ -48,3 +49,25 @@ def test_team_access_member(organization, team, user):
|
||||
assert len(t.member_role.members.all()) == 1
|
||||
assert len(t.organization.admin_role.members.all()) == 0
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_team_accessible_by(team, user, project):
|
||||
u = user('team_member', False)
|
||||
|
||||
team.member_role.children.add(project.member_role)
|
||||
assert project.accessible_by(team, {'read':True})
|
||||
assert not project.accessible_by(u, {'read':True})
|
||||
|
||||
team.member_role.members.add(u)
|
||||
assert project.accessible_by(u, {'read':True})
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_team_accessible_objects(team, user, project):
|
||||
u = user('team_member', False)
|
||||
|
||||
team.member_role.children.add(project.member_role)
|
||||
assert len(Project.accessible_objects(team, {'read':True})) == 1
|
||||
assert not Project.accessible_objects(u, {'read':True})
|
||||
|
||||
team.member_role.members.add(u)
|
||||
assert len(Project.accessible_objects(u, {'read':True})) == 1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user