Commit 6ec735c

Browse files
TrevorBurnhamaduh95
TrevorBurnham
authored and
aduh95
committed
sqlite: reject reentry while binding parameters
c4b755e tracks the statements currently being stepped and rejects reentry into them, but the guard is established inside the execution helpers, after the entry point has already reset the statement and bound its parameters. Binding reads properties off the supplied object, so a named-parameter getter runs JavaScript in that window. Reentering the same statement there resets it a second time and, for iterate(), hands out a second iterator; both iterators record the same reset generation, so neither is invalidated and they interleave rows from one virtual machine. Establish the guard at the four StatementSync entry points instead, before the reset, so it spans binding as well as stepping. The existing guards inside the helpers are left in place; the stepping set is a stack, so the nested acquisition is balanced. Signed-off-by: Trevor Burnham <trevorburnham@gmail.com> Assisted-by: claude:opus-5 PR-URL: #65294 Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 5821362 commit 6ec735c

2 files changed

Lines changed: 67 additions & 0 deletions

File tree

‎src/node_sqlite.cc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3381,6 +3381,7 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
33813381
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
33823382
THROW_AND_RETURN_IF_STEPPING(env, stmt);
33833383
Isolate* isolate = env->isolate();
3384+
SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
33843385
int r = stmt->ResetStatement();
33853386
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
33863387

@@ -3408,6 +3409,7 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) {
34083409
env, stmt->IsFinalized(), "statement has been finalized");
34093410
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34103411
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3412+
SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34113413
int r = stmt->ResetStatement();
34123414
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34133415

@@ -3433,6 +3435,7 @@ void StatementSync::Get(const FunctionCallbackInfo<Value>& args) {
34333435
env, stmt->IsFinalized(), "statement has been finalized");
34343436
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34353437
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3438+
SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34363439
int r = stmt->ResetStatement();
34373440
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34383441

@@ -3454,6 +3457,7 @@ void StatementSync::Run(const FunctionCallbackInfo<Value>& args) {
34543457
env, stmt->IsFinalized(), "statement has been finalized");
34553458
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34563459
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3460+
SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34573461
int r = stmt->ResetStatement();
34583462
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34593463

‎test/parallel/test-sqlite-statement-binding-reentry.js‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
'use strict';
2+
3+
const{ skipIfSQLiteMissing, mustCall }=require('../common');
4+
skipIfSQLiteMissing();
5+
constassert=require('node:assert');
6+
const{ test }=require('node:test');
7+
const{ DatabaseSync }=require('node:sqlite');
8+
9+
constreentryError={
10+
code: 'ERR_INVALID_STATE',
11+
message: 'statement is already being executed',
12+
};
13+
14+
// Binding a named parameter reads properties off the supplied object, so a
15+
// getter runs JavaScript after the statement has been reset but before it is
16+
// stepped. Reentering the same statement there resets it a second time and
17+
// hands out a second iterator over one virtual machine.
18+
for(constmethodof['all','get','run','iterate']){
19+
test(`${method}() reentry during parameter binding is rejected`,()=>{
20+
constdb=newDatabaseSync(':memory:');
21+
db.exec(`
22+
CREATE TABLE data (value INTEGER);
23+
INSERT INTO data VALUES (1), (2), (3);
24+
`);
25+
26+
letstatement;
27+
constinvoke=(params)=>(method==='iterate' ?
28+
[...statement.iterate(params)] :
29+
statement[method](params));
30+
constreenter=mustCall(()=>{
31+
assert.throws(()=>invoke({$min: 2}),reentryError);
32+
return1;
33+
});
34+
constparams={get$min(){returnreenter();}};
35+
36+
statement=db.prepare('SELECT value FROM data WHERE value >= $min');
37+
invoke(params);
38+
});
39+
}
40+
41+
test('two iterators cannot share one virtual machine',()=>{
42+
constdb=newDatabaseSync(':memory:');
43+
db.exec(`
44+
CREATE TABLE data (value INTEGER);
45+
INSERT INTO data VALUES (1), (2), (3);
46+
`);
47+
48+
conststatement=db.prepare('SELECT value FROM data WHERE value >= $min');
49+
letinner;
50+
constreenter=mustCall(()=>{
51+
assert.throws(()=>{
52+
inner=statement.iterate({$min: 1});
53+
},reentryError);
54+
return1;
55+
});
56+
constparams={get$min(){returnreenter();}};
57+
58+
assert.deepStrictEqual(
59+
[...statement.iterate(params)].map((row)=>row.value),
60+
[1,2,3],
61+
);
62+
assert.strictEqual(inner,undefined);
63+
});

0 commit comments

Comments
 (0)
, '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
Commit 6ec735c
Browse files
TrevorBurnhamaduh95
TrevorBurnham
authored and
aduh95
committed
sqlite: reject reentry while binding parameters
c4b755e tracks the statements currently being stepped and rejects
reentry into them, but the guard is established inside the execution
helpers, after the entry point has already reset the statement and
bound its parameters. Binding reads properties off the supplied
object, so a named-parameter getter runs JavaScript in that window.
Reentering the same statement there resets it a second time and, for
iterate(), hands out a second iterator; both iterators record the
same reset generation, so neither is invalidated and they interleave
rows from one virtual machine.
Establish the guard at the four StatementSync entry points instead,
before the reset, so it spans binding as well as stepping. The
existing guards inside the helpers are left in place; the stepping
set is a stack, so the nested acquisition is balanced.
Signed-off-by: Trevor Burnham <trevorburnham@gmail.com>
Assisted-by: claude:opus-5
PR-URL: #65294
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 5821362 commit 6ec735c
2 files changed
Lines changed: 67 additions & 0 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3381,6 +3381,7 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
33813381
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
33823382
THROW_AND_RETURN_IF_STEPPING(env, stmt);
33833383
 Isolate* isolate = env->isolate();
3384+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
33843385
int r = stmt->ResetStatement();
33853386
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
33863387

@@ -3408,6 +3409,7 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) {
34083409
 env, stmt->IsFinalized(), "statement has been finalized");
34093410
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34103411
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3412+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34113413
int r = stmt->ResetStatement();
34123414
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34133415

@@ -3433,6 +3435,7 @@ void StatementSync::Get(const FunctionCallbackInfo<Value>& args) {
34333435
 env, stmt->IsFinalized(), "statement has been finalized");
34343436
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34353437
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3438+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34363439
int r = stmt->ResetStatement();
34373440
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34383441

@@ -3454,6 +3457,7 @@ void StatementSync::Run(const FunctionCallbackInfo<Value>& args) {
34543457
 env, stmt->IsFinalized(), "statement has been finalized");
34553458
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34563459
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3460+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34573461
int r = stmt->ResetStatement();
34583462
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34593463

‎test/parallel/test-sqlite-statement-binding-reentry.js‎
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
'use strict';
2+
3+
const{ skipIfSQLiteMissing, mustCall }=require('../common');
4+
skipIfSQLiteMissing();
5+
constassert=require('node:assert');
6+
const{ test }=require('node:test');
7+
const{ DatabaseSync }=require('node:sqlite');
8+
9+
constreentryError={
10+
code: 'ERR_INVALID_STATE',
11+
message: 'statement is already being executed',
12+
};
13+
14+
// Binding a named parameter reads properties off the supplied object, so a
15+
// getter runs JavaScript after the statement has been reset but before it is
16+
// stepped. Reentering the same statement there resets it a second time and
17+
// hands out a second iterator over one virtual machine.
18+
for(constmethodof['all','get','run','iterate']){
19+
test(`${method}() reentry during parameter binding is rejected`,()=>{
20+
constdb=newDatabaseSync(':memory:');
21+
db.exec(`
22+
 CREATE TABLE data (value INTEGER);
23+
 INSERT INTO data VALUES (1), (2), (3);
24+
 `);
25+
26+
letstatement;
27+
constinvoke=(params)=>(method==='iterate' ?
28+
[...statement.iterate(params)] :
29+
statement[method](params));
30+
constreenter=mustCall(()=>{
31+
assert.throws(()=>invoke({$min: 2}),reentryError);
32+
return1;
33+
});
34+
constparams={get$min(){returnreenter();}};
35+
36+
statement=db.prepare('SELECT value FROM data WHERE value >= $min');
37+
invoke(params);
38+
});
39+
}
40+
41+
test('two iterators cannot share one virtual machine',()=>{
42+
constdb=newDatabaseSync(':memory:');
43+
db.exec(`
44+
 CREATE TABLE data (value INTEGER);
45+
 INSERT INTO data VALUES (1), (2), (3);
46+
 `);
47+
48+
conststatement=db.prepare('SELECT value FROM data WHERE value >= $min');
49+
letinner;
50+
constreenter=mustCall(()=>{
51+
assert.throws(()=>{
52+
inner=statement.iterate({$min: 1});
53+
},reentryError);
54+
return1;
55+
});
56+
constparams={get$min(){returnreenter();}};
57+
58+
assert.deepStrictEqual(
59+
[...statement.iterate(params)].map((row)=>row.value),
60+
[1,2,3],
61+
);
62+
assert.strictEqual(inner,undefined);
63+
});
0 commit comments
Comments
 (0)

, '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
Commit 6ec735c
Browse files
TrevorBurnhamaduh95
TrevorBurnham
authored and
aduh95
committed
sqlite: reject reentry while binding parameters
c4b755e tracks the statements currently being stepped and rejects
reentry into them, but the guard is established inside the execution
helpers, after the entry point has already reset the statement and
bound its parameters. Binding reads properties off the supplied
object, so a named-parameter getter runs JavaScript in that window.
Reentering the same statement there resets it a second time and, for
iterate(), hands out a second iterator; both iterators record the
same reset generation, so neither is invalidated and they interleave
rows from one virtual machine.
Establish the guard at the four StatementSync entry points instead,
before the reset, so it spans binding as well as stepping. The
existing guards inside the helpers are left in place; the stepping
set is a stack, so the nested acquisition is balanced.
Signed-off-by: Trevor Burnham <trevorburnham@gmail.com>
Assisted-by: claude:opus-5
PR-URL: #65294
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 5821362 commit 6ec735c
2 files changed
Lines changed: 67 additions & 0 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3381,6 +3381,7 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
33813381
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
33823382
THROW_AND_RETURN_IF_STEPPING(env, stmt);
33833383
 Isolate* isolate = env->isolate();
3384+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
33843385
int r = stmt->ResetStatement();
33853386
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
33863387

@@ -3408,6 +3409,7 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) {
34083409
 env, stmt->IsFinalized(), "statement has been finalized");
34093410
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34103411
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3412+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34113413
int r = stmt->ResetStatement();
34123414
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34133415

@@ -3433,6 +3435,7 @@ void StatementSync::Get(const FunctionCallbackInfo<Value>& args) {
34333435
 env, stmt->IsFinalized(), "statement has been finalized");
34343436
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34353437
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3438+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34363439
int r = stmt->ResetStatement();
34373440
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34383441

@@ -3454,6 +3457,7 @@ void StatementSync::Run(const FunctionCallbackInfo<Value>& args) {
34543457
 env, stmt->IsFinalized(), "statement has been finalized");
34553458
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34563459
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3460+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34573461
int r = stmt->ResetStatement();
34583462
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34593463

‎test/parallel/test-sqlite-statement-binding-reentry.js‎
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
'use strict';
2+
3+
const{ skipIfSQLiteMissing, mustCall }=require('../common');
4+
skipIfSQLiteMissing();
5+
constassert=require('node:assert');
6+
const{ test }=require('node:test');
7+
const{ DatabaseSync }=require('node:sqlite');
8+
9+
constreentryError={
10+
code: 'ERR_INVALID_STATE',
11+
message: 'statement is already being executed',
12+
};
13+
14+
// Binding a named parameter reads properties off the supplied object, so a
15+
// getter runs JavaScript after the statement has been reset but before it is
16+
// stepped. Reentering the same statement there resets it a second time and
17+
// hands out a second iterator over one virtual machine.
18+
for(constmethodof['all','get','run','iterate']){
19+
test(`${method}() reentry during parameter binding is rejected`,()=>{
20+
constdb=newDatabaseSync(':memory:');
21+
db.exec(`
22+
 CREATE TABLE data (value INTEGER);
23+
 INSERT INTO data VALUES (1), (2), (3);
24+
 `);
25+
26+
letstatement;
27+
constinvoke=(params)=>(method==='iterate' ?
28+
[...statement.iterate(params)] :
29+
statement[method](params));
30+
constreenter=mustCall(()=>{
31+
assert.throws(()=>invoke({$min: 2}),reentryError);
32+
return1;
33+
});
34+
constparams={get$min(){returnreenter();}};
35+
36+
statement=db.prepare('SELECT value FROM data WHERE value >= $min');
37+
invoke(params);
38+
});
39+
}
40+
41+
test('two iterators cannot share one virtual machine',()=>{
42+
constdb=newDatabaseSync(':memory:');
43+
db.exec(`
44+
 CREATE TABLE data (value INTEGER);
45+
 INSERT INTO data VALUES (1), (2), (3);
46+
 `);
47+
48+
conststatement=db.prepare('SELECT value FROM data WHERE value >= $min');
49+
letinner;
50+
constreenter=mustCall(()=>{
51+
assert.throws(()=>{
52+
inner=statement.iterate({$min: 1});
53+
},reentryError);
54+
return1;
55+
});
56+
constparams={get$min(){returnreenter();}};
57+
58+
assert.deepStrictEqual(
59+
[...statement.iterate(params)].map((row)=>row.value),
60+
[1,2,3],
61+
);
62+
assert.strictEqual(inner,undefined);
63+
});
0 commit comments
Comments
 (0)

, '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
Commit 6ec735c
Browse files
TrevorBurnhamaduh95
TrevorBurnham
authored and
aduh95
committed
sqlite: reject reentry while binding parameters
c4b755e tracks the statements currently being stepped and rejects
reentry into them, but the guard is established inside the execution
helpers, after the entry point has already reset the statement and
bound its parameters. Binding reads properties off the supplied
object, so a named-parameter getter runs JavaScript in that window.
Reentering the same statement there resets it a second time and, for
iterate(), hands out a second iterator; both iterators record the
same reset generation, so neither is invalidated and they interleave
rows from one virtual machine.
Establish the guard at the four StatementSync entry points instead,
before the reset, so it spans binding as well as stepping. The
existing guards inside the helpers are left in place; the stepping
set is a stack, so the nested acquisition is balanced.
Signed-off-by: Trevor Burnham <trevorburnham@gmail.com>
Assisted-by: claude:opus-5
PR-URL: #65294
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 5821362 commit 6ec735c
2 files changed
Lines changed: 67 additions & 0 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3381,6 +3381,7 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
33813381
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
33823382
THROW_AND_RETURN_IF_STEPPING(env, stmt);
33833383
 Isolate* isolate = env->isolate();
3384+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
33843385
int r = stmt->ResetStatement();
33853386
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
33863387

@@ -3408,6 +3409,7 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) {
34083409
 env, stmt->IsFinalized(), "statement has been finalized");
34093410
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34103411
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3412+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34113413
int r = stmt->ResetStatement();
34123414
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34133415

@@ -3433,6 +3435,7 @@ void StatementSync::Get(const FunctionCallbackInfo<Value>& args) {
34333435
 env, stmt->IsFinalized(), "statement has been finalized");
34343436
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34353437
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3438+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34363439
int r = stmt->ResetStatement();
34373440
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34383441

@@ -3454,6 +3457,7 @@ void StatementSync::Run(const FunctionCallbackInfo<Value>& args) {
34543457
 env, stmt->IsFinalized(), "statement has been finalized");
34553458
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34563459
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3460+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34573461
int r = stmt->ResetStatement();
34583462
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34593463

‎test/parallel/test-sqlite-statement-binding-reentry.js‎
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
'use strict';
2+
3+
const{ skipIfSQLiteMissing, mustCall }=require('../common');
4+
skipIfSQLiteMissing();
5+
constassert=require('node:assert');
6+
const{ test }=require('node:test');
7+
const{ DatabaseSync }=require('node:sqlite');
8+
9+
constreentryError={
10+
code: 'ERR_INVALID_STATE',
11+
message: 'statement is already being executed',
12+
};
13+
14+
// Binding a named parameter reads properties off the supplied object, so a
15+
// getter runs JavaScript after the statement has been reset but before it is
16+
// stepped. Reentering the same statement there resets it a second time and
17+
// hands out a second iterator over one virtual machine.
18+
for(constmethodof['all','get','run','iterate']){
19+
test(`${method}() reentry during parameter binding is rejected`,()=>{
20+
constdb=newDatabaseSync(':memory:');
21+
db.exec(`
22+
 CREATE TABLE data (value INTEGER);
23+
 INSERT INTO data VALUES (1), (2), (3);
24+
 `);
25+
26+
letstatement;
27+
constinvoke=(params)=>(method==='iterate' ?
28+
[...statement.iterate(params)] :
29+
statement[method](params));
30+
constreenter=mustCall(()=>{
31+
assert.throws(()=>invoke({$min: 2}),reentryError);
32+
return1;
33+
});
34+
constparams={get$min(){returnreenter();}};
35+
36+
statement=db.prepare('SELECT value FROM data WHERE value >= $min');
37+
invoke(params);
38+
});
39+
}
40+
41+
test('two iterators cannot share one virtual machine',()=>{
42+
constdb=newDatabaseSync(':memory:');
43+
db.exec(`
44+
 CREATE TABLE data (value INTEGER);
45+
 INSERT INTO data VALUES (1), (2), (3);
46+
 `);
47+
48+
conststatement=db.prepare('SELECT value FROM data WHERE value >= $min');
49+
letinner;
50+
constreenter=mustCall(()=>{
51+
assert.throws(()=>{
52+
inner=statement.iterate({$min: 1});
53+
},reentryError);
54+
return1;
55+
});
56+
constparams={get$min(){returnreenter();}};
57+
58+
assert.deepStrictEqual(
59+
[...statement.iterate(params)].map((row)=>row.value),
60+
[1,2,3],
61+
);
62+
assert.strictEqual(inner,undefined);
63+
});
0 commit comments
Comments
 (0)

, '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
Commit 6ec735c
Browse files
TrevorBurnhamaduh95
TrevorBurnham
authored and
aduh95
committed
sqlite: reject reentry while binding parameters
c4b755e tracks the statements currently being stepped and rejects
reentry into them, but the guard is established inside the execution
helpers, after the entry point has already reset the statement and
bound its parameters. Binding reads properties off the supplied
object, so a named-parameter getter runs JavaScript in that window.
Reentering the same statement there resets it a second time and, for
iterate(), hands out a second iterator; both iterators record the
same reset generation, so neither is invalidated and they interleave
rows from one virtual machine.
Establish the guard at the four StatementSync entry points instead,
before the reset, so it spans binding as well as stepping. The
existing guards inside the helpers are left in place; the stepping
set is a stack, so the nested acquisition is balanced.
Signed-off-by: Trevor Burnham <trevorburnham@gmail.com>
Assisted-by: claude:opus-5
PR-URL: #65294
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 5821362 commit 6ec735c
2 files changed
Lines changed: 67 additions & 0 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3381,6 +3381,7 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
33813381
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
33823382
THROW_AND_RETURN_IF_STEPPING(env, stmt);
33833383
 Isolate* isolate = env->isolate();
3384+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
33843385
int r = stmt->ResetStatement();
33853386
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
33863387

@@ -3408,6 +3409,7 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) {
34083409
 env, stmt->IsFinalized(), "statement has been finalized");
34093410
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34103411
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3412+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34113413
int r = stmt->ResetStatement();
34123414
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34133415

@@ -3433,6 +3435,7 @@ void StatementSync::Get(const FunctionCallbackInfo<Value>& args) {
34333435
 env, stmt->IsFinalized(), "statement has been finalized");
34343436
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34353437
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3438+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34363439
int r = stmt->ResetStatement();
34373440
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34383441

@@ -3454,6 +3457,7 @@ void StatementSync::Run(const FunctionCallbackInfo<Value>& args) {
34543457
 env, stmt->IsFinalized(), "statement has been finalized");
34553458
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34563459
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3460+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34573461
int r = stmt->ResetStatement();
34583462
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34593463

‎test/parallel/test-sqlite-statement-binding-reentry.js‎
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
'use strict';
2+
3+
const{ skipIfSQLiteMissing, mustCall }=require('../common');
4+
skipIfSQLiteMissing();
5+
constassert=require('node:assert');
6+
const{ test }=require('node:test');
7+
const{ DatabaseSync }=require('node:sqlite');
8+
9+
constreentryError={
10+
code: 'ERR_INVALID_STATE',
11+
message: 'statement is already being executed',
12+
};
13+
14+
// Binding a named parameter reads properties off the supplied object, so a
15+
// getter runs JavaScript after the statement has been reset but before it is
16+
// stepped. Reentering the same statement there resets it a second time and
17+
// hands out a second iterator over one virtual machine.
18+
for(constmethodof['all','get','run','iterate']){
19+
test(`${method}() reentry during parameter binding is rejected`,()=>{
20+
constdb=newDatabaseSync(':memory:');
21+
db.exec(`
22+
 CREATE TABLE data (value INTEGER);
23+
 INSERT INTO data VALUES (1), (2), (3);
24+
 `);
25+
26+
letstatement;
27+
constinvoke=(params)=>(method==='iterate' ?
28+
[...statement.iterate(params)] :
29+
statement[method](params));
30+
constreenter=mustCall(()=>{
31+
assert.throws(()=>invoke({$min: 2}),reentryError);
32+
return1;
33+
});
34+
constparams={get$min(){returnreenter();}};
35+
36+
statement=db.prepare('SELECT value FROM data WHERE value >= $min');
37+
invoke(params);
38+
});
39+
}
40+
41+
test('two iterators cannot share one virtual machine',()=>{
42+
constdb=newDatabaseSync(':memory:');
43+
db.exec(`
44+
 CREATE TABLE data (value INTEGER);
45+
 INSERT INTO data VALUES (1), (2), (3);
46+
 `);
47+
48+
conststatement=db.prepare('SELECT value FROM data WHERE value >= $min');
49+
letinner;
50+
constreenter=mustCall(()=>{
51+
assert.throws(()=>{
52+
inner=statement.iterate({$min: 1});
53+
},reentryError);
54+
return1;
55+
});
56+
constparams={get$min(){returnreenter();}};
57+
58+
assert.deepStrictEqual(
59+
[...statement.iterate(params)].map((row)=>row.value),
60+
[1,2,3],
61+
);
62+
assert.strictEqual(inner,undefined);
63+
});
0 commit comments
Comments
 (0)

, '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
Commit 6ec735c
Browse files
TrevorBurnhamaduh95
TrevorBurnham
authored and
aduh95
committed
sqlite: reject reentry while binding parameters
c4b755e tracks the statements currently being stepped and rejects
reentry into them, but the guard is established inside the execution
helpers, after the entry point has already reset the statement and
bound its parameters. Binding reads properties off the supplied
object, so a named-parameter getter runs JavaScript in that window.
Reentering the same statement there resets it a second time and, for
iterate(), hands out a second iterator; both iterators record the
same reset generation, so neither is invalidated and they interleave
rows from one virtual machine.
Establish the guard at the four StatementSync entry points instead,
before the reset, so it spans binding as well as stepping. The
existing guards inside the helpers are left in place; the stepping
set is a stack, so the nested acquisition is balanced.
Signed-off-by: Trevor Burnham <trevorburnham@gmail.com>
Assisted-by: claude:opus-5
PR-URL: #65294
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 5821362 commit 6ec735c
2 files changed
Lines changed: 67 additions & 0 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3381,6 +3381,7 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
33813381
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
33823382
THROW_AND_RETURN_IF_STEPPING(env, stmt);
33833383
 Isolate* isolate = env->isolate();
3384+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
33843385
int r = stmt->ResetStatement();
33853386
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
33863387

@@ -3408,6 +3409,7 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) {
34083409
 env, stmt->IsFinalized(), "statement has been finalized");
34093410
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34103411
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3412+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34113413
int r = stmt->ResetStatement();
34123414
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34133415

@@ -3433,6 +3435,7 @@ void StatementSync::Get(const FunctionCallbackInfo<Value>& args) {
34333435
 env, stmt->IsFinalized(), "statement has been finalized");
34343436
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34353437
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3438+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34363439
int r = stmt->ResetStatement();
34373440
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34383441

@@ -3454,6 +3457,7 @@ void StatementSync::Run(const FunctionCallbackInfo<Value>& args) {
34543457
 env, stmt->IsFinalized(), "statement has been finalized");
34553458
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34563459
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3460+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34573461
int r = stmt->ResetStatement();
34583462
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34593463

‎test/parallel/test-sqlite-statement-binding-reentry.js‎
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
'use strict';
2+
3+
const{ skipIfSQLiteMissing, mustCall }=require('../common');
4+
skipIfSQLiteMissing();
5+
constassert=require('node:assert');
6+
const{ test }=require('node:test');
7+
const{ DatabaseSync }=require('node:sqlite');
8+
9+
constreentryError={
10+
code: 'ERR_INVALID_STATE',
11+
message: 'statement is already being executed',
12+
};
13+
14+
// Binding a named parameter reads properties off the supplied object, so a
15+
// getter runs JavaScript after the statement has been reset but before it is
16+
// stepped. Reentering the same statement there resets it a second time and
17+
// hands out a second iterator over one virtual machine.
18+
for(constmethodof['all','get','run','iterate']){
19+
test(`${method}() reentry during parameter binding is rejected`,()=>{
20+
constdb=newDatabaseSync(':memory:');
21+
db.exec(`
22+
 CREATE TABLE data (value INTEGER);
23+
 INSERT INTO data VALUES (1), (2), (3);
24+
 `);
25+
26+
letstatement;
27+
constinvoke=(params)=>(method==='iterate' ?
28+
[...statement.iterate(params)] :
29+
statement[method](params));
30+
constreenter=mustCall(()=>{
31+
assert.throws(()=>invoke({$min: 2}),reentryError);
32+
return1;
33+
});
34+
constparams={get$min(){returnreenter();}};
35+
36+
statement=db.prepare('SELECT value FROM data WHERE value >= $min');
37+
invoke(params);
38+
});
39+
}
40+
41+
test('two iterators cannot share one virtual machine',()=>{
42+
constdb=newDatabaseSync(':memory:');
43+
db.exec(`
44+
 CREATE TABLE data (value INTEGER);
45+
 INSERT INTO data VALUES (1), (2), (3);
46+
 `);
47+
48+
conststatement=db.prepare('SELECT value FROM data WHERE value >= $min');
49+
letinner;
50+
constreenter=mustCall(()=>{
51+
assert.throws(()=>{
52+
inner=statement.iterate({$min: 1});
53+
},reentryError);
54+
return1;
55+
});
56+
constparams={get$min(){returnreenter();}};
57+
58+
assert.deepStrictEqual(
59+
[...statement.iterate(params)].map((row)=>row.value),
60+
[1,2,3],
61+
);
62+
assert.strictEqual(inner,undefined);
63+
});
0 commit comments
Comments
 (0)

, '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
Commit 6ec735c
Browse files
TrevorBurnhamaduh95
TrevorBurnham
authored and
aduh95
committed
sqlite: reject reentry while binding parameters
c4b755e tracks the statements currently being stepped and rejects
reentry into them, but the guard is established inside the execution
helpers, after the entry point has already reset the statement and
bound its parameters. Binding reads properties off the supplied
object, so a named-parameter getter runs JavaScript in that window.
Reentering the same statement there resets it a second time and, for
iterate(), hands out a second iterator; both iterators record the
same reset generation, so neither is invalidated and they interleave
rows from one virtual machine.
Establish the guard at the four StatementSync entry points instead,
before the reset, so it spans binding as well as stepping. The
existing guards inside the helpers are left in place; the stepping
set is a stack, so the nested acquisition is balanced.
Signed-off-by: Trevor Burnham <trevorburnham@gmail.com>
Assisted-by: claude:opus-5
PR-URL: #65294
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 5821362 commit 6ec735c
2 files changed
Lines changed: 67 additions & 0 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3381,6 +3381,7 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
33813381
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
33823382
THROW_AND_RETURN_IF_STEPPING(env, stmt);
33833383
 Isolate* isolate = env->isolate();
3384+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
33843385
int r = stmt->ResetStatement();
33853386
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
33863387

@@ -3408,6 +3409,7 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) {
34083409
 env, stmt->IsFinalized(), "statement has been finalized");
34093410
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34103411
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3412+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34113413
int r = stmt->ResetStatement();
34123414
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34133415

@@ -3433,6 +3435,7 @@ void StatementSync::Get(const FunctionCallbackInfo<Value>& args) {
34333435
 env, stmt->IsFinalized(), "statement has been finalized");
34343436
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34353437
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3438+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34363439
int r = stmt->ResetStatement();
34373440
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34383441

@@ -3454,6 +3457,7 @@ void StatementSync::Run(const FunctionCallbackInfo<Value>& args) {
34543457
 env, stmt->IsFinalized(), "statement has been finalized");
34553458
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34563459
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3460+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34573461
int r = stmt->ResetStatement();
34583462
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34593463

‎test/parallel/test-sqlite-statement-binding-reentry.js‎
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
'use strict';
2+
3+
const{ skipIfSQLiteMissing, mustCall }=require('../common');
4+
skipIfSQLiteMissing();
5+
constassert=require('node:assert');
6+
const{ test }=require('node:test');
7+
const{ DatabaseSync }=require('node:sqlite');
8+
9+
constreentryError={
10+
code: 'ERR_INVALID_STATE',
11+
message: 'statement is already being executed',
12+
};
13+
14+
// Binding a named parameter reads properties off the supplied object, so a
15+
// getter runs JavaScript after the statement has been reset but before it is
16+
// stepped. Reentering the same statement there resets it a second time and
17+
// hands out a second iterator over one virtual machine.
18+
for(constmethodof['all','get','run','iterate']){
19+
test(`${method}() reentry during parameter binding is rejected`,()=>{
20+
constdb=newDatabaseSync(':memory:');
21+
db.exec(`
22+
 CREATE TABLE data (value INTEGER);
23+
 INSERT INTO data VALUES (1), (2), (3);
24+
 `);
25+
26+
letstatement;
27+
constinvoke=(params)=>(method==='iterate' ?
28+
[...statement.iterate(params)] :
29+
statement[method](params));
30+
constreenter=mustCall(()=>{
31+
assert.throws(()=>invoke({$min: 2}),reentryError);
32+
return1;
33+
});
34+
constparams={get$min(){returnreenter();}};
35+
36+
statement=db.prepare('SELECT value FROM data WHERE value >= $min');
37+
invoke(params);
38+
});
39+
}
40+
41+
test('two iterators cannot share one virtual machine',()=>{
42+
constdb=newDatabaseSync(':memory:');
43+
db.exec(`
44+
 CREATE TABLE data (value INTEGER);
45+
 INSERT INTO data VALUES (1), (2), (3);
46+
 `);
47+
48+
conststatement=db.prepare('SELECT value FROM data WHERE value >= $min');
49+
letinner;
50+
constreenter=mustCall(()=>{
51+
assert.throws(()=>{
52+
inner=statement.iterate({$min: 1});
53+
},reentryError);
54+
return1;
55+
});
56+
constparams={get$min(){returnreenter();}};
57+
58+
assert.deepStrictEqual(
59+
[...statement.iterate(params)].map((row)=>row.value),
60+
[1,2,3],
61+
);
62+
assert.strictEqual(inner,undefined);
63+
});
0 commit comments
Comments
 (0)

, '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
Commit 6ec735c
Browse files
TrevorBurnhamaduh95
TrevorBurnham
authored and
aduh95
committed
sqlite: reject reentry while binding parameters
c4b755e tracks the statements currently being stepped and rejects
reentry into them, but the guard is established inside the execution
helpers, after the entry point has already reset the statement and
bound its parameters. Binding reads properties off the supplied
object, so a named-parameter getter runs JavaScript in that window.
Reentering the same statement there resets it a second time and, for
iterate(), hands out a second iterator; both iterators record the
same reset generation, so neither is invalidated and they interleave
rows from one virtual machine.
Establish the guard at the four StatementSync entry points instead,
before the reset, so it spans binding as well as stepping. The
existing guards inside the helpers are left in place; the stepping
set is a stack, so the nested acquisition is balanced.
Signed-off-by: Trevor Burnham <trevorburnham@gmail.com>
Assisted-by: claude:opus-5
PR-URL: #65294
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 5821362 commit 6ec735c
2 files changed
Lines changed: 67 additions & 0 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3381,6 +3381,7 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
33813381
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
33823382
THROW_AND_RETURN_IF_STEPPING(env, stmt);
33833383
 Isolate* isolate = env->isolate();
3384+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
33843385
int r = stmt->ResetStatement();
33853386
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
33863387

@@ -3408,6 +3409,7 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) {
34083409
 env, stmt->IsFinalized(), "statement has been finalized");
34093410
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34103411
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3412+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34113413
int r = stmt->ResetStatement();
34123414
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34133415

@@ -3433,6 +3435,7 @@ void StatementSync::Get(const FunctionCallbackInfo<Value>& args) {
34333435
 env, stmt->IsFinalized(), "statement has been finalized");
34343436
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34353437
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3438+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34363439
int r = stmt->ResetStatement();
34373440
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34383441

@@ -3454,6 +3457,7 @@ void StatementSync::Run(const FunctionCallbackInfo<Value>& args) {
34543457
 env, stmt->IsFinalized(), "statement has been finalized");
34553458
THROW_AND_RETURN_IF_IN_AUTHORIZER(env, stmt->db_.get());
34563459
THROW_AND_RETURN_IF_STEPPING(env, stmt);
3460+
 SteppingStatementGuard stepping(stmt->db_.get(), stmt->statement_.get());
34573461
int r = stmt->ResetStatement();
34583462
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
34593463

‎test/parallel/test-sqlite-statement-binding-reentry.js‎
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
'use strict';
2+
3+
const{ skipIfSQLiteMissing, mustCall }=require('../common');
4+
skipIfSQLiteMissing();
5+
constassert=require('node:assert');
6+
const{ test }=require('node:test');
7+
const{ DatabaseSync }=require('node:sqlite');
8+
9+
constreentryError={
10+
code: 'ERR_INVALID_STATE',
11+
message: 'statement is already being executed',
12+
};
13+
14+
// Binding a named parameter reads properties off the supplied object, so a
15+
// getter runs JavaScript after the statement has been reset but before it is
16+
// stepped. Reentering the same statement there resets it a second time and
17+
// hands out a second iterator over one virtual machine.
18+
for(constmethodof['all','get','run','iterate']){
19+
test(`${method}() reentry during parameter binding is rejected`,()=>{
20+
constdb=newDatabaseSync(':memory:');
21+
db.exec(`
22+
 CREATE TABLE data (value INTEGER);
23+
 INSERT INTO data VALUES (1), (2), (3);
24+
 `);
25+
26+
letstatement;
27+
constinvoke=(params)=>(method==='iterate' ?
28+
[...statement.iterate(params)] :
29+
statement[method](params));
30+
constreenter=mustCall(()=>{
31+
assert.throws(()=>invoke({$min: 2}),reentryError);
32+
return1;
33+
});
34+
constparams={get$min(){returnreenter();}};
35+
36+
statement=db.prepare('SELECT value FROM data WHERE value >= $min');
37+
invoke(params);
38+
});
39+
}
40+
41+
test('two iterators cannot share one virtual machine',()=>{
42+
constdb=newDatabaseSync(':memory:');
43+
db.exec(`
44+
 CREATE TABLE data (value INTEGER);
45+
 INSERT INTO data VALUES (1), (2), (3);
46+
 `);
47+
48+
conststatement=db.prepare('SELECT value FROM data WHERE value >= $min');
49+
letinner;
50+
constreenter=mustCall(()=>{
51+
assert.throws(()=>{
52+
inner=statement.iterate({$min: 1});
53+
},reentryError);
54+
return1;
55+
});
56+
constparams={get$min(){returnreenter();}};
57+
58+
assert.deepStrictEqual(
59+
[...statement.iterate(params)].map((row)=>row.value),
60+
[1,2,3],
61+
);
62+
assert.strictEqual(inner,undefined);
63+
});
0 commit comments
Comments
 (0)