External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 07:17:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Adding new privilege escalation methods from core

Browse Source
This commit is contained in:
Matthew Jones
2016-12-15 16:22:06 -05:00
parent ef1f77bf8e
commit 888ec25c3c
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/migrations/0034_v310_release.py
View File

@@ -47,6 +47,11 @@ class Migration(migrations.Migration):
name='uuid', name='uuid',
field=models.CharField(max_length=40), field=models.CharField(max_length=40),
), ),
migrations.AlterField(
model_name='credential',
name='become_method',
field=models.CharField(default=b'', help_text='Privilege escalation method.', max_length=32, blank=True, choices=[(b'', 'None'), (b'sudo', 'Sudo'), (b'su', 'Su'), (b'pbrun', 'Pbrun'), (b'pfexec', 'Pfexec'), (b'dzdo', 'DZDO'), (b'pmrun', 'Pmrun')]),
),
# Add Workflows # Add Workflows
migrations.AlterField( migrations.AlterField(
model_name='unifiedjob', model_name='unifiedjob',

2
awx/main/models/credential.py
View File

@@ -50,6 +50,8 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique, ResourceMixin):
('su', _('Su')), ('su', _('Su')),
('pbrun', _('Pbrun')), ('pbrun', _('Pbrun')),
('pfexec', _('Pfexec')), ('pfexec', _('Pfexec')),
('dzdo', _('DZDO')),
('pmrun', _('Pmrun')),
#('runas', _('Runas')), #('runas', _('Runas')),
] ]

4
awx/main/tasks.py
View File

@@ -1743,6 +1743,10 @@ class RunAdHocCommand(BaseTask):
d[re.compile(r'^pfexec password.*:\s*?$', re.M)] = 'become_password' d[re.compile(r'^pfexec password.*:\s*?$', re.M)] = 'become_password'
d[re.compile(r'^RUNAS password.*:\s*?$', re.M)] = 'become_password' d[re.compile(r'^RUNAS password.*:\s*?$', re.M)] = 'become_password'
d[re.compile(r'^runas password.*:\s*?$', re.M)] = 'become_password' d[re.compile(r'^runas password.*:\s*?$', re.M)] = 'become_password'
d[re.compile(r'^DZDO password.*:\s*?$', re.M)] = 'become_password'
d[re.compile(r'^dzdo password.*:\s*?$', re.M)] = 'become_password'
d[re.compile(r'^PMRUN password.*:\s*?$', re.M)] = 'become_password'
d[re.compile(r'^pmrun password.*:\s*?$', re.M)] = 'become_password'
d[re.compile(r'^SSH password:\s*?$', re.M)] = 'ssh_password' d[re.compile(r'^SSH password:\s*?$', re.M)] = 'ssh_password'
d[re.compile(r'^Password:\s*?$', re.M)] = 'ssh_password' d[re.compile(r'^Password:\s*?$', re.M)] = 'ssh_password'
return d return d