External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-06 11:11:07 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #536 from ryanpetrello/fix-7741

Browse Source 
properly follow symlinks for bwrap'd working directories
This commit is contained in:
Ryan Petrello
2017-10-19 08:58:16 -04:00
committed by GitHub
parent 350699eda8 10a7544d68
commit b1f5529aa4
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/main/utils/common.py
View File

@@ -703,6 +703,7 @@ def wrap_args_with_proot(args, cwd, **kwargs):
- /var/log/supervisor - /var/log/supervisor
''' '''
from django.conf import settings from django.conf import settings
cwd = os.path.realpath(cwd)
new_args = [getattr(settings, 'AWX_PROOT_CMD', 'bwrap'), '--unshare-pid', '--dev-bind', '/', '/'] new_args = [getattr(settings, 'AWX_PROOT_CMD', 'bwrap'), '--unshare-pid', '--dev-bind', '/', '/']
hide_paths = [settings.AWX_PROOT_BASE_PATH] hide_paths = [settings.AWX_PROOT_BASE_PATH]
if not kwargs.get('isolated'): if not kwargs.get('isolated'):