OSDN Git Service

DO NOT MERGE. Execute "strict" queries with extra parentheses.
authorJeff Sharkey <jsharkey@android.com>
Wed, 25 Jul 2018 20:01:59 +0000 (14:01 -0600)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 16 Aug 2018 01:23:31 +0000 (01:23 +0000)
commitdf458137ebc4f879fb69812b0f19fb59162f876a
treeea95158b1029fb0b92721dfe0cc78f2045e3d082
parent1dac65d06b15af977600ee3c522866bb614372ec
DO NOT MERGE. Execute "strict" queries with extra parentheses.

SQLiteQueryBuilder has a setStrict() mode which can be used to
detect SQL attacks from untrusted sources, which it does by running
each query twice: once with an extra set of parentheses, and if that
succeeds, it runs the original query verbatim.

This sadly doesn't catch inputs of the type "1=1) OR (1=1", which
creates valid statements for both tests above, but the final executed
query ends up leaking data due to SQLite operator precedence.

Instead, we need to continue compiling both variants, but we need
to execute the query with the additional parentheses to ensure
data won't be leaked.

Test: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java
Bug: 111085900
Change-Id: I6e8746fa48f9de13adae37d2990de11c9c585381
Merged-In: I6e8746fa48f9de13adae37d2990de11c9c585381
(cherry picked from commit 5a55a72fcd18fb676eb4c114e62048068f71c01a)
core/java/android/database/sqlite/SQLiteQueryBuilder.java