sqlite: reject reentry into a running statement#65106

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
TrevorBurnham wants to merge 1 commit into from
+277 −0
Closed

sqlite: reject reentry into a running statement #65106

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
34 changes: 34 additions & 0 deletions src/node_sqlite.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2661,12 +2661,17 @@ void StatementSync::Close(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(
env, stmt->IsFinalized(), "statement has been finalized");
THROW_AND_RETURN_ON_BAD_STATE(
env, stmt->IsStepping(), "statement is currently being executed");
stmt->Close();
}

void StatementSync::Dispose(const FunctionCallbackInfo<Value>& args) {
StatementSync* stmt;
ASSIGN_OR_RETURN_UNWRAP(&stmt, args.This());
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(
env, stmt->IsStepping(), "statement is currently being executed");
stmt->Close();
}

Expand DownExpand Up@@ -3111,7 +3116,10 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(
env, stmt->IsFinalized(), "statement has been finalized");
THROW_AND_RETURN_ON_BAD_STATE(
env, stmt->IsStepping(), "statement is currently being executed");
Isolate* isolate = env->isolate();
auto stepping = stmt->MarkStepping();
int r = stmt->ResetStatement();
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3138,6 +3146,9 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(
env, stmt->IsFinalized(), "statement has been finalized");
THROW_AND_RETURN_ON_BAD_STATE(
env, stmt->IsStepping(), "statement is currently being executed");
auto stepping = stmt->MarkStepping();
int r = stmt->ResetStatement();
Comment thread
TrevorBurnham marked this conversation as resolved.
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3161,6 +3172,9 @@ void StatementSync::Get(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(
env, stmt->IsFinalized(), "statement has been finalized");
THROW_AND_RETURN_ON_BAD_STATE(
env, stmt->IsStepping(), "statement is currently being executed");
auto stepping = stmt->MarkStepping();
int r = stmt->ResetStatement();
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3185,6 +3199,9 @@ void StatementSync::Run(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(
env, stmt->IsFinalized(), "statement has been finalized");
THROW_AND_RETURN_ON_BAD_STATE(
env, stmt->IsStepping(), "statement is currently being executed");
auto stepping = stmt->MarkStepping();
int r = stmt->ResetStatement();
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand DownExpand Up@@ -3474,6 +3491,9 @@ void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
return;
}

THROW_AND_RETURN_ON_BAD_STATE(
env, stmt->IsStepping(), "statement is currently being executed");
auto stepping = stmt->MarkStepping();
if (!ResetAndBindStatement(env, stmt.get(), args)) {
return;
}
Expand All@@ -3500,6 +3520,9 @@ void SQLTagStore::Iterate(const FunctionCallbackInfo<Value>& args) {
return;
}

THROW_AND_RETURN_ON_BAD_STATE(
env, stmt->IsStepping(), "statement is currently being executed");
auto stepping = stmt->MarkStepping();
if (!ResetAndBindStatement(env, stmt.get(), args)) {
return;
}
Expand DownExpand Up@@ -3528,6 +3551,9 @@ void SQLTagStore::Get(const FunctionCallbackInfo<Value>& args) {
return;
}

THROW_AND_RETURN_ON_BAD_STATE(
env, stmt->IsStepping(), "statement is currently being executed");
auto stepping = stmt->MarkStepping();
if (!ResetAndBindStatement(env, stmt.get(), args)) {
return;
}
Expand DownExpand Up@@ -3557,6 +3583,9 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
return;
}

THROW_AND_RETURN_ON_BAD_STATE(
env, stmt->IsStepping(), "statement is currently being executed");
auto stepping = stmt->MarkStepping();
if (!ResetAndBindStatement(env, stmt.get(), args)) {
return;
}
Expand DownExpand Up@@ -3769,6 +3798,8 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(
env, iter->stmt_->IsFinalized(), "statement has been finalized");
THROW_AND_RETURN_ON_BAD_STATE(
env, iter->stmt_->IsStepping(), "statement is currently being executed");
Isolate* isolate = env->isolate();

auto iter_template = getLazyIterTemplate(env);
Expand All@@ -3791,6 +3822,7 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
iter->statement_reset_generation_ != iter->stmt_->reset_generation_,
"iterator was invalidated");

auto stepping = iter->stmt_->MarkStepping();
int r = sqlite3_step(iter->stmt_->statement_);
if (r != SQLITE_ROW) {
CHECK_ERROR_OR_THROW(
Expand DownExpand Up@@ -3846,6 +3878,8 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(
env, iter->stmt_->IsFinalized(), "statement has been finalized");
THROW_AND_RETURN_ON_BAD_STATE(
env, iter->stmt_->IsStepping(), "statement is currently being executed");
Isolate* isolate = env->isolate();

sqlite3_reset(iter->stmt_->statement_);
Expand Down
14 changes: 14 additions & 0 deletions src/node_sqlite.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,19 @@ class StatementSync : public BaseObject {
bool GetCachedColumnNames(v8::LocalVector<v8::Name>* keys);
void Finalize();
bool IsFinalized();
bool IsStepping() const { return stepping_; }

// SQLite forbids stepping, resetting, or finalizing a statement while that
// same statement's user-defined function callback is on the stack. The
// callback depth tracked by DatabaseSync is per-database, so it cannot
// distinguish reentry into the running statement from the common pattern of
// querying a *different* statement from a callback. This flag marks the
// statement that is currently being stepped so that only the former is
// rejected.
inline auto MarkStepping() {
stepping_ = true;
return OnScopeLeave([this]() { stepping_ = false; });
}

SET_MEMORY_INFO_NAME(StatementSync)
SET_SELF_SIZE(StatementSync)
Expand All@@ -304,6 +317,7 @@ class StatementSync : public BaseObject {
bool use_big_ints_;
bool allow_bare_named_params_;
bool allow_unknown_named_params_;
bool stepping_ = false;
uint64_t reset_generation_ = 0;
std::optional<std::map<std::string, std::string>> bare_named_params_;
inline int ResetStatement();
Expand Down
229 changes: 229 additions & 0 deletions test/parallel/test-sqlite-udf-statement-reentry.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,229 @@
'use strict';

const { skipIfSQLiteMissing, mustCall } = require('../common');
skipIfSQLiteMissing();
const assert = require('node:assert');
const { suite, test } = require('node:test');
const { DatabaseSync } = require('node:sqlite');

const reentryError = {
code: 'ERR_INVALID_STATE',
message: 'statement is currently being executed',
};

function newDbWithRows() {
const db = new DatabaseSync(':memory:');
db.exec(`
CREATE TABLE data (value INTEGER);
INSERT INTO data VALUES (1), (2), (3);
`);
return db;
}

suite('reentry into the running statement is rejected', () => {
for (const method of ['all', 'get', 'run']) {
test(`statement.${method}() from its own UDF`, () => {
const db = newDbWithRows();
let statement;
db.function('reenter', mustCall((value) => {
assert.throws(() => statement[method](), reentryError);
return value;
}));

statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
assert.strictEqual(db.isOpen, true);
});
}

Comment thread
TrevorBurnham marked this conversation as resolved.
test('iterator next() from its own UDF', () => {
const db = newDbWithRows();
let iterator;
db.function('reenter', mustCall((value) => {
assert.throws(() => iterator.next(), reentryError);
return value;
}, 3));

iterator = db.prepare('SELECT reenter(value) AS value FROM data').iterate();
assert.deepStrictEqual([...iterator].map((row) => row.value), [1, 2, 3]);
assert.strictEqual(db.isOpen, true);
});

test('iterator return() from its own UDF', () => {
const db = newDbWithRows();
let iterator;
db.function('reenter', mustCall((value) => {
assert.throws(() => iterator.return(), reentryError);
return value;
}));

iterator = db.prepare('SELECT reenter(value) AS value FROM data').iterate();
assert.strictEqual(iterator.next().done, false);
iterator.return();
assert.strictEqual(db.isOpen, true);
});

test(
'recursive get() reports the reentry rather than overflowing the stack',
() => {
const db = new DatabaseSync(':memory:');
let statement;
db.function('reenter', mustCall(() => {
assert.throws(() => statement.get(), reentryError);
return 1;
}));

statement = db.prepare('SELECT reenter() AS value');
assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
});

for (const method of ['all', 'get', 'run', 'iterate']) {
test(`${method}() reentry during parameter binding is rejected`, () => {
const db = newDbWithRows();
let statement;
const invoke = (params) => (method === 'iterate' ?
[...statement.iterate(params)] :
statement[method](params));
const reenter = mustCall(() => {
assert.throws(() => invoke({ $min: 2 }), reentryError);
return 1;
});
const params = { get $min() { return reenter(); } };

statement = db.prepare('SELECT value FROM data WHERE value >= $min');
invoke(params);
});
}
Comment thread
TrevorBurnham marked this conversation as resolved.

test('statement.close() from its own UDF', () => {
const db = newDbWithRows();
let statement;
db.function('reenter', mustCall((value) => {
assert.throws(() => statement.close(), reentryError);
return value;
}));

statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
statement.close();
});

test('statement[Symbol.dispose]() from its own UDF', () => {
const db = newDbWithRows();
let statement;
db.function('reenter', mustCall((value) => {
assert.throws(() => statement[Symbol.dispose](), reentryError);
return value;
}));

statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
statement[Symbol.dispose]();
});

test('statement is usable again after the callback returns', () => {
const db = newDbWithRows();
let statement;
db.function('reenter', mustCall((value) => {
assert.throws(() => statement.all(), reentryError);
return value;
}, 2));

statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
assert.deepStrictEqual(statement.all(), [{ __proto__: null, value: 1 }]);
assert.deepStrictEqual(statement.all(), [{ __proto__: null, value: 1 }]);
});
});

suite('a different statement remains usable from a callback', () => {
test('the lookup pattern still works', () => {
const db = newDbWithRows();
db.exec('CREATE TABLE names (value INTEGER, name TEXT);' +
"INSERT INTO names VALUES (1, 'one'), (2, 'two'), (3, 'three');");
const lookup = db.prepare('SELECT name FROM names WHERE value = ?');

db.function('name_of', mustCall((value) => lookup.get(value).name, 3));

assert.deepStrictEqual(
db.prepare('SELECT name_of(value) AS name FROM data').all(),
[
{ __proto__: null, name: 'one' },
{ __proto__: null, name: 'two' },
{ __proto__: null, name: 'three' },
],
);
});

test('a nested iterator over a different statement still works', () => {
const db = newDbWithRows();
const inner = db.prepare('SELECT value FROM data');

db.function('sum_all', mustCall(() => {
let total = 0;
for (const row of inner.iterate()) {
total += row.value;
}
return total;
}));

assert.deepStrictEqual(
db.prepare('SELECT sum_all() AS total LIMIT 1').get(),
{ __proto__: null, total: 6 },
);
});
});

suite('SQL tag store reentry is rejected', () => {
for (const method of ['all', 'get', 'run']) {
test(`tag store ${method} re-executing the same tag`, () => {
const db = newDbWithRows();
const sql = db.createTagStore(4);
db.function('reenter', mustCall((value) => {
assert.throws(
() => sql[method]`SELECT reenter(value) AS value FROM data LIMIT 1`,
reentryError,
);
return value;
}));

assert.deepStrictEqual(
sql.get`SELECT reenter(value) AS value FROM data LIMIT 1`,
{ __proto__: null, value: 1 },
);
assert.strictEqual(db.isOpen, true);
});
}
});

suite('aggregate functions', () => {
test('reentry from an aggregate step is rejected', () => {
const db = newDbWithRows();
let statement;
db.aggregate('reenter_agg', {
start: 0,
step: mustCall((total, value) => {
assert.throws(() => statement.get(), reentryError);
return total + value;
}, 3),
});

statement = db.prepare('SELECT reenter_agg(value) AS total FROM data');
assert.deepStrictEqual(statement.get(), { __proto__: null, total: 6 });
});

test('reentry from an aggregate result is rejected', () => {
const db = newDbWithRows();
let statement;
db.aggregate('reenter_result', {
start: 0,
step: (total, value) => total + value,
result: mustCall((total) => {
assert.throws(() => statement.get(), reentryError);
return total;
}),
});

statement = db.prepare('SELECT reenter_result(value) AS total FROM data');
assert.deepStrictEqual(statement.get(), { __proto__: null, total: 6 });
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
sqlite: reject reentry into a running statement#65106

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

TrevorBurnham
wants to merge
1
commit into

from


+277

−0

 Closed


sqlite: reject reentry into a running statement
#65106
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


34 changes: 34 additions & 0 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2661,12 +2661,17 @@ void StatementSync::Close(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 stmt->Close();
}

void StatementSync::Dispose(const FunctionCallbackInfo<Value>& args) {
 StatementSync* stmt;
 ASSIGN_OR_RETURN_UNWRAP(&stmt, args.This());
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 stmt->Close();
}

Expand DownExpand Up@@ -3111,7 +3116,10 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3138,6 +3146,9 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
Comment thread
TrevorBurnham marked this conversation as resolved.

 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3161,6 +3172,9 @@ void StatementSync::Get(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3185,6 +3199,9 @@ void StatementSync::Run(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand DownExpand Up@@ -3474,6 +3491,9 @@ void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand All@@ -3500,6 +3520,9 @@ void SQLTagStore::Iterate(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3528,6 +3551,9 @@ void SQLTagStore::Get(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3557,6 +3583,9 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3769,6 +3798,8 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();

 auto iter_template = getLazyIterTemplate(env);
Expand All@@ -3791,6 +3822,7 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 iter->statement_reset_generation_ != iter->stmt_->reset_generation_,
 "iterator was invalidated");

 auto stepping = iter->stmt_->MarkStepping();
 int r = sqlite3_step(iter->stmt_->statement_);
 if (r != SQLITE_ROW) {
 CHECK_ERROR_OR_THROW(
Expand DownExpand Up@@ -3846,6 +3878,8 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();

 sqlite3_reset(iter->stmt_->statement_);
Expand Down

14 changes: 14 additions & 0 deletions
src/node_sqlite.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,19 @@ class StatementSync : public BaseObject {
 bool GetCachedColumnNames(v8::LocalVector<v8::Name>* keys);
 void Finalize();
 bool IsFinalized();
 bool IsStepping() const { return stepping_; }

 // SQLite forbids stepping, resetting, or finalizing a statement while that
 // same statement's user-defined function callback is on the stack. The
 // callback depth tracked by DatabaseSync is per-database, so it cannot
 // distinguish reentry into the running statement from the common pattern of
 // querying a *different* statement from a callback. This flag marks the
 // statement that is currently being stepped so that only the former is
 // rejected.
 inline auto MarkStepping() {
 stepping_ = true;
 return OnScopeLeave([this]() { stepping_ = false; });
 }

 SET_MEMORY_INFO_NAME(StatementSync)
 SET_SELF_SIZE(StatementSync)
Expand All@@ -304,6 +317,7 @@ class StatementSync : public BaseObject {
 bool use_big_ints_;
 bool allow_bare_named_params_;
 bool allow_unknown_named_params_;
 bool stepping_ = false;
 uint64_t reset_generation_ = 0;
 std::optional<std::map<std::string, std::string>> bare_named_params_;
 inline int ResetStatement();
Expand Down

229 changes: 229 additions & 0 deletions
test/parallel/test-sqlite-udf-statement-reentry.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,229 @@
'use strict';

const { skipIfSQLiteMissing, mustCall } = require('../common');
skipIfSQLiteMissing();
const assert = require('node:assert');
const { suite, test } = require('node:test');
const { DatabaseSync } = require('node:sqlite');

const reentryError = {
 code: 'ERR_INVALID_STATE',
 message: 'statement is currently being executed',
};

function newDbWithRows() {
 const db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE data (value INTEGER);
 INSERT INTO data VALUES (1), (2), (3);
 `);
 return db;
}

suite('reentry into the running statement is rejected', () => {
 for (const method of ['all', 'get', 'run']) {
 test(`statement.${method}() from its own UDF`, () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement[method](), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 assert.strictEqual(db.isOpen, true);
 });
 }

Comment thread
TrevorBurnham marked this conversation as resolved.

 test('iterator next() from its own UDF', () => {
 const db = newDbWithRows();
 let iterator;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => iterator.next(), reentryError);
 return value;
 }, 3));

 iterator = db.prepare('SELECT reenter(value) AS value FROM data').iterate();
 assert.deepStrictEqual([...iterator].map((row) => row.value), [1, 2, 3]);
 assert.strictEqual(db.isOpen, true);
 });

 test('iterator return() from its own UDF', () => {
 const db = newDbWithRows();
 let iterator;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => iterator.return(), reentryError);
 return value;
 }));

 iterator = db.prepare('SELECT reenter(value) AS value FROM data').iterate();
 assert.strictEqual(iterator.next().done, false);
 iterator.return();
 assert.strictEqual(db.isOpen, true);
 });

 test(
 'recursive get() reports the reentry rather than overflowing the stack',
 () => {
 const db = new DatabaseSync(':memory:');
 let statement;
 db.function('reenter', mustCall(() => {
 assert.throws(() => statement.get(), reentryError);
 return 1;
 }));

 statement = db.prepare('SELECT reenter() AS value');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 });

 for (const method of ['all', 'get', 'run', 'iterate']) {
 test(`${method}() reentry during parameter binding is rejected`, () => {
 const db = newDbWithRows();
 let statement;
 const invoke = (params) => (method === 'iterate' ?
 [...statement.iterate(params)] :
 statement[method](params));
 const reenter = mustCall(() => {
 assert.throws(() => invoke({ $min: 2 }), reentryError);
 return 1;
 });
 const params = { get $min() { return reenter(); } };

 statement = db.prepare('SELECT value FROM data WHERE value >= $min');
 invoke(params);
 });
 }
Comment thread
TrevorBurnham marked this conversation as resolved.


 test('statement.close() from its own UDF', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement.close(), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 statement.close();
 });

 test('statement[Symbol.dispose]() from its own UDF', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement[Symbol.dispose](), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 statement[Symbol.dispose]();
 });

 test('statement is usable again after the callback returns', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement.all(), reentryError);
 return value;
 }, 2));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.all(), [{ __proto__: null, value: 1 }]);
 assert.deepStrictEqual(statement.all(), [{ __proto__: null, value: 1 }]);
 });
});

suite('a different statement remains usable from a callback', () => {
 test('the lookup pattern still works', () => {
 const db = newDbWithRows();
 db.exec('CREATE TABLE names (value INTEGER, name TEXT);' +
 "INSERT INTO names VALUES (1, 'one'), (2, 'two'), (3, 'three');");
 const lookup = db.prepare('SELECT name FROM names WHERE value = ?');

 db.function('name_of', mustCall((value) => lookup.get(value).name, 3));

 assert.deepStrictEqual(
 db.prepare('SELECT name_of(value) AS name FROM data').all(),
 [
 { __proto__: null, name: 'one' },
 { __proto__: null, name: 'two' },
 { __proto__: null, name: 'three' },
 ],
 );
 });

 test('a nested iterator over a different statement still works', () => {
 const db = newDbWithRows();
 const inner = db.prepare('SELECT value FROM data');

 db.function('sum_all', mustCall(() => {
 let total = 0;
 for (const row of inner.iterate()) {
 total += row.value;
 }
 return total;
 }));

 assert.deepStrictEqual(
 db.prepare('SELECT sum_all() AS total LIMIT 1').get(),
 { __proto__: null, total: 6 },
 );
 });
});

suite('SQL tag store reentry is rejected', () => {
 for (const method of ['all', 'get', 'run']) {
 test(`tag store ${method} re-executing the same tag`, () => {
 const db = newDbWithRows();
 const sql = db.createTagStore(4);
 db.function('reenter', mustCall((value) => {
 assert.throws(
 () => sql[method]`SELECT reenter(value) AS value FROM data LIMIT 1`,
 reentryError,
 );
 return value;
 }));

 assert.deepStrictEqual(
 sql.get`SELECT reenter(value) AS value FROM data LIMIT 1`,
 { __proto__: null, value: 1 },
 );
 assert.strictEqual(db.isOpen, true);
 });
 }
});

suite('aggregate functions', () => {
 test('reentry from an aggregate step is rejected', () => {
 const db = newDbWithRows();
 let statement;
 db.aggregate('reenter_agg', {
 start: 0,
 step: mustCall((total, value) => {
 assert.throws(() => statement.get(), reentryError);
 return total + value;
 }, 3),
 });

 statement = db.prepare('SELECT reenter_agg(value) AS total FROM data');
 assert.deepStrictEqual(statement.get(), { __proto__: null, total: 6 });
 });

 test('reentry from an aggregate result is rejected', () => {
 const db = newDbWithRows();
 let statement;
 db.aggregate('reenter_result', {
 start: 0,
 step: (total, value) => total + value,
 result: mustCall((total) => {
 assert.throws(() => statement.get(), reentryError);
 return total;
 }),
 });

 statement = db.prepare('SELECT reenter_result(value) AS total FROM data');
 assert.deepStrictEqual(statement.get(), { __proto__: null, total: 6 });
 });
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
sqlite: reject reentry into a running statement#65106

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

TrevorBurnham
wants to merge
1
commit into

from


+277

−0

 Closed


sqlite: reject reentry into a running statement
#65106
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


34 changes: 34 additions & 0 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2661,12 +2661,17 @@ void StatementSync::Close(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 stmt->Close();
}

void StatementSync::Dispose(const FunctionCallbackInfo<Value>& args) {
 StatementSync* stmt;
 ASSIGN_OR_RETURN_UNWRAP(&stmt, args.This());
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 stmt->Close();
}

Expand DownExpand Up@@ -3111,7 +3116,10 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3138,6 +3146,9 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
Comment thread
TrevorBurnham marked this conversation as resolved.

 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3161,6 +3172,9 @@ void StatementSync::Get(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3185,6 +3199,9 @@ void StatementSync::Run(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand DownExpand Up@@ -3474,6 +3491,9 @@ void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand All@@ -3500,6 +3520,9 @@ void SQLTagStore::Iterate(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3528,6 +3551,9 @@ void SQLTagStore::Get(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3557,6 +3583,9 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3769,6 +3798,8 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();

 auto iter_template = getLazyIterTemplate(env);
Expand All@@ -3791,6 +3822,7 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 iter->statement_reset_generation_ != iter->stmt_->reset_generation_,
 "iterator was invalidated");

 auto stepping = iter->stmt_->MarkStepping();
 int r = sqlite3_step(iter->stmt_->statement_);
 if (r != SQLITE_ROW) {
 CHECK_ERROR_OR_THROW(
Expand DownExpand Up@@ -3846,6 +3878,8 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();

 sqlite3_reset(iter->stmt_->statement_);
Expand Down

14 changes: 14 additions & 0 deletions
src/node_sqlite.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,19 @@ class StatementSync : public BaseObject {
 bool GetCachedColumnNames(v8::LocalVector<v8::Name>* keys);
 void Finalize();
 bool IsFinalized();
 bool IsStepping() const { return stepping_; }

 // SQLite forbids stepping, resetting, or finalizing a statement while that
 // same statement's user-defined function callback is on the stack. The
 // callback depth tracked by DatabaseSync is per-database, so it cannot
 // distinguish reentry into the running statement from the common pattern of
 // querying a *different* statement from a callback. This flag marks the
 // statement that is currently being stepped so that only the former is
 // rejected.
 inline auto MarkStepping() {
 stepping_ = true;
 return OnScopeLeave([this]() { stepping_ = false; });
 }

 SET_MEMORY_INFO_NAME(StatementSync)
 SET_SELF_SIZE(StatementSync)
Expand All@@ -304,6 +317,7 @@ class StatementSync : public BaseObject {
 bool use_big_ints_;
 bool allow_bare_named_params_;
 bool allow_unknown_named_params_;
 bool stepping_ = false;
 uint64_t reset_generation_ = 0;
 std::optional<std::map<std::string, std::string>> bare_named_params_;
 inline int ResetStatement();
Expand Down

229 changes: 229 additions & 0 deletions
test/parallel/test-sqlite-udf-statement-reentry.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,229 @@
'use strict';

const { skipIfSQLiteMissing, mustCall } = require('../common');
skipIfSQLiteMissing();
const assert = require('node:assert');
const { suite, test } = require('node:test');
const { DatabaseSync } = require('node:sqlite');

const reentryError = {
 code: 'ERR_INVALID_STATE',
 message: 'statement is currently being executed',
};

function newDbWithRows() {
 const db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE data (value INTEGER);
 INSERT INTO data VALUES (1), (2), (3);
 `);
 return db;
}

suite('reentry into the running statement is rejected', () => {
 for (const method of ['all', 'get', 'run']) {
 test(`statement.${method}() from its own UDF`, () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement[method](), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 assert.strictEqual(db.isOpen, true);
 });
 }

Comment thread
TrevorBurnham marked this conversation as resolved.

 test('iterator next() from its own UDF', () => {
 const db = newDbWithRows();
 let iterator;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => iterator.next(), reentryError);
 return value;
 }, 3));

 iterator = db.prepare('SELECT reenter(value) AS value FROM data').iterate();
 assert.deepStrictEqual([...iterator].map((row) => row.value), [1, 2, 3]);
 assert.strictEqual(db.isOpen, true);
 });

 test('iterator return() from its own UDF', () => {
 const db = newDbWithRows();
 let iterator;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => iterator.return(), reentryError);
 return value;
 }));

 iterator = db.prepare('SELECT reenter(value) AS value FROM data').iterate();
 assert.strictEqual(iterator.next().done, false);
 iterator.return();
 assert.strictEqual(db.isOpen, true);
 });

 test(
 'recursive get() reports the reentry rather than overflowing the stack',
 () => {
 const db = new DatabaseSync(':memory:');
 let statement;
 db.function('reenter', mustCall(() => {
 assert.throws(() => statement.get(), reentryError);
 return 1;
 }));

 statement = db.prepare('SELECT reenter() AS value');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 });

 for (const method of ['all', 'get', 'run', 'iterate']) {
 test(`${method}() reentry during parameter binding is rejected`, () => {
 const db = newDbWithRows();
 let statement;
 const invoke = (params) => (method === 'iterate' ?
 [...statement.iterate(params)] :
 statement[method](params));
 const reenter = mustCall(() => {
 assert.throws(() => invoke({ $min: 2 }), reentryError);
 return 1;
 });
 const params = { get $min() { return reenter(); } };

 statement = db.prepare('SELECT value FROM data WHERE value >= $min');
 invoke(params);
 });
 }
Comment thread
TrevorBurnham marked this conversation as resolved.


 test('statement.close() from its own UDF', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement.close(), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 statement.close();
 });

 test('statement[Symbol.dispose]() from its own UDF', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement[Symbol.dispose](), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 statement[Symbol.dispose]();
 });

 test('statement is usable again after the callback returns', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement.all(), reentryError);
 return value;
 }, 2));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.all(), [{ __proto__: null, value: 1 }]);
 assert.deepStrictEqual(statement.all(), [{ __proto__: null, value: 1 }]);
 });
});

suite('a different statement remains usable from a callback', () => {
 test('the lookup pattern still works', () => {
 const db = newDbWithRows();
 db.exec('CREATE TABLE names (value INTEGER, name TEXT);' +
 "INSERT INTO names VALUES (1, 'one'), (2, 'two'), (3, 'three');");
 const lookup = db.prepare('SELECT name FROM names WHERE value = ?');

 db.function('name_of', mustCall((value) => lookup.get(value).name, 3));

 assert.deepStrictEqual(
 db.prepare('SELECT name_of(value) AS name FROM data').all(),
 [
 { __proto__: null, name: 'one' },
 { __proto__: null, name: 'two' },
 { __proto__: null, name: 'three' },
 ],
 );
 });

 test('a nested iterator over a different statement still works', () => {
 const db = newDbWithRows();
 const inner = db.prepare('SELECT value FROM data');

 db.function('sum_all', mustCall(() => {
 let total = 0;
 for (const row of inner.iterate()) {
 total += row.value;
 }
 return total;
 }));

 assert.deepStrictEqual(
 db.prepare('SELECT sum_all() AS total LIMIT 1').get(),
 { __proto__: null, total: 6 },
 );
 });
});

suite('SQL tag store reentry is rejected', () => {
 for (const method of ['all', 'get', 'run']) {
 test(`tag store ${method} re-executing the same tag`, () => {
 const db = newDbWithRows();
 const sql = db.createTagStore(4);
 db.function('reenter', mustCall((value) => {
 assert.throws(
 () => sql[method]`SELECT reenter(value) AS value FROM data LIMIT 1`,
 reentryError,
 );
 return value;
 }));

 assert.deepStrictEqual(
 sql.get`SELECT reenter(value) AS value FROM data LIMIT 1`,
 { __proto__: null, value: 1 },
 );
 assert.strictEqual(db.isOpen, true);
 });
 }
});

suite('aggregate functions', () => {
 test('reentry from an aggregate step is rejected', () => {
 const db = newDbWithRows();
 let statement;
 db.aggregate('reenter_agg', {
 start: 0,
 step: mustCall((total, value) => {
 assert.throws(() => statement.get(), reentryError);
 return total + value;
 }, 3),
 });

 statement = db.prepare('SELECT reenter_agg(value) AS total FROM data');
 assert.deepStrictEqual(statement.get(), { __proto__: null, total: 6 });
 });

 test('reentry from an aggregate result is rejected', () => {
 const db = newDbWithRows();
 let statement;
 db.aggregate('reenter_result', {
 start: 0,
 step: (total, value) => total + value,
 result: mustCall((total) => {
 assert.throws(() => statement.get(), reentryError);
 return total;
 }),
 });

 statement = db.prepare('SELECT reenter_result(value) AS total FROM data');
 assert.deepStrictEqual(statement.get(), { __proto__: null, total: 6 });
 });
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
sqlite: reject reentry into a running statement#65106

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

TrevorBurnham
wants to merge
1
commit into

from


+277

−0

 Closed


sqlite: reject reentry into a running statement
#65106
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


34 changes: 34 additions & 0 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2661,12 +2661,17 @@ void StatementSync::Close(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 stmt->Close();
}

void StatementSync::Dispose(const FunctionCallbackInfo<Value>& args) {
 StatementSync* stmt;
 ASSIGN_OR_RETURN_UNWRAP(&stmt, args.This());
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 stmt->Close();
}

Expand DownExpand Up@@ -3111,7 +3116,10 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3138,6 +3146,9 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
Comment thread
TrevorBurnham marked this conversation as resolved.

 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3161,6 +3172,9 @@ void StatementSync::Get(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3185,6 +3199,9 @@ void StatementSync::Run(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand DownExpand Up@@ -3474,6 +3491,9 @@ void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand All@@ -3500,6 +3520,9 @@ void SQLTagStore::Iterate(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3528,6 +3551,9 @@ void SQLTagStore::Get(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3557,6 +3583,9 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3769,6 +3798,8 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();

 auto iter_template = getLazyIterTemplate(env);
Expand All@@ -3791,6 +3822,7 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 iter->statement_reset_generation_ != iter->stmt_->reset_generation_,
 "iterator was invalidated");

 auto stepping = iter->stmt_->MarkStepping();
 int r = sqlite3_step(iter->stmt_->statement_);
 if (r != SQLITE_ROW) {
 CHECK_ERROR_OR_THROW(
Expand DownExpand Up@@ -3846,6 +3878,8 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();

 sqlite3_reset(iter->stmt_->statement_);
Expand Down

14 changes: 14 additions & 0 deletions
src/node_sqlite.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,19 @@ class StatementSync : public BaseObject {
 bool GetCachedColumnNames(v8::LocalVector<v8::Name>* keys);
 void Finalize();
 bool IsFinalized();
 bool IsStepping() const { return stepping_; }

 // SQLite forbids stepping, resetting, or finalizing a statement while that
 // same statement's user-defined function callback is on the stack. The
 // callback depth tracked by DatabaseSync is per-database, so it cannot
 // distinguish reentry into the running statement from the common pattern of
 // querying a *different* statement from a callback. This flag marks the
 // statement that is currently being stepped so that only the former is
 // rejected.
 inline auto MarkStepping() {
 stepping_ = true;
 return OnScopeLeave([this]() { stepping_ = false; });
 }

 SET_MEMORY_INFO_NAME(StatementSync)
 SET_SELF_SIZE(StatementSync)
Expand All@@ -304,6 +317,7 @@ class StatementSync : public BaseObject {
 bool use_big_ints_;
 bool allow_bare_named_params_;
 bool allow_unknown_named_params_;
 bool stepping_ = false;
 uint64_t reset_generation_ = 0;
 std::optional<std::map<std::string, std::string>> bare_named_params_;
 inline int ResetStatement();
Expand Down

229 changes: 229 additions & 0 deletions
test/parallel/test-sqlite-udf-statement-reentry.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,229 @@
'use strict';

const { skipIfSQLiteMissing, mustCall } = require('../common');
skipIfSQLiteMissing();
const assert = require('node:assert');
const { suite, test } = require('node:test');
const { DatabaseSync } = require('node:sqlite');

const reentryError = {
 code: 'ERR_INVALID_STATE',
 message: 'statement is currently being executed',
};

function newDbWithRows() {
 const db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE data (value INTEGER);
 INSERT INTO data VALUES (1), (2), (3);
 `);
 return db;
}

suite('reentry into the running statement is rejected', () => {
 for (const method of ['all', 'get', 'run']) {
 test(`statement.${method}() from its own UDF`, () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement[method](), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 assert.strictEqual(db.isOpen, true);
 });
 }

Comment thread
TrevorBurnham marked this conversation as resolved.

 test('iterator next() from its own UDF', () => {
 const db = newDbWithRows();
 let iterator;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => iterator.next(), reentryError);
 return value;
 }, 3));

 iterator = db.prepare('SELECT reenter(value) AS value FROM data').iterate();
 assert.deepStrictEqual([...iterator].map((row) => row.value), [1, 2, 3]);
 assert.strictEqual(db.isOpen, true);
 });

 test('iterator return() from its own UDF', () => {
 const db = newDbWithRows();
 let iterator;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => iterator.return(), reentryError);
 return value;
 }));

 iterator = db.prepare('SELECT reenter(value) AS value FROM data').iterate();
 assert.strictEqual(iterator.next().done, false);
 iterator.return();
 assert.strictEqual(db.isOpen, true);
 });

 test(
 'recursive get() reports the reentry rather than overflowing the stack',
 () => {
 const db = new DatabaseSync(':memory:');
 let statement;
 db.function('reenter', mustCall(() => {
 assert.throws(() => statement.get(), reentryError);
 return 1;
 }));

 statement = db.prepare('SELECT reenter() AS value');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 });

 for (const method of ['all', 'get', 'run', 'iterate']) {
 test(`${method}() reentry during parameter binding is rejected`, () => {
 const db = newDbWithRows();
 let statement;
 const invoke = (params) => (method === 'iterate' ?
 [...statement.iterate(params)] :
 statement[method](params));
 const reenter = mustCall(() => {
 assert.throws(() => invoke({ $min: 2 }), reentryError);
 return 1;
 });
 const params = { get $min() { return reenter(); } };

 statement = db.prepare('SELECT value FROM data WHERE value >= $min');
 invoke(params);
 });
 }
Comment thread
TrevorBurnham marked this conversation as resolved.


 test('statement.close() from its own UDF', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement.close(), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 statement.close();
 });

 test('statement[Symbol.dispose]() from its own UDF', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement[Symbol.dispose](), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 statement[Symbol.dispose]();
 });

 test('statement is usable again after the callback returns', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement.all(), reentryError);
 return value;
 }, 2));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.all(), [{ __proto__: null, value: 1 }]);
 assert.deepStrictEqual(statement.all(), [{ __proto__: null, value: 1 }]);
 });
});

suite('a different statement remains usable from a callback', () => {
 test('the lookup pattern still works', () => {
 const db = newDbWithRows();
 db.exec('CREATE TABLE names (value INTEGER, name TEXT);' +
 "INSERT INTO names VALUES (1, 'one'), (2, 'two'), (3, 'three');");
 const lookup = db.prepare('SELECT name FROM names WHERE value = ?');

 db.function('name_of', mustCall((value) => lookup.get(value).name, 3));

 assert.deepStrictEqual(
 db.prepare('SELECT name_of(value) AS name FROM data').all(),
 [
 { __proto__: null, name: 'one' },
 { __proto__: null, name: 'two' },
 { __proto__: null, name: 'three' },
 ],
 );
 });

 test('a nested iterator over a different statement still works', () => {
 const db = newDbWithRows();
 const inner = db.prepare('SELECT value FROM data');

 db.function('sum_all', mustCall(() => {
 let total = 0;
 for (const row of inner.iterate()) {
 total += row.value;
 }
 return total;
 }));

 assert.deepStrictEqual(
 db.prepare('SELECT sum_all() AS total LIMIT 1').get(),
 { __proto__: null, total: 6 },
 );
 });
});

suite('SQL tag store reentry is rejected', () => {
 for (const method of ['all', 'get', 'run']) {
 test(`tag store ${method} re-executing the same tag`, () => {
 const db = newDbWithRows();
 const sql = db.createTagStore(4);
 db.function('reenter', mustCall((value) => {
 assert.throws(
 () => sql[method]`SELECT reenter(value) AS value FROM data LIMIT 1`,
 reentryError,
 );
 return value;
 }));

 assert.deepStrictEqual(
 sql.get`SELECT reenter(value) AS value FROM data LIMIT 1`,
 { __proto__: null, value: 1 },
 );
 assert.strictEqual(db.isOpen, true);
 });
 }
});

suite('aggregate functions', () => {
 test('reentry from an aggregate step is rejected', () => {
 const db = newDbWithRows();
 let statement;
 db.aggregate('reenter_agg', {
 start: 0,
 step: mustCall((total, value) => {
 assert.throws(() => statement.get(), reentryError);
 return total + value;
 }, 3),
 });

 statement = db.prepare('SELECT reenter_agg(value) AS total FROM data');
 assert.deepStrictEqual(statement.get(), { __proto__: null, total: 6 });
 });

 test('reentry from an aggregate result is rejected', () => {
 const db = newDbWithRows();
 let statement;
 db.aggregate('reenter_result', {
 start: 0,
 step: (total, value) => total + value,
 result: mustCall((total) => {
 assert.throws(() => statement.get(), reentryError);
 return total;
 }),
 });

 statement = db.prepare('SELECT reenter_result(value) AS total FROM data');
 assert.deepStrictEqual(statement.get(), { __proto__: null, total: 6 });
 });
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
sqlite: reject reentry into a running statement#65106

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

TrevorBurnham
wants to merge
1
commit into

from


+277

−0

 Closed


sqlite: reject reentry into a running statement
#65106
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


34 changes: 34 additions & 0 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2661,12 +2661,17 @@ void StatementSync::Close(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 stmt->Close();
}

void StatementSync::Dispose(const FunctionCallbackInfo<Value>& args) {
 StatementSync* stmt;
 ASSIGN_OR_RETURN_UNWRAP(&stmt, args.This());
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 stmt->Close();
}

Expand DownExpand Up@@ -3111,7 +3116,10 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3138,6 +3146,9 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
Comment thread
TrevorBurnham marked this conversation as resolved.

 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3161,6 +3172,9 @@ void StatementSync::Get(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3185,6 +3199,9 @@ void StatementSync::Run(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand DownExpand Up@@ -3474,6 +3491,9 @@ void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand All@@ -3500,6 +3520,9 @@ void SQLTagStore::Iterate(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3528,6 +3551,9 @@ void SQLTagStore::Get(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3557,6 +3583,9 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3769,6 +3798,8 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();

 auto iter_template = getLazyIterTemplate(env);
Expand All@@ -3791,6 +3822,7 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 iter->statement_reset_generation_ != iter->stmt_->reset_generation_,
 "iterator was invalidated");

 auto stepping = iter->stmt_->MarkStepping();
 int r = sqlite3_step(iter->stmt_->statement_);
 if (r != SQLITE_ROW) {
 CHECK_ERROR_OR_THROW(
Expand DownExpand Up@@ -3846,6 +3878,8 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();

 sqlite3_reset(iter->stmt_->statement_);
Expand Down

14 changes: 14 additions & 0 deletions
src/node_sqlite.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,19 @@ class StatementSync : public BaseObject {
 bool GetCachedColumnNames(v8::LocalVector<v8::Name>* keys);
 void Finalize();
 bool IsFinalized();
 bool IsStepping() const { return stepping_; }

 // SQLite forbids stepping, resetting, or finalizing a statement while that
 // same statement's user-defined function callback is on the stack. The
 // callback depth tracked by DatabaseSync is per-database, so it cannot
 // distinguish reentry into the running statement from the common pattern of
 // querying a *different* statement from a callback. This flag marks the
 // statement that is currently being stepped so that only the former is
 // rejected.
 inline auto MarkStepping() {
 stepping_ = true;
 return OnScopeLeave([this]() { stepping_ = false; });
 }

 SET_MEMORY_INFO_NAME(StatementSync)
 SET_SELF_SIZE(StatementSync)
Expand All@@ -304,6 +317,7 @@ class StatementSync : public BaseObject {
 bool use_big_ints_;
 bool allow_bare_named_params_;
 bool allow_unknown_named_params_;
 bool stepping_ = false;
 uint64_t reset_generation_ = 0;
 std::optional<std::map<std::string, std::string>> bare_named_params_;
 inline int ResetStatement();
Expand Down

229 changes: 229 additions & 0 deletions
test/parallel/test-sqlite-udf-statement-reentry.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,229 @@
'use strict';

const { skipIfSQLiteMissing, mustCall } = require('../common');
skipIfSQLiteMissing();
const assert = require('node:assert');
const { suite, test } = require('node:test');
const { DatabaseSync } = require('node:sqlite');

const reentryError = {
 code: 'ERR_INVALID_STATE',
 message: 'statement is currently being executed',
};

function newDbWithRows() {
 const db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE data (value INTEGER);
 INSERT INTO data VALUES (1), (2), (3);
 `);
 return db;
}

suite('reentry into the running statement is rejected', () => {
 for (const method of ['all', 'get', 'run']) {
 test(`statement.${method}() from its own UDF`, () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement[method](), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 assert.strictEqual(db.isOpen, true);
 });
 }

Comment thread
TrevorBurnham marked this conversation as resolved.

 test('iterator next() from its own UDF', () => {
 const db = newDbWithRows();
 let iterator;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => iterator.next(), reentryError);
 return value;
 }, 3));

 iterator = db.prepare('SELECT reenter(value) AS value FROM data').iterate();
 assert.deepStrictEqual([...iterator].map((row) => row.value), [1, 2, 3]);
 assert.strictEqual(db.isOpen, true);
 });

 test('iterator return() from its own UDF', () => {
 const db = newDbWithRows();
 let iterator;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => iterator.return(), reentryError);
 return value;
 }));

 iterator = db.prepare('SELECT reenter(value) AS value FROM data').iterate();
 assert.strictEqual(iterator.next().done, false);
 iterator.return();
 assert.strictEqual(db.isOpen, true);
 });

 test(
 'recursive get() reports the reentry rather than overflowing the stack',
 () => {
 const db = new DatabaseSync(':memory:');
 let statement;
 db.function('reenter', mustCall(() => {
 assert.throws(() => statement.get(), reentryError);
 return 1;
 }));

 statement = db.prepare('SELECT reenter() AS value');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 });

 for (const method of ['all', 'get', 'run', 'iterate']) {
 test(`${method}() reentry during parameter binding is rejected`, () => {
 const db = newDbWithRows();
 let statement;
 const invoke = (params) => (method === 'iterate' ?
 [...statement.iterate(params)] :
 statement[method](params));
 const reenter = mustCall(() => {
 assert.throws(() => invoke({ $min: 2 }), reentryError);
 return 1;
 });
 const params = { get $min() { return reenter(); } };

 statement = db.prepare('SELECT value FROM data WHERE value >= $min');
 invoke(params);
 });
 }
Comment thread
TrevorBurnham marked this conversation as resolved.


 test('statement.close() from its own UDF', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement.close(), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 statement.close();
 });

 test('statement[Symbol.dispose]() from its own UDF', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement[Symbol.dispose](), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 statement[Symbol.dispose]();
 });

 test('statement is usable again after the callback returns', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement.all(), reentryError);
 return value;
 }, 2));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.all(), [{ __proto__: null, value: 1 }]);
 assert.deepStrictEqual(statement.all(), [{ __proto__: null, value: 1 }]);
 });
});

suite('a different statement remains usable from a callback', () => {
 test('the lookup pattern still works', () => {
 const db = newDbWithRows();
 db.exec('CREATE TABLE names (value INTEGER, name TEXT);' +
 "INSERT INTO names VALUES (1, 'one'), (2, 'two'), (3, 'three');");
 const lookup = db.prepare('SELECT name FROM names WHERE value = ?');

 db.function('name_of', mustCall((value) => lookup.get(value).name, 3));

 assert.deepStrictEqual(
 db.prepare('SELECT name_of(value) AS name FROM data').all(),
 [
 { __proto__: null, name: 'one' },
 { __proto__: null, name: 'two' },
 { __proto__: null, name: 'three' },
 ],
 );
 });

 test('a nested iterator over a different statement still works', () => {
 const db = newDbWithRows();
 const inner = db.prepare('SELECT value FROM data');

 db.function('sum_all', mustCall(() => {
 let total = 0;
 for (const row of inner.iterate()) {
 total += row.value;
 }
 return total;
 }));

 assert.deepStrictEqual(
 db.prepare('SELECT sum_all() AS total LIMIT 1').get(),
 { __proto__: null, total: 6 },
 );
 });
});

suite('SQL tag store reentry is rejected', () => {
 for (const method of ['all', 'get', 'run']) {
 test(`tag store ${method} re-executing the same tag`, () => {
 const db = newDbWithRows();
 const sql = db.createTagStore(4);
 db.function('reenter', mustCall((value) => {
 assert.throws(
 () => sql[method]`SELECT reenter(value) AS value FROM data LIMIT 1`,
 reentryError,
 );
 return value;
 }));

 assert.deepStrictEqual(
 sql.get`SELECT reenter(value) AS value FROM data LIMIT 1`,
 { __proto__: null, value: 1 },
 );
 assert.strictEqual(db.isOpen, true);
 });
 }
});

suite('aggregate functions', () => {
 test('reentry from an aggregate step is rejected', () => {
 const db = newDbWithRows();
 let statement;
 db.aggregate('reenter_agg', {
 start: 0,
 step: mustCall((total, value) => {
 assert.throws(() => statement.get(), reentryError);
 return total + value;
 }, 3),
 });

 statement = db.prepare('SELECT reenter_agg(value) AS total FROM data');
 assert.deepStrictEqual(statement.get(), { __proto__: null, total: 6 });
 });

 test('reentry from an aggregate result is rejected', () => {
 const db = newDbWithRows();
 let statement;
 db.aggregate('reenter_result', {
 start: 0,
 step: (total, value) => total + value,
 result: mustCall((total) => {
 assert.throws(() => statement.get(), reentryError);
 return total;
 }),
 });

 statement = db.prepare('SELECT reenter_result(value) AS total FROM data');
 assert.deepStrictEqual(statement.get(), { __proto__: null, total: 6 });
 });
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
sqlite: reject reentry into a running statement#65106

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

TrevorBurnham
wants to merge
1
commit into

from


+277

−0

 Closed


sqlite: reject reentry into a running statement
#65106
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


34 changes: 34 additions & 0 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2661,12 +2661,17 @@ void StatementSync::Close(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 stmt->Close();
}

void StatementSync::Dispose(const FunctionCallbackInfo<Value>& args) {
 StatementSync* stmt;
 ASSIGN_OR_RETURN_UNWRAP(&stmt, args.This());
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 stmt->Close();
}

Expand DownExpand Up@@ -3111,7 +3116,10 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3138,6 +3146,9 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
Comment thread
TrevorBurnham marked this conversation as resolved.

 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3161,6 +3172,9 @@ void StatementSync::Get(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3185,6 +3199,9 @@ void StatementSync::Run(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand DownExpand Up@@ -3474,6 +3491,9 @@ void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand All@@ -3500,6 +3520,9 @@ void SQLTagStore::Iterate(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3528,6 +3551,9 @@ void SQLTagStore::Get(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3557,6 +3583,9 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3769,6 +3798,8 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();

 auto iter_template = getLazyIterTemplate(env);
Expand All@@ -3791,6 +3822,7 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 iter->statement_reset_generation_ != iter->stmt_->reset_generation_,
 "iterator was invalidated");

 auto stepping = iter->stmt_->MarkStepping();
 int r = sqlite3_step(iter->stmt_->statement_);
 if (r != SQLITE_ROW) {
 CHECK_ERROR_OR_THROW(
Expand DownExpand Up@@ -3846,6 +3878,8 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();

 sqlite3_reset(iter->stmt_->statement_);
Expand Down

14 changes: 14 additions & 0 deletions
src/node_sqlite.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,19 @@ class StatementSync : public BaseObject {
 bool GetCachedColumnNames(v8::LocalVector<v8::Name>* keys);
 void Finalize();
 bool IsFinalized();
 bool IsStepping() const { return stepping_; }

 // SQLite forbids stepping, resetting, or finalizing a statement while that
 // same statement's user-defined function callback is on the stack. The
 // callback depth tracked by DatabaseSync is per-database, so it cannot
 // distinguish reentry into the running statement from the common pattern of
 // querying a *different* statement from a callback. This flag marks the
 // statement that is currently being stepped so that only the former is
 // rejected.
 inline auto MarkStepping() {
 stepping_ = true;
 return OnScopeLeave([this]() { stepping_ = false; });
 }

 SET_MEMORY_INFO_NAME(StatementSync)
 SET_SELF_SIZE(StatementSync)
Expand All@@ -304,6 +317,7 @@ class StatementSync : public BaseObject {
 bool use_big_ints_;
 bool allow_bare_named_params_;
 bool allow_unknown_named_params_;
 bool stepping_ = false;
 uint64_t reset_generation_ = 0;
 std::optional<std::map<std::string, std::string>> bare_named_params_;
 inline int ResetStatement();
Expand Down

229 changes: 229 additions & 0 deletions
test/parallel/test-sqlite-udf-statement-reentry.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,229 @@
'use strict';

const { skipIfSQLiteMissing, mustCall } = require('../common');
skipIfSQLiteMissing();
const assert = require('node:assert');
const { suite, test } = require('node:test');
const { DatabaseSync } = require('node:sqlite');

const reentryError = {
 code: 'ERR_INVALID_STATE',
 message: 'statement is currently being executed',
};

function newDbWithRows() {
 const db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE data (value INTEGER);
 INSERT INTO data VALUES (1), (2), (3);
 `);
 return db;
}

suite('reentry into the running statement is rejected', () => {
 for (const method of ['all', 'get', 'run']) {
 test(`statement.${method}() from its own UDF`, () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement[method](), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 assert.strictEqual(db.isOpen, true);
 });
 }

Comment thread
TrevorBurnham marked this conversation as resolved.

 test('iterator next() from its own UDF', () => {
 const db = newDbWithRows();
 let iterator;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => iterator.next(), reentryError);
 return value;
 }, 3));

 iterator = db.prepare('SELECT reenter(value) AS value FROM data').iterate();
 assert.deepStrictEqual([...iterator].map((row) => row.value), [1, 2, 3]);
 assert.strictEqual(db.isOpen, true);
 });

 test('iterator return() from its own UDF', () => {
 const db = newDbWithRows();
 let iterator;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => iterator.return(), reentryError);
 return value;
 }));

 iterator = db.prepare('SELECT reenter(value) AS value FROM data').iterate();
 assert.strictEqual(iterator.next().done, false);
 iterator.return();
 assert.strictEqual(db.isOpen, true);
 });

 test(
 'recursive get() reports the reentry rather than overflowing the stack',
 () => {
 const db = new DatabaseSync(':memory:');
 let statement;
 db.function('reenter', mustCall(() => {
 assert.throws(() => statement.get(), reentryError);
 return 1;
 }));

 statement = db.prepare('SELECT reenter() AS value');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 });

 for (const method of ['all', 'get', 'run', 'iterate']) {
 test(`${method}() reentry during parameter binding is rejected`, () => {
 const db = newDbWithRows();
 let statement;
 const invoke = (params) => (method === 'iterate' ?
 [...statement.iterate(params)] :
 statement[method](params));
 const reenter = mustCall(() => {
 assert.throws(() => invoke({ $min: 2 }), reentryError);
 return 1;
 });
 const params = { get $min() { return reenter(); } };

 statement = db.prepare('SELECT value FROM data WHERE value >= $min');
 invoke(params);
 });
 }
Comment thread
TrevorBurnham marked this conversation as resolved.


 test('statement.close() from its own UDF', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement.close(), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 statement.close();
 });

 test('statement[Symbol.dispose]() from its own UDF', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement[Symbol.dispose](), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 statement[Symbol.dispose]();
 });

 test('statement is usable again after the callback returns', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement.all(), reentryError);
 return value;
 }, 2));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.all(), [{ __proto__: null, value: 1 }]);
 assert.deepStrictEqual(statement.all(), [{ __proto__: null, value: 1 }]);
 });
});

suite('a different statement remains usable from a callback', () => {
 test('the lookup pattern still works', () => {
 const db = newDbWithRows();
 db.exec('CREATE TABLE names (value INTEGER, name TEXT);' +
 "INSERT INTO names VALUES (1, 'one'), (2, 'two'), (3, 'three');");
 const lookup = db.prepare('SELECT name FROM names WHERE value = ?');

 db.function('name_of', mustCall((value) => lookup.get(value).name, 3));

 assert.deepStrictEqual(
 db.prepare('SELECT name_of(value) AS name FROM data').all(),
 [
 { __proto__: null, name: 'one' },
 { __proto__: null, name: 'two' },
 { __proto__: null, name: 'three' },
 ],
 );
 });

 test('a nested iterator over a different statement still works', () => {
 const db = newDbWithRows();
 const inner = db.prepare('SELECT value FROM data');

 db.function('sum_all', mustCall(() => {
 let total = 0;
 for (const row of inner.iterate()) {
 total += row.value;
 }
 return total;
 }));

 assert.deepStrictEqual(
 db.prepare('SELECT sum_all() AS total LIMIT 1').get(),
 { __proto__: null, total: 6 },
 );
 });
});

suite('SQL tag store reentry is rejected', () => {
 for (const method of ['all', 'get', 'run']) {
 test(`tag store ${method} re-executing the same tag`, () => {
 const db = newDbWithRows();
 const sql = db.createTagStore(4);
 db.function('reenter', mustCall((value) => {
 assert.throws(
 () => sql[method]`SELECT reenter(value) AS value FROM data LIMIT 1`,
 reentryError,
 );
 return value;
 }));

 assert.deepStrictEqual(
 sql.get`SELECT reenter(value) AS value FROM data LIMIT 1`,
 { __proto__: null, value: 1 },
 );
 assert.strictEqual(db.isOpen, true);
 });
 }
});

suite('aggregate functions', () => {
 test('reentry from an aggregate step is rejected', () => {
 const db = newDbWithRows();
 let statement;
 db.aggregate('reenter_agg', {
 start: 0,
 step: mustCall((total, value) => {
 assert.throws(() => statement.get(), reentryError);
 return total + value;
 }, 3),
 });

 statement = db.prepare('SELECT reenter_agg(value) AS total FROM data');
 assert.deepStrictEqual(statement.get(), { __proto__: null, total: 6 });
 });

 test('reentry from an aggregate result is rejected', () => {
 const db = newDbWithRows();
 let statement;
 db.aggregate('reenter_result', {
 start: 0,
 step: (total, value) => total + value,
 result: mustCall((total) => {
 assert.throws(() => statement.get(), reentryError);
 return total;
 }),
 });

 statement = db.prepare('SELECT reenter_result(value) AS total FROM data');
 assert.deepStrictEqual(statement.get(), { __proto__: null, total: 6 });
 });
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
sqlite: reject reentry into a running statement#65106

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

TrevorBurnham
wants to merge
1
commit into

from


+277

−0

 Closed


sqlite: reject reentry into a running statement
#65106
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


34 changes: 34 additions & 0 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2661,12 +2661,17 @@ void StatementSync::Close(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 stmt->Close();
}

void StatementSync::Dispose(const FunctionCallbackInfo<Value>& args) {
 StatementSync* stmt;
 ASSIGN_OR_RETURN_UNWRAP(&stmt, args.This());
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 stmt->Close();
}

Expand DownExpand Up@@ -3111,7 +3116,10 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3138,6 +3146,9 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
Comment thread
TrevorBurnham marked this conversation as resolved.

 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3161,6 +3172,9 @@ void StatementSync::Get(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3185,6 +3199,9 @@ void StatementSync::Run(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand DownExpand Up@@ -3474,6 +3491,9 @@ void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand All@@ -3500,6 +3520,9 @@ void SQLTagStore::Iterate(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3528,6 +3551,9 @@ void SQLTagStore::Get(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3557,6 +3583,9 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3769,6 +3798,8 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();

 auto iter_template = getLazyIterTemplate(env);
Expand All@@ -3791,6 +3822,7 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 iter->statement_reset_generation_ != iter->stmt_->reset_generation_,
 "iterator was invalidated");

 auto stepping = iter->stmt_->MarkStepping();
 int r = sqlite3_step(iter->stmt_->statement_);
 if (r != SQLITE_ROW) {
 CHECK_ERROR_OR_THROW(
Expand DownExpand Up@@ -3846,6 +3878,8 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();

 sqlite3_reset(iter->stmt_->statement_);
Expand Down

14 changes: 14 additions & 0 deletions
src/node_sqlite.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,19 @@ class StatementSync : public BaseObject {
 bool GetCachedColumnNames(v8::LocalVector<v8::Name>* keys);
 void Finalize();
 bool IsFinalized();
 bool IsStepping() const { return stepping_; }

 // SQLite forbids stepping, resetting, or finalizing a statement while that
 // same statement's user-defined function callback is on the stack. The
 // callback depth tracked by DatabaseSync is per-database, so it cannot
 // distinguish reentry into the running statement from the common pattern of
 // querying a *different* statement from a callback. This flag marks the
 // statement that is currently being stepped so that only the former is
 // rejected.
 inline auto MarkStepping() {
 stepping_ = true;
 return OnScopeLeave([this]() { stepping_ = false; });
 }

 SET_MEMORY_INFO_NAME(StatementSync)
 SET_SELF_SIZE(StatementSync)
Expand All@@ -304,6 +317,7 @@ class StatementSync : public BaseObject {
 bool use_big_ints_;
 bool allow_bare_named_params_;
 bool allow_unknown_named_params_;
 bool stepping_ = false;
 uint64_t reset_generation_ = 0;
 std::optional<std::map<std::string, std::string>> bare_named_params_;
 inline int ResetStatement();
Expand Down

229 changes: 229 additions & 0 deletions
test/parallel/test-sqlite-udf-statement-reentry.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,229 @@
'use strict';

const { skipIfSQLiteMissing, mustCall } = require('../common');
skipIfSQLiteMissing();
const assert = require('node:assert');
const { suite, test } = require('node:test');
const { DatabaseSync } = require('node:sqlite');

const reentryError = {
 code: 'ERR_INVALID_STATE',
 message: 'statement is currently being executed',
};

function newDbWithRows() {
 const db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE data (value INTEGER);
 INSERT INTO data VALUES (1), (2), (3);
 `);
 return db;
}

suite('reentry into the running statement is rejected', () => {
 for (const method of ['all', 'get', 'run']) {
 test(`statement.${method}() from its own UDF`, () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement[method](), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 assert.strictEqual(db.isOpen, true);
 });
 }

Comment thread
TrevorBurnham marked this conversation as resolved.

 test('iterator next() from its own UDF', () => {
 const db = newDbWithRows();
 let iterator;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => iterator.next(), reentryError);
 return value;
 }, 3));

 iterator = db.prepare('SELECT reenter(value) AS value FROM data').iterate();
 assert.deepStrictEqual([...iterator].map((row) => row.value), [1, 2, 3]);
 assert.strictEqual(db.isOpen, true);
 });

 test('iterator return() from its own UDF', () => {
 const db = newDbWithRows();
 let iterator;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => iterator.return(), reentryError);
 return value;
 }));

 iterator = db.prepare('SELECT reenter(value) AS value FROM data').iterate();
 assert.strictEqual(iterator.next().done, false);
 iterator.return();
 assert.strictEqual(db.isOpen, true);
 });

 test(
 'recursive get() reports the reentry rather than overflowing the stack',
 () => {
 const db = new DatabaseSync(':memory:');
 let statement;
 db.function('reenter', mustCall(() => {
 assert.throws(() => statement.get(), reentryError);
 return 1;
 }));

 statement = db.prepare('SELECT reenter() AS value');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 });

 for (const method of ['all', 'get', 'run', 'iterate']) {
 test(`${method}() reentry during parameter binding is rejected`, () => {
 const db = newDbWithRows();
 let statement;
 const invoke = (params) => (method === 'iterate' ?
 [...statement.iterate(params)] :
 statement[method](params));
 const reenter = mustCall(() => {
 assert.throws(() => invoke({ $min: 2 }), reentryError);
 return 1;
 });
 const params = { get $min() { return reenter(); } };

 statement = db.prepare('SELECT value FROM data WHERE value >= $min');
 invoke(params);
 });
 }
Comment thread
TrevorBurnham marked this conversation as resolved.


 test('statement.close() from its own UDF', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement.close(), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 statement.close();
 });

 test('statement[Symbol.dispose]() from its own UDF', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement[Symbol.dispose](), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 statement[Symbol.dispose]();
 });

 test('statement is usable again after the callback returns', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement.all(), reentryError);
 return value;
 }, 2));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.all(), [{ __proto__: null, value: 1 }]);
 assert.deepStrictEqual(statement.all(), [{ __proto__: null, value: 1 }]);
 });
});

suite('a different statement remains usable from a callback', () => {
 test('the lookup pattern still works', () => {
 const db = newDbWithRows();
 db.exec('CREATE TABLE names (value INTEGER, name TEXT);' +
 "INSERT INTO names VALUES (1, 'one'), (2, 'two'), (3, 'three');");
 const lookup = db.prepare('SELECT name FROM names WHERE value = ?');

 db.function('name_of', mustCall((value) => lookup.get(value).name, 3));

 assert.deepStrictEqual(
 db.prepare('SELECT name_of(value) AS name FROM data').all(),
 [
 { __proto__: null, name: 'one' },
 { __proto__: null, name: 'two' },
 { __proto__: null, name: 'three' },
 ],
 );
 });

 test('a nested iterator over a different statement still works', () => {
 const db = newDbWithRows();
 const inner = db.prepare('SELECT value FROM data');

 db.function('sum_all', mustCall(() => {
 let total = 0;
 for (const row of inner.iterate()) {
 total += row.value;
 }
 return total;
 }));

 assert.deepStrictEqual(
 db.prepare('SELECT sum_all() AS total LIMIT 1').get(),
 { __proto__: null, total: 6 },
 );
 });
});

suite('SQL tag store reentry is rejected', () => {
 for (const method of ['all', 'get', 'run']) {
 test(`tag store ${method} re-executing the same tag`, () => {
 const db = newDbWithRows();
 const sql = db.createTagStore(4);
 db.function('reenter', mustCall((value) => {
 assert.throws(
 () => sql[method]`SELECT reenter(value) AS value FROM data LIMIT 1`,
 reentryError,
 );
 return value;
 }));

 assert.deepStrictEqual(
 sql.get`SELECT reenter(value) AS value FROM data LIMIT 1`,
 { __proto__: null, value: 1 },
 );
 assert.strictEqual(db.isOpen, true);
 });
 }
});

suite('aggregate functions', () => {
 test('reentry from an aggregate step is rejected', () => {
 const db = newDbWithRows();
 let statement;
 db.aggregate('reenter_agg', {
 start: 0,
 step: mustCall((total, value) => {
 assert.throws(() => statement.get(), reentryError);
 return total + value;
 }, 3),
 });

 statement = db.prepare('SELECT reenter_agg(value) AS total FROM data');
 assert.deepStrictEqual(statement.get(), { __proto__: null, total: 6 });
 });

 test('reentry from an aggregate result is rejected', () => {
 const db = newDbWithRows();
 let statement;
 db.aggregate('reenter_result', {
 start: 0,
 step: (total, value) => total + value,
 result: mustCall((total) => {
 assert.throws(() => statement.get(), reentryError);
 return total;
 }),
 });

 statement = db.prepare('SELECT reenter_result(value) AS total FROM data');
 assert.deepStrictEqual(statement.get(), { __proto__: null, total: 6 });
 });
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
sqlite: reject reentry into a running statement#65106

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

TrevorBurnham
wants to merge
1
commit into

from


+277

−0

 Closed


sqlite: reject reentry into a running statement
#65106
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


34 changes: 34 additions & 0 deletions
src/node_sqlite.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2661,12 +2661,17 @@ void StatementSync::Close(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 stmt->Close();
}

void StatementSync::Dispose(const FunctionCallbackInfo<Value>& args) {
 StatementSync* stmt;
 ASSIGN_OR_RETURN_UNWRAP(&stmt, args.This());
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 stmt->Close();
}

Expand DownExpand Up@@ -3111,7 +3116,10 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3138,6 +3146,9 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
Comment thread
TrevorBurnham marked this conversation as resolved.

 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3161,6 +3172,9 @@ void StatementSync::Get(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand All@@ -3185,6 +3199,9 @@ void StatementSync::Run(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 int r = stmt->ResetStatement();
 CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());

Expand DownExpand Up@@ -3474,6 +3491,9 @@ void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand All@@ -3500,6 +3520,9 @@ void SQLTagStore::Iterate(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3528,6 +3551,9 @@ void SQLTagStore::Get(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3557,6 +3583,9 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
 return;
 }

 THROW_AND_RETURN_ON_BAD_STATE(
 env, stmt->IsStepping(), "statement is currently being executed");
 auto stepping = stmt->MarkStepping();
 if (!ResetAndBindStatement(env, stmt.get(), args)) {
 return;
 }
Expand DownExpand Up@@ -3769,6 +3798,8 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();

 auto iter_template = getLazyIterTemplate(env);
Expand All@@ -3791,6 +3822,7 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 iter->statement_reset_generation_ != iter->stmt_->reset_generation_,
 "iterator was invalidated");

 auto stepping = iter->stmt_->MarkStepping();
 int r = sqlite3_step(iter->stmt_->statement_);
 if (r != SQLITE_ROW) {
 CHECK_ERROR_OR_THROW(
Expand DownExpand Up@@ -3846,6 +3878,8 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
 Environment* env = Environment::GetCurrent(args);
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsFinalized(), "statement has been finalized");
 THROW_AND_RETURN_ON_BAD_STATE(
 env, iter->stmt_->IsStepping(), "statement is currently being executed");
 Isolate* isolate = env->isolate();

 sqlite3_reset(iter->stmt_->statement_);
Expand Down

14 changes: 14 additions & 0 deletions
src/node_sqlite.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,19 @@ class StatementSync : public BaseObject {
 bool GetCachedColumnNames(v8::LocalVector<v8::Name>* keys);
 void Finalize();
 bool IsFinalized();
 bool IsStepping() const { return stepping_; }

 // SQLite forbids stepping, resetting, or finalizing a statement while that
 // same statement's user-defined function callback is on the stack. The
 // callback depth tracked by DatabaseSync is per-database, so it cannot
 // distinguish reentry into the running statement from the common pattern of
 // querying a *different* statement from a callback. This flag marks the
 // statement that is currently being stepped so that only the former is
 // rejected.
 inline auto MarkStepping() {
 stepping_ = true;
 return OnScopeLeave([this]() { stepping_ = false; });
 }

 SET_MEMORY_INFO_NAME(StatementSync)
 SET_SELF_SIZE(StatementSync)
Expand All@@ -304,6 +317,7 @@ class StatementSync : public BaseObject {
 bool use_big_ints_;
 bool allow_bare_named_params_;
 bool allow_unknown_named_params_;
 bool stepping_ = false;
 uint64_t reset_generation_ = 0;
 std::optional<std::map<std::string, std::string>> bare_named_params_;
 inline int ResetStatement();
Expand Down

229 changes: 229 additions & 0 deletions
test/parallel/test-sqlite-udf-statement-reentry.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,229 @@
'use strict';

const { skipIfSQLiteMissing, mustCall } = require('../common');
skipIfSQLiteMissing();
const assert = require('node:assert');
const { suite, test } = require('node:test');
const { DatabaseSync } = require('node:sqlite');

const reentryError = {
 code: 'ERR_INVALID_STATE',
 message: 'statement is currently being executed',
};

function newDbWithRows() {
 const db = new DatabaseSync(':memory:');
 db.exec(`
 CREATE TABLE data (value INTEGER);
 INSERT INTO data VALUES (1), (2), (3);
 `);
 return db;
}

suite('reentry into the running statement is rejected', () => {
 for (const method of ['all', 'get', 'run']) {
 test(`statement.${method}() from its own UDF`, () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement[method](), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 assert.strictEqual(db.isOpen, true);
 });
 }

Comment thread
TrevorBurnham marked this conversation as resolved.

 test('iterator next() from its own UDF', () => {
 const db = newDbWithRows();
 let iterator;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => iterator.next(), reentryError);
 return value;
 }, 3));

 iterator = db.prepare('SELECT reenter(value) AS value FROM data').iterate();
 assert.deepStrictEqual([...iterator].map((row) => row.value), [1, 2, 3]);
 assert.strictEqual(db.isOpen, true);
 });

 test('iterator return() from its own UDF', () => {
 const db = newDbWithRows();
 let iterator;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => iterator.return(), reentryError);
 return value;
 }));

 iterator = db.prepare('SELECT reenter(value) AS value FROM data').iterate();
 assert.strictEqual(iterator.next().done, false);
 iterator.return();
 assert.strictEqual(db.isOpen, true);
 });

 test(
 'recursive get() reports the reentry rather than overflowing the stack',
 () => {
 const db = new DatabaseSync(':memory:');
 let statement;
 db.function('reenter', mustCall(() => {
 assert.throws(() => statement.get(), reentryError);
 return 1;
 }));

 statement = db.prepare('SELECT reenter() AS value');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 });

 for (const method of ['all', 'get', 'run', 'iterate']) {
 test(`${method}() reentry during parameter binding is rejected`, () => {
 const db = newDbWithRows();
 let statement;
 const invoke = (params) => (method === 'iterate' ?
 [...statement.iterate(params)] :
 statement[method](params));
 const reenter = mustCall(() => {
 assert.throws(() => invoke({ $min: 2 }), reentryError);
 return 1;
 });
 const params = { get $min() { return reenter(); } };

 statement = db.prepare('SELECT value FROM data WHERE value >= $min');
 invoke(params);
 });
 }
Comment thread
TrevorBurnham marked this conversation as resolved.


 test('statement.close() from its own UDF', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement.close(), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 statement.close();
 });

 test('statement[Symbol.dispose]() from its own UDF', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement[Symbol.dispose](), reentryError);
 return value;
 }));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.get(), { __proto__: null, value: 1 });
 statement[Symbol.dispose]();
 });

 test('statement is usable again after the callback returns', () => {
 const db = newDbWithRows();
 let statement;
 db.function('reenter', mustCall((value) => {
 assert.throws(() => statement.all(), reentryError);
 return value;
 }, 2));

 statement = db.prepare('SELECT reenter(value) AS value FROM data LIMIT 1');
 assert.deepStrictEqual(statement.all(), [{ __proto__: null, value: 1 }]);
 assert.deepStrictEqual(statement.all(), [{ __proto__: null, value: 1 }]);
 });
});

suite('a different statement remains usable from a callback', () => {
 test('the lookup pattern still works', () => {
 const db = newDbWithRows();
 db.exec('CREATE TABLE names (value INTEGER, name TEXT);' +
 "INSERT INTO names VALUES (1, 'one'), (2, 'two'), (3, 'three');");
 const lookup = db.prepare('SELECT name FROM names WHERE value = ?');

 db.function('name_of', mustCall((value) => lookup.get(value).name, 3));

 assert.deepStrictEqual(
 db.prepare('SELECT name_of(value) AS name FROM data').all(),
 [
 { __proto__: null, name: 'one' },
 { __proto__: null, name: 'two' },
 { __proto__: null, name: 'three' },
 ],
 );
 });

 test('a nested iterator over a different statement still works', () => {
 const db = newDbWithRows();
 const inner = db.prepare('SELECT value FROM data');

 db.function('sum_all', mustCall(() => {
 let total = 0;
 for (const row of inner.iterate()) {
 total += row.value;
 }
 return total;
 }));

 assert.deepStrictEqual(
 db.prepare('SELECT sum_all() AS total LIMIT 1').get(),
 { __proto__: null, total: 6 },
 );
 });
});

suite('SQL tag store reentry is rejected', () => {
 for (const method of ['all', 'get', 'run']) {
 test(`tag store ${method} re-executing the same tag`, () => {
 const db = newDbWithRows();
 const sql = db.createTagStore(4);
 db.function('reenter', mustCall((value) => {
 assert.throws(
 () => sql[method]`SELECT reenter(value) AS value FROM data LIMIT 1`,
 reentryError,
 );
 return value;
 }));

 assert.deepStrictEqual(
 sql.get`SELECT reenter(value) AS value FROM data LIMIT 1`,
 { __proto__: null, value: 1 },
 );
 assert.strictEqual(db.isOpen, true);
 });
 }
});

suite('aggregate functions', () => {
 test('reentry from an aggregate step is rejected', () => {
 const db = newDbWithRows();
 let statement;
 db.aggregate('reenter_agg', {
 start: 0,
 step: mustCall((total, value) => {
 assert.throws(() => statement.get(), reentryError);
 return total + value;
 }, 3),
 });

 statement = db.prepare('SELECT reenter_agg(value) AS total FROM data');
 assert.deepStrictEqual(statement.get(), { __proto__: null, total: 6 });
 });

 test('reentry from an aggregate result is rejected', () => {
 const db = newDbWithRows();
 let statement;
 db.aggregate('reenter_result', {
 start: 0,
 step: (total, value) => total + value,
 result: mustCall((total) => {
 assert.throws(() => statement.get(), reentryError);
 return total;
 }),
 });

 statement = db.prepare('SELECT reenter_result(value) AS total FROM data');
 assert.deepStrictEqual(statement.get(), { __proto__: null, total: 6 });
 });
});
Loading