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

Merge branch 'fix_791' into 'master'

Browse Source 
scanner: fix wrong path being passed to function

Closes #791

See merge request fdroid/fdroidserver!767
This commit is contained in:
Marcus 2020-06-13 11:03:30 +00:00
commit 12f4ae3039
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fdroidserver/scanner.py
View File

@ -200,12 +200,14 @@ def scan_source(build_dir, build=metadata.Build()):
]
]
def safe_path(path):
for sp in safe_paths:
if sp.match(path):
return True
def is_image_file(path):
if imghdr.what(path) is not None:
return True
def safe_path(path_in_build_dir):
for sp in safe_paths:
if sp.match(path_in_build_dir):
return True
return False
gradle_compile_commands = get_gradle_compile_commands(build)
@ -289,7 +291,7 @@ def scan_source(build_dir, build=metadata.Build()):
count += handleproblem('binary', path_in_build_dir, filepath)
elif is_executable(filepath):
if is_binary(filepath) and not safe_path(path_in_build_dir):
if is_binary(filepath) and not (safe_path(path_in_build_dir) or is_image_file(filepath)):
warnproblem(_('executable binary, possibly code'), path_in_build_dir)
for p in scanignore: