Skip to content

Add support for cloud encryption for remote connection #2175

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

Merged
merged 1 commit into from
Oct 24, 2025
Merged

Add support for cloud encryption for remote connection #2175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions bindings/c/include/libsql.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ int libsql_open_file(const char *url, libsql_database_t *out_db, const char **ou

int libsql_open_remote(const char *url, const char *auth_token, libsql_database_t *out_db, const char **out_err_msg);

int libsql_open_remote_with_remote_encryption(const char *url,
const char *auth_token,
const char *remote_encryption_key,
libsql_database_t *out_db,
const char **out_err_msg);

int libsql_open_remote_with_webpki(const char *url,
const char *auth_token,
libsql_database_t *out_db,
Expand Down
45 changes: 43 additions & 2 deletions bindings/c/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,32 @@ pub unsafe extern "C" fn libsql_open_remote(
out_db: *mut libsql_database_t,
out_err_msg: *mut *const std::ffi::c_char,
) -> std::ffi::c_int {
libsql_open_remote_internal(url, auth_token, false, out_db, out_err_msg)
libsql_open_remote_internal(
url,
auth_token,
std::ptr::null(),
false,
out_db,
out_err_msg,
)
}

#[no_mangle]
pub unsafe extern "C" fn libsql_open_remote_with_remote_encryption(
url: *const std::ffi::c_char,
auth_token: *const std::ffi::c_char,
remote_encryption_key: *const std::ffi::c_char,
out_db: *mut libsql_database_t,
out_err_msg: *mut *const std::ffi::c_char,
) -> std::ffi::c_int {
libsql_open_remote_internal(
url,
auth_token,
remote_encryption_key,
false,
out_db,
out_err_msg,
)
}

#[no_mangle]
Expand All @@ -424,12 +449,13 @@ pub unsafe extern "C" fn libsql_open_remote_with_webpki(
out_db: *mut libsql_database_t,
out_err_msg: *mut *const std::ffi::c_char,
) -> std::ffi::c_int {
libsql_open_remote_internal(url, auth_token, true, out_db, out_err_msg)
libsql_open_remote_internal(url, auth_token, std::ptr::null(), true, out_db, out_err_msg)
}

unsafe fn libsql_open_remote_internal(
url: *const std::ffi::c_char,
auth_token: *const std::ffi::c_char,
remote_encryption_key: *const std::ffi::c_char,
with_webpki: bool,
out_db: *mut libsql_database_t,
out_err_msg: *mut *const std::ffi::c_char,
Expand All @@ -451,6 +477,21 @@ unsafe fn libsql_open_remote_internal(
}
};
let mut builder = libsql::Builder::new_remote(url.to_string(), auth_token.to_string());

if !remote_encryption_key.is_null() {
let key = unsafe { std::ffi::CStr::from_ptr(remote_encryption_key) };
let key = match key.to_str() {
Ok(k) => k,
Err(e) => {
set_err_msg(format!("Wrong encryption key: {e}"), out_err_msg);
return 5;
}
};
builder = builder.remote_encryption(libsql::EncryptionContext {
key: libsql::EncryptionKey::Base64Encoded(key.to_string()),
});
};

if with_webpki {
let https = hyper_rustls::HttpsConnectorBuilder::new()
.with_webpki_roots()
Expand Down
Loading