Skip to content

sqlite: create authorization api #59928

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
araujogui wants to merge 18 commits into from
Closed

sqlite: create authorization api #59928

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6bf9173
sqlite: create authz method
araujogui Sep 18, 2025
bf0fc42
sqlite: improve error handling
araujogui Sep 18, 2025
41717ac
doc: create setauthorizer method doc
araujogui Sep 18, 2025
60ad323
doc: lint
araujogui Sep 18, 2025
19cdadf
doc: update doc link
araujogui Sep 18, 2025
e25f0ce
sqlite: remove duplicated proto init
araujogui Sep 18, 2025
e7288f3
sqlite: break long lines
araujogui Sep 18, 2025
3662e71
sqlite: format code
araujogui Sep 18, 2025
f63cba7
sqlite: store callback in internal field
araujogui Sep 22, 2025
2714896
sqlite: restrict valid authz code
araujogui Sep 23, 2025
e66a64c
sqlite: improve authorizer error handling
araujogui Sep 23, 2025
9e96632
sqlite: store authz error in internal object
araujogui Sep 24, 2025
a1553ef
sqlite: refactor authz code validation logic
araujogui Sep 24, 2025
e6ab93d
sqlite: refactor ToLocalChecked usage
araujogui Sep 25, 2025
254680d
sqlite: create constants doc
araujogui Sep 25, 2025
b51043c
sqlite: create sqlite_ignore test cases
araujogui Sep 25, 2025
526216d
sqlite: refactor authz error handling
araujogui Sep 26, 2025
0f4816f
sqlite: fix format
araujogui Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
sqlite: refactor authz error handling
  • Loading branch information
@araujogui
araujogui committed Sep 26, 2025
commit 526216d444ff5dbe18d60a879e200effbbf8f15b
52 changes: 10 additions & 42 deletions src/node_sqlite.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,28 +233,6 @@ inline void THROW_ERR_SQLITE_ERROR(Isolate* isolate, DatabaseSync* db) {
}
}

bool DatabaseSync::HasPendingAuthorizerError() const {
Local<Value> error =
object()->GetInternalField(kPendingAuthorizerError).As<Value>();
return !error.IsEmpty() && !error->IsUndefined();
}

void DatabaseSync::StoreAuthorizerError(Local<Value> error) {
if (!HasPendingAuthorizerError()) {
object()->SetInternalField(kPendingAuthorizerError, error);
}
}

void DatabaseSync::RethrowPendingAuthorizerError() {
if (HasPendingAuthorizerError()) {
Local<Value> error =
object()->GetInternalField(kPendingAuthorizerError).As<Value>();
object()->SetInternalField(kPendingAuthorizerError,
Undefined(env()->isolate()));
env()->isolate()->ThrowException(error);
}
}

inline void THROW_ERR_SQLITE_ERROR(Isolate* isolate, const char* message) {
Local<Object> e;
if (CreateSQLiteError(isolate, message).ToLocal(&e)) {
Expand Down Expand Up @@ -1149,14 +1127,6 @@ void DatabaseSync::Prepare(const FunctionCallbackInfo<Value>& args) {
sqlite3_stmt* s = nullptr;
int r = sqlite3_prepare_v2(db->connection_, *sql, -1, &s, 0);

if (db->HasPendingAuthorizerError()) {
db->RethrowPendingAuthorizerError();
if (s != nullptr) {
sqlite3_finalize(s);
}
return;
}

CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
BaseObjectPtr<StatementSync> stmt =
StatementSync::Create(env, BaseObjectPtr<DatabaseSync>(db), s);
Expand All @@ -1178,10 +1148,6 @@ void DatabaseSync::Exec(const FunctionCallbackInfo<Value>& args) {

Utf8Value sql(env->isolate(), args[0].As<String>());
int r = sqlite3_exec(db->connection_, *sql, nullptr, nullptr, nullptr);
if (db->HasPendingAuthorizerError()) {
db->RethrowPendingAuthorizerError();
return;
}
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
}

Expand Down Expand Up @@ -1957,19 +1923,19 @@ int DatabaseSync::AuthorizerCallback(void* user_data,
js_argv.emplace_back(
NullableSQLiteStringToValue(isolate, param4).ToLocalChecked());

TryCatch try_catch(isolate);
MaybeLocal<Value> retval = callback->Call(
context, Undefined(isolate), js_argv.size(), js_argv.data());

if (try_catch.HasCaught()) {
db->StoreAuthorizerError(try_catch.Exception());
Local<Value> result;

if (!retval.ToLocal(&result)) {
db->SetIgnoreNextSQLiteError(true);
return SQLITE_DENY;
}

Local<String> error_message;
Local<Value> result;
if (!retval.ToLocal(&result) || result->IsUndefined() || result->IsNull() ||
!result->IsInt32()) {

if (!result->IsInt32()) {
if (!String::NewFromUtf8(
isolate,
"Authorizer callback must return an integer authorization code")
Expand All @@ -1978,7 +1944,8 @@ int DatabaseSync::AuthorizerCallback(void* user_data,
}

Local<Value> err = Exception::TypeError(error_message);
db->StoreAuthorizerError(err);
isolate->ThrowException(err);
db->SetIgnoreNextSQLiteError(true);
return SQLITE_DENY;
}

Expand All @@ -1993,7 +1960,8 @@ int DatabaseSync::AuthorizerCallback(void* user_data,
}

Local<Value> err = Exception::RangeError(error_message);
db->StoreAuthorizerError(err);
isolate->ThrowException(err);
db->SetIgnoreNextSQLiteError(true);
return SQLITE_DENY;
}

Expand Down
5 changes: 1 addition & 4 deletions src/node_sqlite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ class DatabaseSync : public BaseObject {
public:
enum InternalFields {
kAuthorizerCallback = BaseObject::kInternalFieldCount,
kPendingAuthorizerError,
kInternalFieldCount
};

Expand Down Expand Up @@ -172,9 +171,7 @@ class DatabaseSync : public BaseObject {
void SetIgnoreNextSQLiteError(bool ignore);
bool ShouldIgnoreSQLiteError();

bool HasPendingAuthorizerError() const;
void StoreAuthorizerError(v8::Local<v8::Value> error);
void RethrowPendingAuthorizerError();


SET_MEMORY_INFO_NAME(DatabaseSync)
SET_SELF_SIZE(DatabaseSync)
Expand Down
Loading