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>
Wed, 15 Aug 2018 20:28:35 +0000 (13:28 -0700)
commit9697a2f7d0d88f113faff0fa1cf5fcf2ccf1101c
tree27afd900d11e26591598d31f9ee0e07dec7a256b
parent49419138ef2bd3049eeb4b94a6868647e22fb938
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 57b04a86802ff879af78e782a8582462323e34e7)
core/java/android/database/sqlite/SQLiteQueryBuilder.java