From d8985f9f5bc489f2c15049249e00a7d4ea34a945 Mon Sep 17 00:00:00 2001 From: Joe Farebrother Date: Thu, 8 Feb 2024 10:32:56 +0000 Subject: [PATCH] Move tests for local auth to a folder --- java/ql/lib/semmle/code/java/security/AndroidLocalAuthQuery.qll | 2 +- .../CWE-287/{ => InsecureLocalAuth}/InsecureLocalAuth.expected | 0 .../CWE-287/{ => InsecureLocalAuth}/InsecureLocalAuth.ql | 0 .../security/CWE-287/{ => InsecureLocalAuth}/Test.java | 0 .../security/CWE-287/{ => InsecureLocalAuth}/Test2.java | 0 .../security/CWE-287/{ => InsecureLocalAuth}/options | 2 +- 6 files changed, 2 insertions(+), 2 deletions(-) rename java/ql/test/query-tests/security/CWE-287/{ => InsecureLocalAuth}/InsecureLocalAuth.expected (100%) rename java/ql/test/query-tests/security/CWE-287/{ => InsecureLocalAuth}/InsecureLocalAuth.ql (100%) rename java/ql/test/query-tests/security/CWE-287/{ => InsecureLocalAuth}/Test.java (100%) rename java/ql/test/query-tests/security/CWE-287/{ => InsecureLocalAuth}/Test2.java (100%) rename java/ql/test/query-tests/security/CWE-287/{ => InsecureLocalAuth}/options (67%) diff --git a/java/ql/lib/semmle/code/java/security/AndroidLocalAuthQuery.qll b/java/ql/lib/semmle/code/java/security/AndroidLocalAuthQuery.qll index 14476e737d9..004741aabfc 100644 --- a/java/ql/lib/semmle/code/java/security/AndroidLocalAuthQuery.qll +++ b/java/ql/lib/semmle/code/java/security/AndroidLocalAuthQuery.qll @@ -1,7 +1,7 @@ /** Definitions for the insecure local authentication query. */ import java -import semmle.code.java.dataflow.DataFlow +private import semmle.code.java.dataflow.DataFlow /** A base class that is used as a callback for biometric authentication. */ private class AuthenticationCallbackClass extends Class { diff --git a/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth.expected b/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/InsecureLocalAuth.expected similarity index 100% rename from java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth.expected rename to java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/InsecureLocalAuth.expected diff --git a/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth.ql b/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/InsecureLocalAuth.ql similarity index 100% rename from java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth.ql rename to java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/InsecureLocalAuth.ql diff --git a/java/ql/test/query-tests/security/CWE-287/Test.java b/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/Test.java similarity index 100% rename from java/ql/test/query-tests/security/CWE-287/Test.java rename to java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/Test.java diff --git a/java/ql/test/query-tests/security/CWE-287/Test2.java b/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/Test2.java similarity index 100% rename from java/ql/test/query-tests/security/CWE-287/Test2.java rename to java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/Test2.java diff --git a/java/ql/test/query-tests/security/CWE-287/options b/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/options similarity index 67% rename from java/ql/test/query-tests/security/CWE-287/options rename to java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/options index dacd3cb21df..33cdc1ea940 100644 --- a/java/ql/test/query-tests/security/CWE-287/options +++ b/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/options @@ -1 +1 @@ -//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/google-android-9.0.0 +//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/google-android-9.0.0