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)
committerRyan Longair <rlongair@google.com>
Thu, 30 Aug 2018 20:34:10 +0000 (13:34 -0700)
commitd71b1163dd048625f39926af563aaf5223effa47
tree5145d8007e46bfabb26fc610bdde176e4da71516
parent3d7caf5ae695b7994696a2e1fdf21ee438d94a91
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 286fd5652a9804bfd185980dc07ad239e1169929)
core/java/android/database/sqlite/SQLiteQueryBuilder.java