From 15c4492625b9cbcb983212ce947de4fa53f80fba Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 4 Sep 2017 01:00:12 +0200 Subject: [PATCH 1/2] remove gradle-wrapper.jar during scan We make sure to not use the gradle wrapper anyway so this should have no impact. --- fdroidserver/scanner.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py index f768e678..e8b29451 100644 --- a/fdroidserver/scanner.py +++ b/fdroidserver/scanner.py @@ -198,7 +198,10 @@ def scan_source(build_dir, build): elif ext == 'jar': for name in suspects_found(curfile): count += handleproblem('usual supect \'%s\'' % name, path_in_build_dir, filepath) - warnproblem('JAR file', path_in_build_dir) + if curfile == 'gradle-wrapper.jar': + removeproblem('gradle-wrapper.jar', path_in_build_dir, filepath) + else: + warnproblem('JAR file', path_in_build_dir) elif ext == 'aar': warnproblem('AAR file', path_in_build_dir) From 5f5d3ea896183260258f653f971c01896ec20ddf Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 4 Sep 2017 01:03:26 +0200 Subject: [PATCH 2/2] scanner: promote jar and aar files present in the repo to errors This makes sure we we don't include any prebuilt code in the build process. --- fdroidserver/scanner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py index e8b29451..de58b9d4 100644 --- a/fdroidserver/scanner.py +++ b/fdroidserver/scanner.py @@ -201,10 +201,10 @@ def scan_source(build_dir, build): if curfile == 'gradle-wrapper.jar': removeproblem('gradle-wrapper.jar', path_in_build_dir, filepath) else: - warnproblem('JAR file', path_in_build_dir) + count += handleproblem('JAR file', path_in_build_dir, filepath) elif ext == 'aar': - warnproblem('AAR file', path_in_build_dir) + count += handleproblem('AAR file', path_in_build_dir, filepath) elif ext == 'java': if not os.path.isfile(filepath):