Skip to content

Add remote encryption key to connector options #73

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
levydsa merged 1 commit into from
Jul 23, 2025
Merged

Add remote encryption key to connector options #73

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
1 change: 1 addition & 0 deletions lib/include/libsql.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ typedef struct {
int sync_interval;
char with_webpki;
char offline;
const char *remote_encryption_key;
} libsql_config;

typedef const libsql_connection *libsql_connection_t;
Expand Down
59 changes: 44 additions & 15 deletions libsql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ func init() {
}

type config struct {
authToken *string
readYourWrites *bool
encryptionKey *string
syncInterval *time.Duration
authToken *string
readYourWrites *bool
encryptionKey *string
remoteEncrytionKey *string
syncInterval *time.Duration
}

type Option interface {
Expand Down Expand Up @@ -98,6 +99,19 @@ func WithEncryption(key string) Option {
})
}

func WithRemoteEncryption(key string) Option {
return option(func(o *config) error {
if o.remoteEncrytionKey != nil {
return fmt.Errorf("encryption key already set")
}
if key == "" {
return fmt.Errorf("encryption key must not be empty")
}
o.encryptionKey = &key
return nil
})
}

func WithSyncInterval(interval time.Duration) Option {
return option(func(o *config) error {
if o.syncInterval != nil {
Expand Down Expand Up @@ -131,11 +145,15 @@ func NewEmbeddedReplicaConnector(dbPath string, primaryUrl string, opts ...Optio
if config.encryptionKey != nil {
encryptionKey = *config.encryptionKey
}
remoteEncrytionKey := ""
if config.remoteEncrytionKey != nil {
encryptionKey = *config.encryptionKey
}
syncInterval := time.Duration(0)
if config.syncInterval != nil {
syncInterval = *config.syncInterval
}
return openSyncConnector(dbPath, primaryUrl, authToken, readYourWrites, encryptionKey, syncInterval, false)
return openSyncConnector(dbPath, primaryUrl, authToken, readYourWrites, encryptionKey, remoteEncrytionKey, syncInterval, false)
}

func NewSyncedDatabaseConnector(dbPath string, primaryUrl string, opts ...Option) (*Connector, error) {
Expand All @@ -161,11 +179,15 @@ func NewSyncedDatabaseConnector(dbPath string, primaryUrl string, opts ...Option
if config.encryptionKey != nil {
encryptionKey = *config.encryptionKey
}
remoteEncrytionKey := ""
if config.remoteEncrytionKey != nil {
encryptionKey = *config.encryptionKey
}
syncInterval := time.Duration(0)
if config.syncInterval != nil {
syncInterval = *config.syncInterval
}
return openSyncConnector(dbPath, primaryUrl, authToken, readYourWrites, encryptionKey, syncInterval, true)
return openSyncConnector(dbPath, primaryUrl, authToken, readYourWrites, encryptionKey, remoteEncrytionKey, syncInterval, true)
}

type driver struct{}
Expand Down Expand Up @@ -228,10 +250,10 @@ func openRemoteConnector(primaryUrl, authToken string) (*Connector, error) {
return &Connector{nativeDbPtr: nativeDbPtr}, nil
}

func openSyncConnector(dbPath, primaryUrl, authToken string, readYourWrites bool, encryptionKey string, syncInterval time.Duration, offline bool) (*Connector, error) {
func openSyncConnector(dbPath, primaryUrl, authToken string, readYourWrites bool, encryptionKey string, remoteEncrytionKey string, syncInterval time.Duration, offline bool) (*Connector, error) {
var closeCh chan struct{}
var closeAckCh chan struct{}
nativeDbPtr, err := libsqlOpenWithSync(dbPath, primaryUrl, authToken, readYourWrites, encryptionKey, offline)
nativeDbPtr, err := libsqlOpenWithSync(dbPath, primaryUrl, authToken, readYourWrites, encryptionKey, remoteEncrytionKey, offline)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -339,7 +361,7 @@ func libsqlOpenRemote(url, authToken string) (C.libsql_database_t, error) {
return db, nil
}

func libsqlOpenWithSync(dbPath, primaryUrl, authToken string, readYourWrites bool, encryptionKey string, offline bool) (C.libsql_database_t, error) {
func libsqlOpenWithSync(dbPath, primaryUrl, authToken string, readYourWrites bool, encryptionKey string, remoteEncrytionKey string, offline bool) (C.libsql_database_t, error) {
dbPathNativeString := C.CString(dbPath)
defer C.free(unsafe.Pointer(dbPathNativeString))
primaryUrlNativeString := C.CString(primaryUrl)
Expand All @@ -363,13 +385,20 @@ func libsqlOpenWithSync(dbPath, primaryUrl, authToken string, readYourWrites boo
defer C.free(unsafe.Pointer(encrytionKeyNativeString))
}

var remoteEncrytionKeyNativeString *C.char
if remoteEncrytionKey != "" {
encrytionKeyNativeString = C.CString(encryptionKey)
defer C.free(unsafe.Pointer(encrytionKeyNativeString))
}

config := C.libsql_config{
db_path: dbPathNativeString,
auth_token: authTokenNativeString,
primary_url: primaryUrlNativeString,
read_your_writes: readYourWritesNative,
encryption_key: encrytionKeyNativeString,
offline: offlineNative,
db_path: dbPathNativeString,
auth_token: authTokenNativeString,
primary_url: primaryUrlNativeString,
read_your_writes: readYourWritesNative,
encryption_key: encrytionKeyNativeString,
remote_encryption_key: remoteEncrytionKeyNativeString,
offline: offlineNative,
}

var db C.libsql_database_t
Expand Down
Loading