Commit ce0ca47

Browse files
mcollinaaduh95
authored andcommitted
sqlite: clear SQLTagStore bindings
SQLTagStore reused cached statements without clearing values bound by a previous execution. Clear bindings before binding new values and reject parameters that do not correspond to template substitutions. Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #65041 Reviewed-By: RenΓ© <contact.9a5d6388@renegade334.me.uk> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 4f2c634 commit ce0ca47

3 files changed

Lines changed: 78 additions & 42 deletions

File tree

β€Žsrc/node_sqlite.ccβ€Ž

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3431,6 +3431,35 @@ void SQLTagStore::SizeGetter(const FunctionCallbackInfo<Value>& args) {
34313431
args.GetReturnValue().Set(static_cast<double>(store->sql_tags_.Size()));
34323432
}
34333433

3434+
boolSQLTagStore::ResetAndBindStatement(
3435+
Environment* env,
3436+
StatementSync* stmt,
3437+
const FunctionCallbackInfo<Value>& args) {
3438+
Isolate* isolate = env->isolate();
3439+
int r = stmt->ResetStatement();
3440+
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, false);
3441+
3442+
r = sqlite3_clear_bindings(stmt->statement_);
3443+
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, false);
3444+
3445+
uint32_t n_params = args.Length() - 1;
3446+
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3447+
if (param_count != static_cast<int>(n_params)) {
3448+
THROW_ERR_INVALID_ARG_VALUE(
3449+
env,
3450+
"SQLite parameters must be bound using template literal placeholders.");
3451+
returnfalse;
3452+
}
3453+
3454+
for (int i = 0; i < param_count; ++i) {
3455+
if (!stmt->BindValue(args[i + 1], i + 1)) {
3456+
returnfalse;
3457+
}
3458+
}
3459+
3460+
returntrue;
3461+
}
3462+
34343463
voidSQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
34353464
SQLTagStore* session;
34363465
ASSIGN_OR_RETURN_UNWRAP(&session, args.This());
@@ -3445,15 +3474,8 @@ void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
34453474
return;
34463475
}
34473476

3448-
uint32_t n_params = args.Length() - 1;
3449-
int r = stmt->ResetStatement();
3450-
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
3451-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3452-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3453-
Local<Value> value = args[i + 1];
3454-
if (!stmt->BindValue(value, i + 1)) {
3455-
return;
3456-
}
3477+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3478+
return;
34573479
}
34583480

34593481
Local<Object> result;
@@ -3478,15 +3500,8 @@ void SQLTagStore::Iterate(const FunctionCallbackInfo<Value>& args) {
34783500
return;
34793501
}
34803502

3481-
uint32_t n_params = args.Length() - 1;
3482-
int r = stmt->ResetStatement();
3483-
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
3484-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3485-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3486-
Local<Value> value = args[i + 1];
3487-
if (!stmt->BindValue(value, i + 1)) {
3488-
return;
3489-
}
3503+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3504+
return;
34903505
}
34913506

34923507
BaseObjectPtr<StatementSyncIterator> iter = StatementExecutionHelper::Iterate(
@@ -3513,18 +3528,8 @@ void SQLTagStore::Get(const FunctionCallbackInfo<Value>& args) {
35133528
return;
35143529
}
35153530

3516-
uint32_t n_params = args.Length() - 1;
3517-
Isolate* isolate = env->isolate();
3518-
3519-
int r = stmt->ResetStatement();
3520-
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
3521-
3522-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3523-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3524-
Local<Value> value = args[i + 1];
3525-
if (!stmt->BindValue(value, i + 1)) {
3526-
return;
3527-
}
3531+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3532+
return;
35283533
}
35293534

35303535
Local<Value> result;
@@ -3552,18 +3557,8 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
35523557
return;
35533558
}
35543559

3555-
uint32_t n_params = args.Length() - 1;
3556-
Isolate* isolate = env->isolate();
3557-
3558-
int r = stmt->ResetStatement();
3559-
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
3560-
3561-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3562-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3563-
Local<Value> value = args[i + 1];
3564-
if (!stmt->BindValue(value, i + 1)) {
3565-
return;
3566-
}
3560+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3561+
return;
35673562
}
35683563

35693564
auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });

β€Žsrc/node_sqlite.hβ€Ž

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,10 @@ class SQLTagStore : public BaseObject {
404404
private:
405405
static BaseObjectPtr<StatementSync> PrepareStatement(
406406
const v8::FunctionCallbackInfo<v8::Value>& args);
407+
staticboolResetAndBindStatement(
408+
Environment* env,
409+
StatementSync* stmt,
410+
const v8::FunctionCallbackInfo<v8::Value>& args);
407411
BaseObjectWeakPtr<DatabaseSync> database_;
408412
LRUCache<std::string, BaseObjectPtr<StatementSync>> sql_tags_;
409413
friendclassStatementExecutionHelper;

β€Žtest/parallel/test-sqlite-template-tag.jsβ€Ž

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,43 @@ test('queries with no results', () => {
9090
assert.strictEqual(count,0);
9191
});
9292

93+
test('rejects parameters outside of template expressions',()=>{
94+
constldb=newDatabaseSync(':memory:');
95+
constlsql=ldb.createTagStore();
96+
ldb.exec(`
97+
CREATE TABLE secrets(owner TEXT, token TEXT);
98+
INSERT INTO secrets VALUES ('victim', 'secret');
99+
CREATE TABLE transfers(from_user TEXT, amount INTEGER);
100+
`);
101+
102+
constexpectedError={
103+
code: 'ERR_INVALID_ARG_VALUE',
104+
message: /mustbeboundusingtemplateliteralplaceholders/,
105+
};
106+
107+
for(constmethodof['get','all','iterate']){
108+
// Prime the cached statement with a bound value before each attempt.
109+
// eslint-disable-next-line no-unused-expressions
110+
lsql.all`SELECT token FROM secrets WHERE owner = ${'victim'}`;
111+
assert.throws(()=>{
112+
// eslint-disable-next-line no-unused-expressions
113+
lsql[method]`SELECT token FROM secrets WHERE owner = ?`;
114+
},expectedError);
115+
}
116+
117+
// eslint-disable-next-line no-unused-expressions
118+
lsql.run`INSERT INTO transfers VALUES (${'victim'},${100})`;
119+
assert.throws(()=>{
120+
// eslint-disable-next-line no-unused-expressions
121+
lsql.run`INSERT INTO transfers VALUES (?,?)`;
122+
},expectedError);
123+
assert.strictEqual(
124+
ldb.prepare('SELECT COUNT(*) AS count FROM transfers').get().count,
125+
1);
126+
127+
ldb.close();
128+
});
129+
93130
test('TagStore capacity, size, and clear',()=>{
94131
assert.strictEqual(sql.capacity,10);
95132
assert.strictEqual(sql.size,0);

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 ce0ca47

Browse files
mcollinaaduh95
authored andcommitted
sqlite: clear SQLTagStore bindings
SQLTagStore reused cached statements without clearing values bound by a previous execution. Clear bindings before binding new values and reject parameters that do not correspond to template substitutions. Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #65041 Reviewed-By: RenΓ© <contact.9a5d6388@renegade334.me.uk> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 4f2c634 commit ce0ca47

3 files changed

Lines changed: 78 additions & 42 deletions

File tree

β€Žsrc/node_sqlite.ccβ€Ž

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3431,6 +3431,35 @@ void SQLTagStore::SizeGetter(const FunctionCallbackInfo<Value>& args) {
34313431
args.GetReturnValue().Set(static_cast<double>(store->sql_tags_.Size()));
34323432
}
34333433

3434+
boolSQLTagStore::ResetAndBindStatement(
3435+
Environment* env,
3436+
StatementSync* stmt,
3437+
const FunctionCallbackInfo<Value>& args) {
3438+
Isolate* isolate = env->isolate();
3439+
int r = stmt->ResetStatement();
3440+
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, false);
3441+
3442+
r = sqlite3_clear_bindings(stmt->statement_);
3443+
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, false);
3444+
3445+
uint32_t n_params = args.Length() - 1;
3446+
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3447+
if (param_count != static_cast<int>(n_params)) {
3448+
THROW_ERR_INVALID_ARG_VALUE(
3449+
env,
3450+
"SQLite parameters must be bound using template literal placeholders.");
3451+
returnfalse;
3452+
}
3453+
3454+
for (int i = 0; i < param_count; ++i) {
3455+
if (!stmt->BindValue(args[i + 1], i + 1)) {
3456+
returnfalse;
3457+
}
3458+
}
3459+
3460+
returntrue;
3461+
}
3462+
34343463
voidSQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
34353464
SQLTagStore* session;
34363465
ASSIGN_OR_RETURN_UNWRAP(&session, args.This());
@@ -3445,15 +3474,8 @@ void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
34453474
return;
34463475
}
34473476

3448-
uint32_t n_params = args.Length() - 1;
3449-
int r = stmt->ResetStatement();
3450-
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
3451-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3452-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3453-
Local<Value> value = args[i + 1];
3454-
if (!stmt->BindValue(value, i + 1)) {
3455-
return;
3456-
}
3477+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3478+
return;
34573479
}
34583480

34593481
Local<Object> result;
@@ -3478,15 +3500,8 @@ void SQLTagStore::Iterate(const FunctionCallbackInfo<Value>& args) {
34783500
return;
34793501
}
34803502

3481-
uint32_t n_params = args.Length() - 1;
3482-
int r = stmt->ResetStatement();
3483-
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
3484-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3485-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3486-
Local<Value> value = args[i + 1];
3487-
if (!stmt->BindValue(value, i + 1)) {
3488-
return;
3489-
}
3503+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3504+
return;
34903505
}
34913506

34923507
BaseObjectPtr<StatementSyncIterator> iter = StatementExecutionHelper::Iterate(
@@ -3513,18 +3528,8 @@ void SQLTagStore::Get(const FunctionCallbackInfo<Value>& args) {
35133528
return;
35143529
}
35153530

3516-
uint32_t n_params = args.Length() - 1;
3517-
Isolate* isolate = env->isolate();
3518-
3519-
int r = stmt->ResetStatement();
3520-
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
3521-
3522-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3523-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3524-
Local<Value> value = args[i + 1];
3525-
if (!stmt->BindValue(value, i + 1)) {
3526-
return;
3527-
}
3531+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3532+
return;
35283533
}
35293534

35303535
Local<Value> result;
@@ -3552,18 +3557,8 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
35523557
return;
35533558
}
35543559

3555-
uint32_t n_params = args.Length() - 1;
3556-
Isolate* isolate = env->isolate();
3557-
3558-
int r = stmt->ResetStatement();
3559-
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
3560-
3561-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3562-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3563-
Local<Value> value = args[i + 1];
3564-
if (!stmt->BindValue(value, i + 1)) {
3565-
return;
3566-
}
3560+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3561+
return;
35673562
}
35683563

35693564
auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });

β€Žsrc/node_sqlite.hβ€Ž

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,10 @@ class SQLTagStore : public BaseObject {
404404
private:
405405
static BaseObjectPtr<StatementSync> PrepareStatement(
406406
const v8::FunctionCallbackInfo<v8::Value>& args);
407+
staticboolResetAndBindStatement(
408+
Environment* env,
409+
StatementSync* stmt,
410+
const v8::FunctionCallbackInfo<v8::Value>& args);
407411
BaseObjectWeakPtr<DatabaseSync> database_;
408412
LRUCache<std::string, BaseObjectPtr<StatementSync>> sql_tags_;
409413
friendclassStatementExecutionHelper;

β€Žtest/parallel/test-sqlite-template-tag.jsβ€Ž

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,43 @@ test('queries with no results', () => {
9090
assert.strictEqual(count,0);
9191
});
9292

93+
test('rejects parameters outside of template expressions',()=>{
94+
constldb=newDatabaseSync(':memory:');
95+
constlsql=ldb.createTagStore();
96+
ldb.exec(`
97+
CREATE TABLE secrets(owner TEXT, token TEXT);
98+
INSERT INTO secrets VALUES ('victim', 'secret');
99+
CREATE TABLE transfers(from_user TEXT, amount INTEGER);
100+
`);
101+
102+
constexpectedError={
103+
code: 'ERR_INVALID_ARG_VALUE',
104+
message: /mustbeboundusingtemplateliteralplaceholders/,
105+
};
106+
107+
for(constmethodof['get','all','iterate']){
108+
// Prime the cached statement with a bound value before each attempt.
109+
// eslint-disable-next-line no-unused-expressions
110+
lsql.all`SELECT token FROM secrets WHERE owner = ${'victim'}`;
111+
assert.throws(()=>{
112+
// eslint-disable-next-line no-unused-expressions
113+
lsql[method]`SELECT token FROM secrets WHERE owner = ?`;
114+
},expectedError);
115+
}
116+
117+
// eslint-disable-next-line no-unused-expressions
118+
lsql.run`INSERT INTO transfers VALUES (${'victim'},${100})`;
119+
assert.throws(()=>{
120+
// eslint-disable-next-line no-unused-expressions
121+
lsql.run`INSERT INTO transfers VALUES (?,?)`;
122+
},expectedError);
123+
assert.strictEqual(
124+
ldb.prepare('SELECT COUNT(*) AS count FROM transfers').get().count,
125+
1);
126+
127+
ldb.close();
128+
});
129+
93130
test('TagStore capacity, size, and clear',()=>{
94131
assert.strictEqual(sql.capacity,10);
95132
assert.strictEqual(sql.size,0);

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 ce0ca47

Browse files
mcollinaaduh95
authored andcommitted
sqlite: clear SQLTagStore bindings
SQLTagStore reused cached statements without clearing values bound by a previous execution. Clear bindings before binding new values and reject parameters that do not correspond to template substitutions. Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #65041 Reviewed-By: RenΓ© <contact.9a5d6388@renegade334.me.uk> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 4f2c634 commit ce0ca47

3 files changed

Lines changed: 78 additions & 42 deletions

File tree

β€Žsrc/node_sqlite.ccβ€Ž

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3431,6 +3431,35 @@ void SQLTagStore::SizeGetter(const FunctionCallbackInfo<Value>& args) {
34313431
args.GetReturnValue().Set(static_cast<double>(store->sql_tags_.Size()));
34323432
}
34333433

3434+
boolSQLTagStore::ResetAndBindStatement(
3435+
Environment* env,
3436+
StatementSync* stmt,
3437+
const FunctionCallbackInfo<Value>& args) {
3438+
Isolate* isolate = env->isolate();
3439+
int r = stmt->ResetStatement();
3440+
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, false);
3441+
3442+
r = sqlite3_clear_bindings(stmt->statement_);
3443+
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, false);
3444+
3445+
uint32_t n_params = args.Length() - 1;
3446+
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3447+
if (param_count != static_cast<int>(n_params)) {
3448+
THROW_ERR_INVALID_ARG_VALUE(
3449+
env,
3450+
"SQLite parameters must be bound using template literal placeholders.");
3451+
returnfalse;
3452+
}
3453+
3454+
for (int i = 0; i < param_count; ++i) {
3455+
if (!stmt->BindValue(args[i + 1], i + 1)) {
3456+
returnfalse;
3457+
}
3458+
}
3459+
3460+
returntrue;
3461+
}
3462+
34343463
voidSQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
34353464
SQLTagStore* session;
34363465
ASSIGN_OR_RETURN_UNWRAP(&session, args.This());
@@ -3445,15 +3474,8 @@ void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
34453474
return;
34463475
}
34473476

3448-
uint32_t n_params = args.Length() - 1;
3449-
int r = stmt->ResetStatement();
3450-
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
3451-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3452-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3453-
Local<Value> value = args[i + 1];
3454-
if (!stmt->BindValue(value, i + 1)) {
3455-
return;
3456-
}
3477+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3478+
return;
34573479
}
34583480

34593481
Local<Object> result;
@@ -3478,15 +3500,8 @@ void SQLTagStore::Iterate(const FunctionCallbackInfo<Value>& args) {
34783500
return;
34793501
}
34803502

3481-
uint32_t n_params = args.Length() - 1;
3482-
int r = stmt->ResetStatement();
3483-
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
3484-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3485-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3486-
Local<Value> value = args[i + 1];
3487-
if (!stmt->BindValue(value, i + 1)) {
3488-
return;
3489-
}
3503+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3504+
return;
34903505
}
34913506

34923507
BaseObjectPtr<StatementSyncIterator> iter = StatementExecutionHelper::Iterate(
@@ -3513,18 +3528,8 @@ void SQLTagStore::Get(const FunctionCallbackInfo<Value>& args) {
35133528
return;
35143529
}
35153530

3516-
uint32_t n_params = args.Length() - 1;
3517-
Isolate* isolate = env->isolate();
3518-
3519-
int r = stmt->ResetStatement();
3520-
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
3521-
3522-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3523-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3524-
Local<Value> value = args[i + 1];
3525-
if (!stmt->BindValue(value, i + 1)) {
3526-
return;
3527-
}
3531+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3532+
return;
35283533
}
35293534

35303535
Local<Value> result;
@@ -3552,18 +3557,8 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
35523557
return;
35533558
}
35543559

3555-
uint32_t n_params = args.Length() - 1;
3556-
Isolate* isolate = env->isolate();
3557-
3558-
int r = stmt->ResetStatement();
3559-
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
3560-
3561-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3562-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3563-
Local<Value> value = args[i + 1];
3564-
if (!stmt->BindValue(value, i + 1)) {
3565-
return;
3566-
}
3560+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3561+
return;
35673562
}
35683563

35693564
auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });

β€Žsrc/node_sqlite.hβ€Ž

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,10 @@ class SQLTagStore : public BaseObject {
404404
private:
405405
static BaseObjectPtr<StatementSync> PrepareStatement(
406406
const v8::FunctionCallbackInfo<v8::Value>& args);
407+
staticboolResetAndBindStatement(
408+
Environment* env,
409+
StatementSync* stmt,
410+
const v8::FunctionCallbackInfo<v8::Value>& args);
407411
BaseObjectWeakPtr<DatabaseSync> database_;
408412
LRUCache<std::string, BaseObjectPtr<StatementSync>> sql_tags_;
409413
friendclassStatementExecutionHelper;

β€Žtest/parallel/test-sqlite-template-tag.jsβ€Ž

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,43 @@ test('queries with no results', () => {
9090
assert.strictEqual(count,0);
9191
});
9292

93+
test('rejects parameters outside of template expressions',()=>{
94+
constldb=newDatabaseSync(':memory:');
95+
constlsql=ldb.createTagStore();
96+
ldb.exec(`
97+
CREATE TABLE secrets(owner TEXT, token TEXT);
98+
INSERT INTO secrets VALUES ('victim', 'secret');
99+
CREATE TABLE transfers(from_user TEXT, amount INTEGER);
100+
`);
101+
102+
constexpectedError={
103+
code: 'ERR_INVALID_ARG_VALUE',
104+
message: /mustbeboundusingtemplateliteralplaceholders/,
105+
};
106+
107+
for(constmethodof['get','all','iterate']){
108+
// Prime the cached statement with a bound value before each attempt.
109+
// eslint-disable-next-line no-unused-expressions
110+
lsql.all`SELECT token FROM secrets WHERE owner = ${'victim'}`;
111+
assert.throws(()=>{
112+
// eslint-disable-next-line no-unused-expressions
113+
lsql[method]`SELECT token FROM secrets WHERE owner = ?`;
114+
},expectedError);
115+
}
116+
117+
// eslint-disable-next-line no-unused-expressions
118+
lsql.run`INSERT INTO transfers VALUES (${'victim'},${100})`;
119+
assert.throws(()=>{
120+
// eslint-disable-next-line no-unused-expressions
121+
lsql.run`INSERT INTO transfers VALUES (?,?)`;
122+
},expectedError);
123+
assert.strictEqual(
124+
ldb.prepare('SELECT COUNT(*) AS count FROM transfers').get().count,
125+
1);
126+
127+
ldb.close();
128+
});
129+
93130
test('TagStore capacity, size, and clear',()=>{
94131
assert.strictEqual(sql.capacity,10);
95132
assert.strictEqual(sql.size,0);

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 ce0ca47

Browse files
mcollinaaduh95
authored andcommitted
sqlite: clear SQLTagStore bindings
SQLTagStore reused cached statements without clearing values bound by a previous execution. Clear bindings before binding new values and reject parameters that do not correspond to template substitutions. Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #65041 Reviewed-By: RenΓ© <contact.9a5d6388@renegade334.me.uk> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 4f2c634 commit ce0ca47

3 files changed

Lines changed: 78 additions & 42 deletions

File tree

β€Žsrc/node_sqlite.ccβ€Ž

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3431,6 +3431,35 @@ void SQLTagStore::SizeGetter(const FunctionCallbackInfo<Value>& args) {
34313431
args.GetReturnValue().Set(static_cast<double>(store->sql_tags_.Size()));
34323432
}
34333433

3434+
boolSQLTagStore::ResetAndBindStatement(
3435+
Environment* env,
3436+
StatementSync* stmt,
3437+
const FunctionCallbackInfo<Value>& args) {
3438+
Isolate* isolate = env->isolate();
3439+
int r = stmt->ResetStatement();
3440+
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, false);
3441+
3442+
r = sqlite3_clear_bindings(stmt->statement_);
3443+
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, false);
3444+
3445+
uint32_t n_params = args.Length() - 1;
3446+
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3447+
if (param_count != static_cast<int>(n_params)) {
3448+
THROW_ERR_INVALID_ARG_VALUE(
3449+
env,
3450+
"SQLite parameters must be bound using template literal placeholders.");
3451+
returnfalse;
3452+
}
3453+
3454+
for (int i = 0; i < param_count; ++i) {
3455+
if (!stmt->BindValue(args[i + 1], i + 1)) {
3456+
returnfalse;
3457+
}
3458+
}
3459+
3460+
returntrue;
3461+
}
3462+
34343463
voidSQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
34353464
SQLTagStore* session;
34363465
ASSIGN_OR_RETURN_UNWRAP(&session, args.This());
@@ -3445,15 +3474,8 @@ void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
34453474
return;
34463475
}
34473476

3448-
uint32_t n_params = args.Length() - 1;
3449-
int r = stmt->ResetStatement();
3450-
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
3451-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3452-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3453-
Local<Value> value = args[i + 1];
3454-
if (!stmt->BindValue(value, i + 1)) {
3455-
return;
3456-
}
3477+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3478+
return;
34573479
}
34583480

34593481
Local<Object> result;
@@ -3478,15 +3500,8 @@ void SQLTagStore::Iterate(const FunctionCallbackInfo<Value>& args) {
34783500
return;
34793501
}
34803502

3481-
uint32_t n_params = args.Length() - 1;
3482-
int r = stmt->ResetStatement();
3483-
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
3484-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3485-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3486-
Local<Value> value = args[i + 1];
3487-
if (!stmt->BindValue(value, i + 1)) {
3488-
return;
3489-
}
3503+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3504+
return;
34903505
}
34913506

34923507
BaseObjectPtr<StatementSyncIterator> iter = StatementExecutionHelper::Iterate(
@@ -3513,18 +3528,8 @@ void SQLTagStore::Get(const FunctionCallbackInfo<Value>& args) {
35133528
return;
35143529
}
35153530

3516-
uint32_t n_params = args.Length() - 1;
3517-
Isolate* isolate = env->isolate();
3518-
3519-
int r = stmt->ResetStatement();
3520-
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
3521-
3522-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3523-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3524-
Local<Value> value = args[i + 1];
3525-
if (!stmt->BindValue(value, i + 1)) {
3526-
return;
3527-
}
3531+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3532+
return;
35283533
}
35293534

35303535
Local<Value> result;
@@ -3552,18 +3557,8 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
35523557
return;
35533558
}
35543559

3555-
uint32_t n_params = args.Length() - 1;
3556-
Isolate* isolate = env->isolate();
3557-
3558-
int r = stmt->ResetStatement();
3559-
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
3560-
3561-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3562-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3563-
Local<Value> value = args[i + 1];
3564-
if (!stmt->BindValue(value, i + 1)) {
3565-
return;
3566-
}
3560+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3561+
return;
35673562
}
35683563

35693564
auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });

β€Žsrc/node_sqlite.hβ€Ž

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,10 @@ class SQLTagStore : public BaseObject {
404404
private:
405405
static BaseObjectPtr<StatementSync> PrepareStatement(
406406
const v8::FunctionCallbackInfo<v8::Value>& args);
407+
staticboolResetAndBindStatement(
408+
Environment* env,
409+
StatementSync* stmt,
410+
const v8::FunctionCallbackInfo<v8::Value>& args);
407411
BaseObjectWeakPtr<DatabaseSync> database_;
408412
LRUCache<std::string, BaseObjectPtr<StatementSync>> sql_tags_;
409413
friendclassStatementExecutionHelper;

β€Žtest/parallel/test-sqlite-template-tag.jsβ€Ž

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,43 @@ test('queries with no results', () => {
9090
assert.strictEqual(count,0);
9191
});
9292

93+
test('rejects parameters outside of template expressions',()=>{
94+
constldb=newDatabaseSync(':memory:');
95+
constlsql=ldb.createTagStore();
96+
ldb.exec(`
97+
CREATE TABLE secrets(owner TEXT, token TEXT);
98+
INSERT INTO secrets VALUES ('victim', 'secret');
99+
CREATE TABLE transfers(from_user TEXT, amount INTEGER);
100+
`);
101+
102+
constexpectedError={
103+
code: 'ERR_INVALID_ARG_VALUE',
104+
message: /mustbeboundusingtemplateliteralplaceholders/,
105+
};
106+
107+
for(constmethodof['get','all','iterate']){
108+
// Prime the cached statement with a bound value before each attempt.
109+
// eslint-disable-next-line no-unused-expressions
110+
lsql.all`SELECT token FROM secrets WHERE owner = ${'victim'}`;
111+
assert.throws(()=>{
112+
// eslint-disable-next-line no-unused-expressions
113+
lsql[method]`SELECT token FROM secrets WHERE owner = ?`;
114+
},expectedError);
115+
}
116+
117+
// eslint-disable-next-line no-unused-expressions
118+
lsql.run`INSERT INTO transfers VALUES (${'victim'},${100})`;
119+
assert.throws(()=>{
120+
// eslint-disable-next-line no-unused-expressions
121+
lsql.run`INSERT INTO transfers VALUES (?,?)`;
122+
},expectedError);
123+
assert.strictEqual(
124+
ldb.prepare('SELECT COUNT(*) AS count FROM transfers').get().count,
125+
1);
126+
127+
ldb.close();
128+
});
129+
93130
test('TagStore capacity, size, and clear',()=>{
94131
assert.strictEqual(sql.capacity,10);
95132
assert.strictEqual(sql.size,0);

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 ce0ca47

Browse files
mcollinaaduh95
authored andcommitted
sqlite: clear SQLTagStore bindings
SQLTagStore reused cached statements without clearing values bound by a previous execution. Clear bindings before binding new values and reject parameters that do not correspond to template substitutions. Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #65041 Reviewed-By: RenΓ© <contact.9a5d6388@renegade334.me.uk> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 4f2c634 commit ce0ca47

3 files changed

Lines changed: 78 additions & 42 deletions

File tree

β€Žsrc/node_sqlite.ccβ€Ž

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3431,6 +3431,35 @@ void SQLTagStore::SizeGetter(const FunctionCallbackInfo<Value>& args) {
34313431
args.GetReturnValue().Set(static_cast<double>(store->sql_tags_.Size()));
34323432
}
34333433

3434+
boolSQLTagStore::ResetAndBindStatement(
3435+
Environment* env,
3436+
StatementSync* stmt,
3437+
const FunctionCallbackInfo<Value>& args) {
3438+
Isolate* isolate = env->isolate();
3439+
int r = stmt->ResetStatement();
3440+
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, false);
3441+
3442+
r = sqlite3_clear_bindings(stmt->statement_);
3443+
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, false);
3444+
3445+
uint32_t n_params = args.Length() - 1;
3446+
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3447+
if (param_count != static_cast<int>(n_params)) {
3448+
THROW_ERR_INVALID_ARG_VALUE(
3449+
env,
3450+
"SQLite parameters must be bound using template literal placeholders.");
3451+
returnfalse;
3452+
}
3453+
3454+
for (int i = 0; i < param_count; ++i) {
3455+
if (!stmt->BindValue(args[i + 1], i + 1)) {
3456+
returnfalse;
3457+
}
3458+
}
3459+
3460+
returntrue;
3461+
}
3462+
34343463
voidSQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
34353464
SQLTagStore* session;
34363465
ASSIGN_OR_RETURN_UNWRAP(&session, args.This());
@@ -3445,15 +3474,8 @@ void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
34453474
return;
34463475
}
34473476

3448-
uint32_t n_params = args.Length() - 1;
3449-
int r = stmt->ResetStatement();
3450-
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
3451-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3452-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3453-
Local<Value> value = args[i + 1];
3454-
if (!stmt->BindValue(value, i + 1)) {
3455-
return;
3456-
}
3477+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3478+
return;
34573479
}
34583480

34593481
Local<Object> result;
@@ -3478,15 +3500,8 @@ void SQLTagStore::Iterate(const FunctionCallbackInfo<Value>& args) {
34783500
return;
34793501
}
34803502

3481-
uint32_t n_params = args.Length() - 1;
3482-
int r = stmt->ResetStatement();
3483-
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
3484-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3485-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3486-
Local<Value> value = args[i + 1];
3487-
if (!stmt->BindValue(value, i + 1)) {
3488-
return;
3489-
}
3503+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3504+
return;
34903505
}
34913506

34923507
BaseObjectPtr<StatementSyncIterator> iter = StatementExecutionHelper::Iterate(
@@ -3513,18 +3528,8 @@ void SQLTagStore::Get(const FunctionCallbackInfo<Value>& args) {
35133528
return;
35143529
}
35153530

3516-
uint32_t n_params = args.Length() - 1;
3517-
Isolate* isolate = env->isolate();
3518-
3519-
int r = stmt->ResetStatement();
3520-
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
3521-
3522-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3523-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3524-
Local<Value> value = args[i + 1];
3525-
if (!stmt->BindValue(value, i + 1)) {
3526-
return;
3527-
}
3531+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3532+
return;
35283533
}
35293534

35303535
Local<Value> result;
@@ -3552,18 +3557,8 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
35523557
return;
35533558
}
35543559

3555-
uint32_t n_params = args.Length() - 1;
3556-
Isolate* isolate = env->isolate();
3557-
3558-
int r = stmt->ResetStatement();
3559-
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
3560-
3561-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3562-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3563-
Local<Value> value = args[i + 1];
3564-
if (!stmt->BindValue(value, i + 1)) {
3565-
return;
3566-
}
3560+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3561+
return;
35673562
}
35683563

35693564
auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });

β€Žsrc/node_sqlite.hβ€Ž

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,10 @@ class SQLTagStore : public BaseObject {
404404
private:
405405
static BaseObjectPtr<StatementSync> PrepareStatement(
406406
const v8::FunctionCallbackInfo<v8::Value>& args);
407+
staticboolResetAndBindStatement(
408+
Environment* env,
409+
StatementSync* stmt,
410+
const v8::FunctionCallbackInfo<v8::Value>& args);
407411
BaseObjectWeakPtr<DatabaseSync> database_;
408412
LRUCache<std::string, BaseObjectPtr<StatementSync>> sql_tags_;
409413
friendclassStatementExecutionHelper;

β€Žtest/parallel/test-sqlite-template-tag.jsβ€Ž

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,43 @@ test('queries with no results', () => {
9090
assert.strictEqual(count,0);
9191
});
9292

93+
test('rejects parameters outside of template expressions',()=>{
94+
constldb=newDatabaseSync(':memory:');
95+
constlsql=ldb.createTagStore();
96+
ldb.exec(`
97+
CREATE TABLE secrets(owner TEXT, token TEXT);
98+
INSERT INTO secrets VALUES ('victim', 'secret');
99+
CREATE TABLE transfers(from_user TEXT, amount INTEGER);
100+
`);
101+
102+
constexpectedError={
103+
code: 'ERR_INVALID_ARG_VALUE',
104+
message: /mustbeboundusingtemplateliteralplaceholders/,
105+
};
106+
107+
for(constmethodof['get','all','iterate']){
108+
// Prime the cached statement with a bound value before each attempt.
109+
// eslint-disable-next-line no-unused-expressions
110+
lsql.all`SELECT token FROM secrets WHERE owner = ${'victim'}`;
111+
assert.throws(()=>{
112+
// eslint-disable-next-line no-unused-expressions
113+
lsql[method]`SELECT token FROM secrets WHERE owner = ?`;
114+
},expectedError);
115+
}
116+
117+
// eslint-disable-next-line no-unused-expressions
118+
lsql.run`INSERT INTO transfers VALUES (${'victim'},${100})`;
119+
assert.throws(()=>{
120+
// eslint-disable-next-line no-unused-expressions
121+
lsql.run`INSERT INTO transfers VALUES (?,?)`;
122+
},expectedError);
123+
assert.strictEqual(
124+
ldb.prepare('SELECT COUNT(*) AS count FROM transfers').get().count,
125+
1);
126+
127+
ldb.close();
128+
});
129+
93130
test('TagStore capacity, size, and clear',()=>{
94131
assert.strictEqual(sql.capacity,10);
95132
assert.strictEqual(sql.size,0);

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 ce0ca47

Browse files
mcollinaaduh95
authored andcommitted
sqlite: clear SQLTagStore bindings
SQLTagStore reused cached statements without clearing values bound by a previous execution. Clear bindings before binding new values and reject parameters that do not correspond to template substitutions. Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #65041 Reviewed-By: RenΓ© <contact.9a5d6388@renegade334.me.uk> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 4f2c634 commit ce0ca47

3 files changed

Lines changed: 78 additions & 42 deletions

File tree

β€Žsrc/node_sqlite.ccβ€Ž

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3431,6 +3431,35 @@ void SQLTagStore::SizeGetter(const FunctionCallbackInfo<Value>& args) {
34313431
args.GetReturnValue().Set(static_cast<double>(store->sql_tags_.Size()));
34323432
}
34333433

3434+
boolSQLTagStore::ResetAndBindStatement(
3435+
Environment* env,
3436+
StatementSync* stmt,
3437+
const FunctionCallbackInfo<Value>& args) {
3438+
Isolate* isolate = env->isolate();
3439+
int r = stmt->ResetStatement();
3440+
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, false);
3441+
3442+
r = sqlite3_clear_bindings(stmt->statement_);
3443+
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, false);
3444+
3445+
uint32_t n_params = args.Length() - 1;
3446+
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3447+
if (param_count != static_cast<int>(n_params)) {
3448+
THROW_ERR_INVALID_ARG_VALUE(
3449+
env,
3450+
"SQLite parameters must be bound using template literal placeholders.");
3451+
returnfalse;
3452+
}
3453+
3454+
for (int i = 0; i < param_count; ++i) {
3455+
if (!stmt->BindValue(args[i + 1], i + 1)) {
3456+
returnfalse;
3457+
}
3458+
}
3459+
3460+
returntrue;
3461+
}
3462+
34343463
voidSQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
34353464
SQLTagStore* session;
34363465
ASSIGN_OR_RETURN_UNWRAP(&session, args.This());
@@ -3445,15 +3474,8 @@ void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
34453474
return;
34463475
}
34473476

3448-
uint32_t n_params = args.Length() - 1;
3449-
int r = stmt->ResetStatement();
3450-
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
3451-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3452-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3453-
Local<Value> value = args[i + 1];
3454-
if (!stmt->BindValue(value, i + 1)) {
3455-
return;
3456-
}
3477+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3478+
return;
34573479
}
34583480

34593481
Local<Object> result;
@@ -3478,15 +3500,8 @@ void SQLTagStore::Iterate(const FunctionCallbackInfo<Value>& args) {
34783500
return;
34793501
}
34803502

3481-
uint32_t n_params = args.Length() - 1;
3482-
int r = stmt->ResetStatement();
3483-
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
3484-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3485-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3486-
Local<Value> value = args[i + 1];
3487-
if (!stmt->BindValue(value, i + 1)) {
3488-
return;
3489-
}
3503+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3504+
return;
34903505
}
34913506

34923507
BaseObjectPtr<StatementSyncIterator> iter = StatementExecutionHelper::Iterate(
@@ -3513,18 +3528,8 @@ void SQLTagStore::Get(const FunctionCallbackInfo<Value>& args) {
35133528
return;
35143529
}
35153530

3516-
uint32_t n_params = args.Length() - 1;
3517-
Isolate* isolate = env->isolate();
3518-
3519-
int r = stmt->ResetStatement();
3520-
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
3521-
3522-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3523-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3524-
Local<Value> value = args[i + 1];
3525-
if (!stmt->BindValue(value, i + 1)) {
3526-
return;
3527-
}
3531+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3532+
return;
35283533
}
35293534

35303535
Local<Value> result;
@@ -3552,18 +3557,8 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
35523557
return;
35533558
}
35543559

3555-
uint32_t n_params = args.Length() - 1;
3556-
Isolate* isolate = env->isolate();
3557-
3558-
int r = stmt->ResetStatement();
3559-
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
3560-
3561-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3562-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3563-
Local<Value> value = args[i + 1];
3564-
if (!stmt->BindValue(value, i + 1)) {
3565-
return;
3566-
}
3560+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3561+
return;
35673562
}
35683563

35693564
auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });

β€Žsrc/node_sqlite.hβ€Ž

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,10 @@ class SQLTagStore : public BaseObject {
404404
private:
405405
static BaseObjectPtr<StatementSync> PrepareStatement(
406406
const v8::FunctionCallbackInfo<v8::Value>& args);
407+
staticboolResetAndBindStatement(
408+
Environment* env,
409+
StatementSync* stmt,
410+
const v8::FunctionCallbackInfo<v8::Value>& args);
407411
BaseObjectWeakPtr<DatabaseSync> database_;
408412
LRUCache<std::string, BaseObjectPtr<StatementSync>> sql_tags_;
409413
friendclassStatementExecutionHelper;

β€Žtest/parallel/test-sqlite-template-tag.jsβ€Ž

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,43 @@ test('queries with no results', () => {
9090
assert.strictEqual(count,0);
9191
});
9292

93+
test('rejects parameters outside of template expressions',()=>{
94+
constldb=newDatabaseSync(':memory:');
95+
constlsql=ldb.createTagStore();
96+
ldb.exec(`
97+
CREATE TABLE secrets(owner TEXT, token TEXT);
98+
INSERT INTO secrets VALUES ('victim', 'secret');
99+
CREATE TABLE transfers(from_user TEXT, amount INTEGER);
100+
`);
101+
102+
constexpectedError={
103+
code: 'ERR_INVALID_ARG_VALUE',
104+
message: /mustbeboundusingtemplateliteralplaceholders/,
105+
};
106+
107+
for(constmethodof['get','all','iterate']){
108+
// Prime the cached statement with a bound value before each attempt.
109+
// eslint-disable-next-line no-unused-expressions
110+
lsql.all`SELECT token FROM secrets WHERE owner = ${'victim'}`;
111+
assert.throws(()=>{
112+
// eslint-disable-next-line no-unused-expressions
113+
lsql[method]`SELECT token FROM secrets WHERE owner = ?`;
114+
},expectedError);
115+
}
116+
117+
// eslint-disable-next-line no-unused-expressions
118+
lsql.run`INSERT INTO transfers VALUES (${'victim'},${100})`;
119+
assert.throws(()=>{
120+
// eslint-disable-next-line no-unused-expressions
121+
lsql.run`INSERT INTO transfers VALUES (?,?)`;
122+
},expectedError);
123+
assert.strictEqual(
124+
ldb.prepare('SELECT COUNT(*) AS count FROM transfers').get().count,
125+
1);
126+
127+
ldb.close();
128+
});
129+
93130
test('TagStore capacity, size, and clear',()=>{
94131
assert.strictEqual(sql.capacity,10);
95132
assert.strictEqual(sql.size,0);

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 ce0ca47

Browse files
mcollinaaduh95
authored andcommitted
sqlite: clear SQLTagStore bindings
SQLTagStore reused cached statements without clearing values bound by a previous execution. Clear bindings before binding new values and reject parameters that do not correspond to template substitutions. Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #65041 Reviewed-By: RenΓ© <contact.9a5d6388@renegade334.me.uk> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 4f2c634 commit ce0ca47

3 files changed

Lines changed: 78 additions & 42 deletions

File tree

β€Žsrc/node_sqlite.ccβ€Ž

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3431,6 +3431,35 @@ void SQLTagStore::SizeGetter(const FunctionCallbackInfo<Value>& args) {
34313431
args.GetReturnValue().Set(static_cast<double>(store->sql_tags_.Size()));
34323432
}
34333433

3434+
boolSQLTagStore::ResetAndBindStatement(
3435+
Environment* env,
3436+
StatementSync* stmt,
3437+
const FunctionCallbackInfo<Value>& args) {
3438+
Isolate* isolate = env->isolate();
3439+
int r = stmt->ResetStatement();
3440+
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, false);
3441+
3442+
r = sqlite3_clear_bindings(stmt->statement_);
3443+
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, false);
3444+
3445+
uint32_t n_params = args.Length() - 1;
3446+
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3447+
if (param_count != static_cast<int>(n_params)) {
3448+
THROW_ERR_INVALID_ARG_VALUE(
3449+
env,
3450+
"SQLite parameters must be bound using template literal placeholders.");
3451+
returnfalse;
3452+
}
3453+
3454+
for (int i = 0; i < param_count; ++i) {
3455+
if (!stmt->BindValue(args[i + 1], i + 1)) {
3456+
returnfalse;
3457+
}
3458+
}
3459+
3460+
returntrue;
3461+
}
3462+
34343463
voidSQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
34353464
SQLTagStore* session;
34363465
ASSIGN_OR_RETURN_UNWRAP(&session, args.This());
@@ -3445,15 +3474,8 @@ void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
34453474
return;
34463475
}
34473476

3448-
uint32_t n_params = args.Length() - 1;
3449-
int r = stmt->ResetStatement();
3450-
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
3451-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3452-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3453-
Local<Value> value = args[i + 1];
3454-
if (!stmt->BindValue(value, i + 1)) {
3455-
return;
3456-
}
3477+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3478+
return;
34573479
}
34583480

34593481
Local<Object> result;
@@ -3478,15 +3500,8 @@ void SQLTagStore::Iterate(const FunctionCallbackInfo<Value>& args) {
34783500
return;
34793501
}
34803502

3481-
uint32_t n_params = args.Length() - 1;
3482-
int r = stmt->ResetStatement();
3483-
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
3484-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3485-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3486-
Local<Value> value = args[i + 1];
3487-
if (!stmt->BindValue(value, i + 1)) {
3488-
return;
3489-
}
3503+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3504+
return;
34903505
}
34913506

34923507
BaseObjectPtr<StatementSyncIterator> iter = StatementExecutionHelper::Iterate(
@@ -3513,18 +3528,8 @@ void SQLTagStore::Get(const FunctionCallbackInfo<Value>& args) {
35133528
return;
35143529
}
35153530

3516-
uint32_t n_params = args.Length() - 1;
3517-
Isolate* isolate = env->isolate();
3518-
3519-
int r = stmt->ResetStatement();
3520-
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
3521-
3522-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3523-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3524-
Local<Value> value = args[i + 1];
3525-
if (!stmt->BindValue(value, i + 1)) {
3526-
return;
3527-
}
3531+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3532+
return;
35283533
}
35293534

35303535
Local<Value> result;
@@ -3552,18 +3557,8 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
35523557
return;
35533558
}
35543559

3555-
uint32_t n_params = args.Length() - 1;
3556-
Isolate* isolate = env->isolate();
3557-
3558-
int r = stmt->ResetStatement();
3559-
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
3560-
3561-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3562-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3563-
Local<Value> value = args[i + 1];
3564-
if (!stmt->BindValue(value, i + 1)) {
3565-
return;
3566-
}
3560+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3561+
return;
35673562
}
35683563

35693564
auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });

β€Žsrc/node_sqlite.hβ€Ž

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,10 @@ class SQLTagStore : public BaseObject {
404404
private:
405405
static BaseObjectPtr<StatementSync> PrepareStatement(
406406
const v8::FunctionCallbackInfo<v8::Value>& args);
407+
staticboolResetAndBindStatement(
408+
Environment* env,
409+
StatementSync* stmt,
410+
const v8::FunctionCallbackInfo<v8::Value>& args);
407411
BaseObjectWeakPtr<DatabaseSync> database_;
408412
LRUCache<std::string, BaseObjectPtr<StatementSync>> sql_tags_;
409413
friendclassStatementExecutionHelper;

β€Žtest/parallel/test-sqlite-template-tag.jsβ€Ž

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,43 @@ test('queries with no results', () => {
9090
assert.strictEqual(count,0);
9191
});
9292

93+
test('rejects parameters outside of template expressions',()=>{
94+
constldb=newDatabaseSync(':memory:');
95+
constlsql=ldb.createTagStore();
96+
ldb.exec(`
97+
CREATE TABLE secrets(owner TEXT, token TEXT);
98+
INSERT INTO secrets VALUES ('victim', 'secret');
99+
CREATE TABLE transfers(from_user TEXT, amount INTEGER);
100+
`);
101+
102+
constexpectedError={
103+
code: 'ERR_INVALID_ARG_VALUE',
104+
message: /mustbeboundusingtemplateliteralplaceholders/,
105+
};
106+
107+
for(constmethodof['get','all','iterate']){
108+
// Prime the cached statement with a bound value before each attempt.
109+
// eslint-disable-next-line no-unused-expressions
110+
lsql.all`SELECT token FROM secrets WHERE owner = ${'victim'}`;
111+
assert.throws(()=>{
112+
// eslint-disable-next-line no-unused-expressions
113+
lsql[method]`SELECT token FROM secrets WHERE owner = ?`;
114+
},expectedError);
115+
}
116+
117+
// eslint-disable-next-line no-unused-expressions
118+
lsql.run`INSERT INTO transfers VALUES (${'victim'},${100})`;
119+
assert.throws(()=>{
120+
// eslint-disable-next-line no-unused-expressions
121+
lsql.run`INSERT INTO transfers VALUES (?,?)`;
122+
},expectedError);
123+
assert.strictEqual(
124+
ldb.prepare('SELECT COUNT(*) AS count FROM transfers').get().count,
125+
1);
126+
127+
ldb.close();
128+
});
129+
93130
test('TagStore capacity, size, and clear',()=>{
94131
assert.strictEqual(sql.capacity,10);
95132
assert.strictEqual(sql.size,0);

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 ce0ca47

Browse files
mcollinaaduh95
authored andcommitted
sqlite: clear SQLTagStore bindings
SQLTagStore reused cached statements without clearing values bound by a previous execution. Clear bindings before binding new values and reject parameters that do not correspond to template substitutions. Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #65041 Reviewed-By: RenΓ© <contact.9a5d6388@renegade334.me.uk> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 4f2c634 commit ce0ca47

3 files changed

Lines changed: 78 additions & 42 deletions

File tree

β€Žsrc/node_sqlite.ccβ€Ž

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3431,6 +3431,35 @@ void SQLTagStore::SizeGetter(const FunctionCallbackInfo<Value>& args) {
34313431
args.GetReturnValue().Set(static_cast<double>(store->sql_tags_.Size()));
34323432
}
34333433

3434+
boolSQLTagStore::ResetAndBindStatement(
3435+
Environment* env,
3436+
StatementSync* stmt,
3437+
const FunctionCallbackInfo<Value>& args) {
3438+
Isolate* isolate = env->isolate();
3439+
int r = stmt->ResetStatement();
3440+
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, false);
3441+
3442+
r = sqlite3_clear_bindings(stmt->statement_);
3443+
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, false);
3444+
3445+
uint32_t n_params = args.Length() - 1;
3446+
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3447+
if (param_count != static_cast<int>(n_params)) {
3448+
THROW_ERR_INVALID_ARG_VALUE(
3449+
env,
3450+
"SQLite parameters must be bound using template literal placeholders.");
3451+
returnfalse;
3452+
}
3453+
3454+
for (int i = 0; i < param_count; ++i) {
3455+
if (!stmt->BindValue(args[i + 1], i + 1)) {
3456+
returnfalse;
3457+
}
3458+
}
3459+
3460+
returntrue;
3461+
}
3462+
34343463
voidSQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
34353464
SQLTagStore* session;
34363465
ASSIGN_OR_RETURN_UNWRAP(&session, args.This());
@@ -3445,15 +3474,8 @@ void SQLTagStore::Run(const FunctionCallbackInfo<Value>& args) {
34453474
return;
34463475
}
34473476

3448-
uint32_t n_params = args.Length() - 1;
3449-
int r = stmt->ResetStatement();
3450-
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
3451-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3452-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3453-
Local<Value> value = args[i + 1];
3454-
if (!stmt->BindValue(value, i + 1)) {
3455-
return;
3456-
}
3477+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3478+
return;
34573479
}
34583480

34593481
Local<Object> result;
@@ -3478,15 +3500,8 @@ void SQLTagStore::Iterate(const FunctionCallbackInfo<Value>& args) {
34783500
return;
34793501
}
34803502

3481-
uint32_t n_params = args.Length() - 1;
3482-
int r = stmt->ResetStatement();
3483-
CHECK_ERROR_OR_THROW(env->isolate(), stmt->db_.get(), r, SQLITE_OK, void());
3484-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3485-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3486-
Local<Value> value = args[i + 1];
3487-
if (!stmt->BindValue(value, i + 1)) {
3488-
return;
3489-
}
3503+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3504+
return;
34903505
}
34913506

34923507
BaseObjectPtr<StatementSyncIterator> iter = StatementExecutionHelper::Iterate(
@@ -3513,18 +3528,8 @@ void SQLTagStore::Get(const FunctionCallbackInfo<Value>& args) {
35133528
return;
35143529
}
35153530

3516-
uint32_t n_params = args.Length() - 1;
3517-
Isolate* isolate = env->isolate();
3518-
3519-
int r = stmt->ResetStatement();
3520-
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
3521-
3522-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3523-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3524-
Local<Value> value = args[i + 1];
3525-
if (!stmt->BindValue(value, i + 1)) {
3526-
return;
3527-
}
3531+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3532+
return;
35283533
}
35293534

35303535
Local<Value> result;
@@ -3552,18 +3557,8 @@ void SQLTagStore::All(const FunctionCallbackInfo<Value>& args) {
35523557
return;
35533558
}
35543559

3555-
uint32_t n_params = args.Length() - 1;
3556-
Isolate* isolate = env->isolate();
3557-
3558-
int r = stmt->ResetStatement();
3559-
CHECK_ERROR_OR_THROW(isolate, stmt->db_.get(), r, SQLITE_OK, void());
3560-
3561-
int param_count = sqlite3_bind_parameter_count(stmt->statement_);
3562-
for (int i = 0; i < static_cast<int>(n_params) && i < param_count; ++i) {
3563-
Local<Value> value = args[i + 1];
3564-
if (!stmt->BindValue(value, i + 1)) {
3565-
return;
3566-
}
3560+
if (!ResetAndBindStatement(env, stmt.get(), args)) {
3561+
return;
35673562
}
35683563

35693564
auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });

β€Žsrc/node_sqlite.hβ€Ž

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,10 @@ class SQLTagStore : public BaseObject {
404404
private:
405405
static BaseObjectPtr<StatementSync> PrepareStatement(
406406
const v8::FunctionCallbackInfo<v8::Value>& args);
407+
staticboolResetAndBindStatement(
408+
Environment* env,
409+
StatementSync* stmt,
410+
const v8::FunctionCallbackInfo<v8::Value>& args);
407411
BaseObjectWeakPtr<DatabaseSync> database_;
408412
LRUCache<std::string, BaseObjectPtr<StatementSync>> sql_tags_;
409413
friendclassStatementExecutionHelper;

β€Žtest/parallel/test-sqlite-template-tag.jsβ€Ž

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,43 @@ test('queries with no results', () => {
9090
assert.strictEqual(count,0);
9191
});
9292

93+
test('rejects parameters outside of template expressions',()=>{
94+
constldb=newDatabaseSync(':memory:');
95+
constlsql=ldb.createTagStore();
96+
ldb.exec(`
97+
CREATE TABLE secrets(owner TEXT, token TEXT);
98+
INSERT INTO secrets VALUES ('victim', 'secret');
99+
CREATE TABLE transfers(from_user TEXT, amount INTEGER);
100+
`);
101+
102+
constexpectedError={
103+
code: 'ERR_INVALID_ARG_VALUE',
104+
message: /mustbeboundusingtemplateliteralplaceholders/,
105+
};
106+
107+
for(constmethodof['get','all','iterate']){
108+
// Prime the cached statement with a bound value before each attempt.
109+
// eslint-disable-next-line no-unused-expressions
110+
lsql.all`SELECT token FROM secrets WHERE owner = ${'victim'}`;
111+
assert.throws(()=>{
112+
// eslint-disable-next-line no-unused-expressions
113+
lsql[method]`SELECT token FROM secrets WHERE owner = ?`;
114+
},expectedError);
115+
}
116+
117+
// eslint-disable-next-line no-unused-expressions
118+
lsql.run`INSERT INTO transfers VALUES (${'victim'},${100})`;
119+
assert.throws(()=>{
120+
// eslint-disable-next-line no-unused-expressions
121+
lsql.run`INSERT INTO transfers VALUES (?,?)`;
122+
},expectedError);
123+
assert.strictEqual(
124+
ldb.prepare('SELECT COUNT(*) AS count FROM transfers').get().count,
125+
1);
126+
127+
ldb.close();
128+
});
129+
93130
test('TagStore capacity, size, and clear',()=>{
94131
assert.strictEqual(sql.capacity,10);
95132
assert.strictEqual(sql.size,0);

0 commit comments

Comments
Β (0)