zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-17 22:28:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Clean up and test patch changing methods

Browse Source
This commit is contained in:
Alan Rominger
2021-04-22 09:37:42 -04:00
parent 1f1cdf8859
commit d33a748eea
2 changed files with 57 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/main/utils/execution_environments.py
+12 -4
View File
@@ -37,7 +37,15 @@ CONTAINER_ROOT = '/runner'
def to_container_path(path, private_data_dir):
if not os.path.isabs(private_data_dir):
raise Exception
if Path(private_data_dir) not in Path(path).parents:
raise Exception
return path.replace(private_data_dir, CONTAINER_ROOT)
raise RuntimeError('The private_data_dir path must be absolute')
if private_data_dir != path and Path(private_data_dir) not in Path(path).resolve().parents:
raise RuntimeError(f'Cannot convert path {path} unless it is a subdir of {private_data_dir}')
return path.replace(private_data_dir, CONTAINER_ROOT, 1)
def to_host_path(path, private_data_dir):
if not os.path.isabs(private_data_dir):
raise RuntimeError('The private_data_dir path must be absolute')
if CONTAINER_ROOT != path and Path(CONTAINER_ROOT) not in Path(path).resolve().parents:
raise RuntimeError(f'Cannot convert path {path} unless it is a subdir of {CONTAINER_ROOT}')
return path.replace(CONTAINER_ROOT, private_data_dir, 1)