mirror of
https://github.com/ansible/awx.git
synced 2026-05-19 14:57:39 -02:30
fix a permissions bug for credentials specified at JT launch time
hat tip to @alancoding for spotting this one
This commit is contained in:
@@ -2797,10 +2797,14 @@ class JobTemplateLaunch(RetrieveAPIView):
|
|||||||
if request.user not in use_role:
|
if request.user not in use_role:
|
||||||
raise PermissionDenied()
|
raise PermissionDenied()
|
||||||
|
|
||||||
for cred in prompted_fields.get('credentials', []):
|
# For credentials that are _added_ via launch parameters, ensure the
|
||||||
new_credential = get_object_or_400(Credential, pk=cred)
|
# launching user has access
|
||||||
if request.user not in new_credential.use_role:
|
current_credentials = set(obj.credentials.values_list('id', flat=True))
|
||||||
raise PermissionDenied()
|
for new_cred in Credential.objects.filter(id__in=prompted_fields.get('credentials', [])):
|
||||||
|
if new_cred.pk not in current_credentials and request.user not in new_cred.use_role:
|
||||||
|
raise PermissionDenied(_(
|
||||||
|
"You do not have access to credential {}".format(new_cred.name)
|
||||||
|
))
|
||||||
|
|
||||||
new_job = obj.create_unified_job(**prompted_fields)
|
new_job = obj.create_unified_job(**prompted_fields)
|
||||||
result = new_job.signal_start(**passwords)
|
result = new_job.signal_start(**passwords)
|
||||||
|
|||||||
@@ -338,3 +338,30 @@ def test_extra_creds_prompted_at_launch(get, post, job_template, admin, net_cred
|
|||||||
def test_invalid_mixed_credentials_specification(get, post, job_template, admin, net_credential):
|
def test_invalid_mixed_credentials_specification(get, post, job_template, admin, net_credential):
|
||||||
url = reverse('api:job_template_launch', kwargs={'pk': job_template.pk})
|
url = reverse('api:job_template_launch', kwargs={'pk': job_template.pk})
|
||||||
post(url, {'credentials': [net_credential.pk], 'extra_credentials': [net_credential.pk]}, admin, expect=400)
|
post(url, {'credentials': [net_credential.pk], 'extra_credentials': [net_credential.pk]}, admin, expect=400)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_rbac_default_credential_usage(get, post, job_template, alice, machine_credential):
|
||||||
|
job_template.credentials.add(machine_credential)
|
||||||
|
job_template.execute_role.members.add(alice)
|
||||||
|
job_template.save()
|
||||||
|
|
||||||
|
# alice can launch; she's not adding any _new_ credentials, and she has
|
||||||
|
# execute access to the JT
|
||||||
|
url = reverse('api:job_template_launch', kwargs={'pk': job_template.pk})
|
||||||
|
post(url, {'credential': machine_credential.pk}, alice, expect=201)
|
||||||
|
|
||||||
|
# make (copy) a _new_ SSH cred
|
||||||
|
new_cred = machine_credential
|
||||||
|
new_cred.pk = None
|
||||||
|
new_cred.save()
|
||||||
|
|
||||||
|
# alice is attempting to launch with a *different* SSH cred, but
|
||||||
|
# she does not have access to it, so she cannot launch
|
||||||
|
url = reverse('api:job_template_launch', kwargs={'pk': job_template.pk})
|
||||||
|
post(url, {'credential': new_cred.pk}, alice, expect=403)
|
||||||
|
|
||||||
|
# if alice has gains access to the credential, she *can* launch
|
||||||
|
new_cred.use_role.members.add(alice)
|
||||||
|
url = reverse('api:job_template_launch', kwargs={'pk': job_template.pk})
|
||||||
|
post(url, {'credential': new_cred.pk}, alice, expect=201)
|
||||||
|
|||||||
@@ -237,7 +237,7 @@ def test_job_launch_fails_without_credential_access(job_template_prompts, runtim
|
|||||||
response = post(reverse('api:job_template_launch', kwargs={'pk':job_template.pk}),
|
response = post(reverse('api:job_template_launch', kwargs={'pk':job_template.pk}),
|
||||||
dict(credentials=runtime_data['credentials']), rando, expect=403)
|
dict(credentials=runtime_data['credentials']), rando, expect=403)
|
||||||
|
|
||||||
assert response.data['detail'] == u'You do not have permission to perform this action.'
|
assert response.data['detail'] == u'You do not have access to credential runtime-cred'
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db
|
@pytest.mark.django_db
|
||||||
|
|||||||
Reference in New Issue
Block a user