Skip to content

SQLite: cap trigger recursion for WebAssembly stacks #781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brandonpayton wants to merge 1 commit into from
Closed

SQLite: cap trigger recursion for WebAssembly stacks #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions docs/porting-guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,10 +785,12 @@ bash packages/registry/sqlite/build-testfixture.sh
```

Kandelo builds both the shipped SQLite library and the official testfixture
with compound-select, expression, and JSON recursion limits that fit current
browser and Node WebAssembly host stacks. The testfixture patch set reads those
compiled limits and omits only upstream stress cases that deliberately exceed
them; it does not turn platform failures into successful SQLite results.
with compound-select, expression, JSON, and trigger recursion limits that fit
current browser and Node WebAssembly host stacks. The testfixture patch set
reads those compiled limits and omits only upstream stress cases that
deliberately exceed them; it does not turn platform failures into successful
SQLite results. The `sqllimits1.test` SQL-length filler stays comment-only so
the length-limit check does not hit the lower expression-depth limit first.

Then run the harness:

Expand Down
2 changes: 2 additions & 0 deletions packages/registry/sqlite/build-sqlite.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ SOURCE_SHA256="${WASM_POSIX_DEP_SOURCE_SHA256:-}"
SQLITE_MAX_COMPOUND_SELECT="${SQLITE_MAX_COMPOUND_SELECT:-50}"
SQLITE_MAX_EXPR_DEPTH="${SQLITE_MAX_EXPR_DEPTH:-100}"
SQLITE_JSON_MAX_DEPTH="${SQLITE_JSON_MAX_DEPTH:-100}"
SQLITE_MAX_TRIGGER_DEPTH="${SQLITE_MAX_TRIGGER_DEPTH:-50}"

# CLI is a consumer artifact, not a library. Skip it when invoked via
# the resolver — it would waste cache space and the consumer-side
Expand Down Expand Up @@ -68,6 +69,7 @@ SQLITE_CFLAGS="-O2 \
-DSQLITE_MAX_COMPOUND_SELECT=$SQLITE_MAX_COMPOUND_SELECT \
-DSQLITE_MAX_EXPR_DEPTH=$SQLITE_MAX_EXPR_DEPTH \
-DSQLITE_JSON_MAX_DEPTH=$SQLITE_JSON_MAX_DEPTH \
-DSQLITE_MAX_TRIGGER_DEPTH=$SQLITE_MAX_TRIGGER_DEPTH \
-DHAVE_PREAD=1 \
-DHAVE_PWRITE=1 \
-DSQLITE_ENABLE_FTS5 \
Expand Down
2 changes: 2 additions & 0 deletions packages/registry/sqlite/build-testfixture.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ SQLITE_VERSION="${SQLITE_VERSION:-3.49.1}"
SQLITE_MAX_COMPOUND_SELECT="${SQLITE_MAX_COMPOUND_SELECT:-50}"
SQLITE_MAX_EXPR_DEPTH="${SQLITE_MAX_EXPR_DEPTH:-100}"
SQLITE_JSON_MAX_DEPTH="${SQLITE_JSON_MAX_DEPTH:-100}"
SQLITE_MAX_TRIGGER_DEPTH="${SQLITE_MAX_TRIGGER_DEPTH:-50}"

sqlite_packed_version() {
local major minor patch
Expand Down Expand Up @@ -120,6 +121,7 @@ CFLAGS=(
-DSQLITE_MAX_COMPOUND_SELECT="$SQLITE_MAX_COMPOUND_SELECT"
-DSQLITE_MAX_EXPR_DEPTH="$SQLITE_MAX_EXPR_DEPTH"
-DSQLITE_JSON_MAX_DEPTH="$SQLITE_JSON_MAX_DEPTH"
-DSQLITE_MAX_TRIGGER_DEPTH="$SQLITE_MAX_TRIGGER_DEPTH"
-DHAVE_PREAD=1
-DHAVE_PWRITE=1
-DSQLITE_OMIT_LOAD_EXTENSION
Expand Down
2 changes: 1 addition & 1 deletion packages/registry/sqlite/build.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
script_path = "packages/registry/sqlite/build-sqlite.sh"
repo_url = "https://github.com/brandonpayton/kandelo.git"
commit = "8c53383229fab78f97b098c3207a655159c03041"
revision = 3
revision = 4

[binary]
index_url = "https://github.com/Automattic/kandelo/releases/download/binaries-abi-v{abi}/index.toml"
22 changes: 22 additions & 0 deletions packages/registry/sqlite/patches/0005-sqllimits1-keep-sql-length-filler-comment-only.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--- test/sqllimits1.test
+++ test/sqllimits1.test
@@ -429,8 +429,7 @@ do_test sqllimits1-6.1 {
sqlite3_limit db SQLITE_LIMIT_SQL_LENGTH 50000
set sql "SELECT 1 WHERE 1==1"
set tail " /* A comment to take up space in order to make the string\
- longer without increasing the expression depth */\
- AND 1 == 1"
+ longer without increasing the expression depth */ "
set N [expr {(50000 / [string length $tail])+1}]
append sql [string repeat $tail $N]
catchsql $sql
@@ -439,8 +438,7 @@ do_test sqllimits1-6.3 {
sqlite3_limit db SQLITE_LIMIT_SQL_LENGTH 50000
set sql "SELECT 1 WHERE 1==1"
set tail " /* A comment to take up space in order to make the string\
- longer without increasing the expression depth */\
- AND 1 == 1"
+ longer without increasing the expression depth */ "
set N [expr {(50000 / [string length $tail])+1}]
append sql [string repeat $tail $N]
set nbytes [string length $sql]
Loading