kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-09 00:40:11 +01:00
Code Activity

Fix rm safety check

Browse Source 
I got it backwards due to my stupid parameter naming.
This commit is contained in:
Ciaran Gultnieks 2013-10-27 17:16:04 +00:00
parent 921b407582
commit dad4f496f0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fdroidserver/common.py
View File

@ -1428,8 +1428,9 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
if 'rm' in build: if 'rm' in build:
for part in build['rm'].split(';'): for part in build['rm'].split(';'):
dest = os.path.join(build_dir, part.strip()) dest = os.path.join(build_dir, part.strip())
if not os.path.realpath(dest).startswith(os.path.realpath(root_dir)): if not os.path.realpath(dest).startswith(os.path.realpath(build_dir)):
raise BuildException("rm is outside build root") raise BuildException("rm for {0} is outside build root {1}".format(
os.path.realpath(build_dir),os.path.realpath(dest)))
if os.path.exists(dest): if os.path.exists(dest):
subprocess.call('rm -rf ' + dest, shell=True) subprocess.call('rm -rf ' + dest, shell=True)