Skip to content

Commit 52d8b8f

Browse files
authored
Multi-scopes auth & Attach fix (#1076)
* test snapshots * allow multi-scope auth * hors-sujet: fix C compile warning * update jwt and add hashbrown feature * replace Auth with RequestContext * extract RequestContext * fix auth check for multi-scopes * pass NamespaceName in StmtKind::Attach * fallback to global auth if key is not set in ns config * add allow_attach to namespace creation * return meta store from namespace store * test attach * fmt * review edits
1 parent 82cd274 commit 52d8b8f

40 files changed

Lines changed: 1155 additions & 516 deletions

Cargo.lock

Lines changed: 34 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

libsql-ffi/bundled/src/sqlite3.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131315,9 +131315,9 @@ int libsql_try_initialize_wasm_func_table(sqlite3 *db) {
131315131315
sqlite3_finalize(stmt);
131316131316
return rc;
131317131317
}
131318-
const char *pName = sqlite3_column_text(stmt, 0);
131318+
const unsigned char *pName = sqlite3_column_text(stmt, 0);
131319131319
const void *pBody = body_type == SQLITE_TEXT ? sqlite3_column_text(stmt, 1) : sqlite3_column_blob(stmt, 1);
131320-
try_instantiate_wasm_function(db, pName, name_size, pBody, body_size, -1, NULL);
131320+
try_instantiate_wasm_function(db, (const char *)pName, name_size, pBody, body_size, -1, NULL);
131321131321
}
131322131322
}
131323131323
sqlite3_finalize(stmt);

libsql-server/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ hyper = { version = "0.14.23", features = ["http2"] }
3434
hyper-rustls = { git = "https://github.com/rustls/hyper-rustls.git", rev = "163b3f5" }
3535
hyper-tungstenite = "0.11"
3636
itertools = "0.10.5"
37-
jsonwebtoken = "8.2.0"
37+
jsonwebtoken = "9"
3838
libsql = { path = "../libsql/", optional = true }
3939
libsql_replication = { path = "../libsql-replication" }
4040
metrics = "0.21.1"
@@ -80,7 +80,7 @@ uuid = { version = "1.3", features = ["v4", "serde"] }
8080
aes = { version = "0.8.3", optional = true }
8181
cbc = { version = "0.1.2", optional = true }
8282
zerocopy = { version = "0.7.28", features = ["derive", "alloc"] }
83-
hashbrown = "0.14.3"
83+
hashbrown = { version = "0.14.3", features = ["serde"] }
8484

8585
[dev-dependencies]
8686
arbitrary = { version = "1.3.0", features = ["derive_arbitrary"] }
@@ -99,6 +99,7 @@ url = "2.3"
9999
metrics-util = "0.15"
100100
s3s = "0.8.1"
101101
s3s-fs = "0.8.1"
102+
ring = { version = "0.17.8", features = ["std"] }
102103

103104
[build-dependencies]
104105
vergen = { version = "8", features = ["build", "git", "gitcl"] }

0 commit comments

Comments
 (0)