Merge branch 'main' into new-integration-test

Author: Gioee

src/android_cert.h src/cacert.hsrc/android_cert.h renamed to src/cacert.h

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:src/android_cert.h
 /*
  ##
  ## Bundle of CA Root Certificates
@@ -22,6 +23,29 @@
  */
 
 static const char cacert_pem[] = "\n"
+=======
+static const char cacert_pem[] = "##\n"
+"## Bundle of CA Root Certificates\n"
+"##\n"
+"## Certificate data from Mozilla as of: Tue May 20 03:12:02 2025 GMT\n"
+"##\n"
+"## Find updated versions here: https://curl.se/docs/caextract.html\n"
+"##\n"
+"## This is a bundle of X.509 certificates of public Certificate Authorities\n"
+"## (CA). These were automatically extracted from Mozilla's root certificates\n"
+"## file (certdata.txt).  This file can be found in the mozilla source tree:\n"
+"## https://raw.githubusercontent.com/mozilla-firefox/firefox/refs/heads/release/security/nss/lib/ckfw/builtins/certdata.txt\n"
+"##\n"
+"## It contains the certificates in PEM format and therefore\n"
+"## can be directly used with curl / libcurl / php_curl, or with\n"
+"## an Apache+mod_ssl webserver for SSL client authentication.\n"
+"## Just configure this file as the SSLCACertificateFile.\n"
+"##\n"
+"## Conversion done with mk-ca-bundle.pl version 1.29.\n"
+"## SHA256: 8944ec6b572b577daee4fc681a425881f841ec2660e4cb5f0eee727f84620697\n"
+"##\n"
+"\n"
+>>>>>>> main:src/cacert.h
 "\n"
 "Entrust Root Certification Authority\n"
 "====================================\n"
@@ -3480,5 +3504,9 @@ static const char cacert_pem[] = "\n"
 "S5THaJQXfuKOKD62xur1NGyfN4gHONuGcfrNlUhDbqNPgofXNJhuS5N5YHVpD/Aa1VP6IQzCP+k/\n"
 "HxiMkl14p3ZnGbuy6n/pcAlWVqOwDAstNl7F6cTVg8uGF5csbBNvh1qvSaYd2804BC5f4ko1Di1L\n"
 "+KIkBI3Y4WNeApI02phhXBxvWHZks/wCuPWdCg==\n"
+<<<<<<< HEAD:src/android_cert.h
 "-----END CERTIFICATE-----\n"
 "";
+=======
+"-----END CERTIFICATE-----\n";
+>>>>>>> main:src/cacert.h

src/cloudsync.c

@@ -163,6 +163,8 @@ struct cloudsync_pk_decode_bind_context {
 };
 
 struct cloudsync_context {
+    sqlite3_context *sqlite_ctx;
+    
     char            *libversion;
     uint8_t         site_id[UUID_LEN];
     int             insync;
@@ -379,7 +381,12 @@ int db_version_rebuild_stmt (sqlite3 *db, cloudsync_context *data) {
         data->db_version_stmt = NULL;
     }
 
-    if (dbutils_table_settings_count_tables(db) == 0) return SQLITE_OK;
+    sqlite3_int64 count = dbutils_table_settings_count_tables(db);
+    if (count == 0) return SQLITE_OK;
+    else if (count == -1) {
+        dbutils_context_result_error(data->sqlite_ctx, "%s", sqlite3_errmsg(db));
+        return SQLITE_ERROR;
+    }
 
     char *sql = db_version_build_query(db);
     if (!sql) return SQLITE_NOMEM;
@@ -912,6 +919,11 @@ bool table_add_to_context (sqlite3 *db, cloudsync_context *data, table_algo algo
     if (!sql) goto abort_add_table;
     table->npks = (int)dbutils_int_select(db, sql);
     cloudsync_memory_free(sql);
+    if (table->npks == -1) {
+        dbutils_context_result_error(data->sqlite_ctx, "%s", sqlite3_errmsg(db));
+        goto abort_add_table;
+    }
+    
     if (table->npks == 0) {
         #if CLOUDSYNC_DISABLE_ROWIDONLY_TABLES
         return false;
@@ -925,6 +937,10 @@ bool table_add_to_context (sqlite3 *db, cloudsync_context *data, table_algo algo
     if (!sql) goto abort_add_table;
     int64_t ncols = (int64_t)dbutils_int_select(db, sql);
     cloudsync_memory_free(sql);
+    if (ncols == -1) {
+        dbutils_context_result_error(data->sqlite_ctx, "%s", sqlite3_errmsg(db));
+        goto abort_add_table;
+    }
 
     int rc = table_add_stmts(db, table, (int)ncols);
     if (rc != SQLITE_OK) goto abort_add_table;
@@ -1511,6 +1527,7 @@ const char *cloudsync_context_init (sqlite3 *db, cloudsync_context *data, sqlite
         if (stmts_add_tocontext(db, data) != SQLITE_OK) return NULL;
         if (cloudsync_load_siteid(db, data) != SQLITE_OK) return NULL;
 
+        data->sqlite_ctx = context;
         data->schema_hash = dbutils_schema_hash(db);
     }
 
@@ -2828,9 +2845,9 @@ int cloudsync_load_siteid (sqlite3 *db, cloudsync_context *data) {
     if (data->site_id[0] != 0) return SQLITE_OK;
 
     // load site_id
-    int size;
-    char *buffer = dbutils_blob_select(db, "SELECT site_id FROM cloudsync_site_id WHERE rowid=0;", &size);
-    if (!buffer) return SQLITE_NOMEM;
+    int size, rc;
+    char *buffer = dbutils_blob_select(db, "SELECT site_id FROM cloudsync_site_id WHERE rowid=0;", &size, data->sqlite_ctx, &rc);
+    if (!buffer) return rc;
     if (size != UUID_LEN) return SQLITE_MISUSE;
 
     memcpy(data->site_id, buffer, UUID_LEN);
@@ -2950,6 +2967,8 @@ int cloudsync_init_all (sqlite3_context *context, const char *algo_name, bool sk
 
 void cloudsync_init (sqlite3_context *context, const char *table, const char *algo, bool skip_int_pk_check) {
     cloudsync_context *data = (cloudsync_context *)sqlite3_user_data(context);
+    data->sqlite_ctx = context;
+    
     sqlite3 *db = sqlite3_context_db_handle(context);
     int rc = sqlite3_exec(db, "SAVEPOINT cloudsync_init;", NULL, NULL, NULL);
     if (rc != SQLITE_OK) {

src/cloudsync.h

@@ -16,7 +16,7 @@
 #include "sqlite3.h"
 #endif
 
-#define CLOUDSYNC_VERSION                       "0.8.0"
+#define CLOUDSYNC_VERSION                       "0.8.2"
 
 int sqlite3_cloudsync_init (sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi);
 

src/dbutils.c

@@ -164,10 +164,11 @@ int dbutils_write_simple (sqlite3 *db, const char *sql) {
 }
 
 sqlite3_int64 dbutils_int_select (sqlite3 *db, const char *sql) {
+    // used only for cound(*), hash, or 1, so return -1 to signal an error
     DATABASE_RESULT results[1] = {0};
     int expected_types[1] = {SQLITE_INTEGER};
     dbutils_exec(NULL, db, sql, NULL, NULL, NULL, 0, results, expected_types, 1);
-    return results[0].value.intValue;
+    return (results[0].rc == SQLITE_OK) ? results[0].value.intValue : -1;
 }
 
 char *dbutils_text_select (sqlite3 *db, const char *sql) {
@@ -177,11 +178,12 @@ char *dbutils_text_select (sqlite3 *db, const char *sql) {
     return results[0].value.stringValue;
 }
 
-char *dbutils_blob_select (sqlite3 *db, const char *sql, int *size) {
+char *dbutils_blob_select (sqlite3 *db, const char *sql, int *size, sqlite3_context *context, int *rc) {
     DATABASE_RESULT results[1] = {0};
     int expected_types[1] = {SQLITE_BLOB};
-    dbutils_exec(NULL, db, sql, NULL, NULL, NULL, 0, results, expected_types, 1);
+    dbutils_exec(context, db, sql, NULL, NULL, NULL, 0, results, expected_types, 1);
     *size = results[0].len;
+    *rc = results[0].rc;
     return results[0].value.stringValue;
 }
 
@@ -197,6 +199,7 @@ int dbutils_blob_int_int_select (sqlite3 *db, const char *sql, char **blob, int
 }
 
 sqlite3_int64 dbutils_select (sqlite3 *db, const char *sql, const char **values, int types[], int lens[], int count, int expected_type) {
+    // used only in unit-test
     DATABASE_RESULT results[1] = {0};
     int expected_types[1] = {expected_type};
     dbutils_exec(NULL, db, sql, values, types, lens, count, results, expected_types, 1);
@@ -396,6 +399,9 @@ bool dbutils_table_sanity_check (sqlite3 *db, sqlite3_context *context, const ch
     if (count > 128) {
         dbutils_context_result_error(context, "No more than 128 columns can be used to form a composite primary key");
         return false;
+    } else if (count == -1) {
+        dbutils_context_result_error(context, "%s", sqlite3_errmsg(db));
+        return false;
     }
 
     #if CLOUDSYNC_DISABLE_ROWIDONLY_TABLES
@@ -417,13 +423,21 @@ bool dbutils_table_sanity_check (sqlite3 *db, sqlite3_context *context, const ch
                 dbutils_context_result_error(context, "Table %s uses an single-column INTEGER primary key. For CRDT replication, primary keys must be globally unique. Consider using a TEXT primary key with UUIDs or ULID to avoid conflicts across nodes. If you understand the risk and still want to use this INTEGER primary key, set the third argument of the cloudsync_init function to 1 to skip this check.", name);
                 return false;
             }
+            if (count2 == -1) {
+                dbutils_context_result_error(context, "%s", sqlite3_errmsg(db));
+                return false;
+            }
         }
     }
 
     // if user declared explicit primary key(s) then make sure they are all declared as NOT NULL
     if (count > 0) {
         sql = sqlite3_snprintf((int)blen, buffer, "SELECT count(*) FROM pragma_table_info('%w') WHERE pk>0 AND \"notnull\"=1;", name);
         sqlite3_int64 count2 = dbutils_int_select(db, sql);
+        if (count2 == -1) {
+            dbutils_context_result_error(context, "%s", sqlite3_errmsg(db));
+            return false;
+        }
         if (count != count2) {
             dbutils_context_result_error(context, "All primary keys must be explicitly declared as NOT NULL (table %s)", name);
             return false;
@@ -434,6 +448,10 @@ bool dbutils_table_sanity_check (sqlite3 *db, sqlite3_context *context, const ch
     // Otherwise, col_merge_stmt would fail if changes to other columns are inserted first.
     sql = sqlite3_snprintf((int)blen, buffer, "SELECT count(*) FROM pragma_table_info('%w') WHERE pk=0 AND \"notnull\"=1 AND \"dflt_value\" IS NULL;", name);
     sqlite3_int64 count3 = dbutils_int_select(db, sql);
+    if (count3 == -1) {
+        dbutils_context_result_error(context, "%s", sqlite3_errmsg(db));
+        return false;
+    }
     if (count3 > 0) {
         dbutils_context_result_error(context, "All non-primary key columns declared as NOT NULL must have a DEFAULT value. (table %s)", name);
         return false;
@@ -1026,7 +1044,7 @@ int dbutils_settings_init (sqlite3 *db, void *cloudsync_data, sqlite3_context *c
     // check if some process changed schema outside of the lib
     /*
     if ((settings_exists == true) && (data->schema_version != dbutils_schema_version(db))) {
-        // TODO: SOMEONE CHANGED SCHEMAs SO WE NEED TO RECHECK AUGMENTED TABLES and RELATED TRIGGERS
+        // SOMEONE CHANGED SCHEMAs SO WE NEED TO RECHECK AUGMENTED TABLES and RELATED TRIGGERS
         assert(0);
     }
      */
@@ -1072,7 +1090,7 @@ bool dbutils_check_schema_hash (sqlite3 *db, sqlite3_uint64 hash) {
     char sql[1024];
     snprintf(sql, sizeof(sql), "SELECT 1 FROM cloudsync_schema_versions WHERE hash = (%lld)", hash);
 
-    return dbutils_int_select(db, sql) == 1;
+    return (dbutils_int_select(db, sql) == 1);
 }
 
 

src/dbutils.h

@@ -31,7 +31,7 @@ int dbutils_write_simple (sqlite3 *db, const char *sql);
 int dbutils_write (sqlite3 *db, sqlite3_context *context, const char *sql, const char **values, int types[], int len[], int count);
 sqlite3_int64 dbutils_int_select (sqlite3 *db, const char *sql);
 char *dbutils_text_select (sqlite3 *db, const char *sql);
-char *dbutils_blob_select (sqlite3 *db, const char *sql, int *size);
+char *dbutils_blob_select (sqlite3 *db, const char *sql, int *size, sqlite3_context *context, int *rc);
 int dbutils_blob_int_int_select (sqlite3 *db, const char *sql, char **blob, int *size, sqlite3_int64 *int1, sqlite3_int64 *int2);
 
 int dbutils_register_function (sqlite3 *db, const char *name, void (*ptr)(sqlite3_context*,int,sqlite3_value**), int nargs, char **pzErrMsg, void *ctx, void (*ctx_free)(void *));

src/network.c

@@ -15,8 +15,8 @@
 #include "cloudsync_private.h"
 
 #ifdef __ANDROID__
-#include "android_cert.h"
-static size_t cacert_len = 0;
+#include "cacert.h"
+static size_t cacert_len = sizeof(cacert_pem) - 1;
 #endif
 
 #define CLOUDSYNC_ENDPOINT_PREFIX               "v1/cloudsync"
@@ -119,10 +119,11 @@ static NETWORK_RESULT network_receive_buffer (network_data *data, const char *en
 
     // set PEM
     #ifdef __ANDROID__
-    struct curl_blob pem_blob;
-    pem_blob.data = cacert_pem;
-    pem_blob.len = cacert_len;
-    pem_blob.flags = CURL_BLOB_NOCOPY;
+    struct curl_blob pem_blob = {
+        .data = (void *)cacert_pem,
+        .len = cacert_len,
+        .flags = CURL_BLOB_NOCOPY
+    };
     curl_easy_setopt(curl, CURLOPT_CAINFO_BLOB, &pem_blob);
     #endif
 
@@ -208,10 +209,11 @@ static bool network_send_buffer (network_data *data, const char *endpoint, const
 
     // set PEM
     #ifdef __ANDROID__
-    struct curl_blob pem_blob;
-    pem_blob.data = cacert_pem;
-    pem_blob.len = cacert_len;
-    pem_blob.flags = CURL_BLOB_NOCOPY;
+    struct curl_blob pem_blob = {
+        .data = (void *)cacert_pem,
+        .len = cacert_len,
+        .flags = CURL_BLOB_NOCOPY
+    };
     curl_easy_setopt(curl, CURLOPT_CAINFO_BLOB, &pem_blob);
     #endif
 
@@ -685,12 +687,15 @@ void cloudsync_network_sync (sqlite3_context *context, int wait_ms, int max_retr
     cloudsync_network_send_changes(context, 0, NULL);
 
     int retries = 0;
+    int nrows = 0;
     while (retries < max_retries) {
-        int nrows = cloudsync_network_check_internal(context);
+        nrows = cloudsync_network_check_internal(context);
         if (nrows > 0) break;
         else sqlite3_sleep(wait_ms);
         retries++;
     }
+    
+    sqlite3_result_int(context, nrows);
 }
 
 void cloudsync_network_sync0 (sqlite3_context *context, int argc, sqlite3_value **argv) {
@@ -759,10 +764,6 @@ int cloudsync_network_register (sqlite3 *db, char **pzErrMsg, void *ctx) {
     rc = dbutils_register_function(db, "cloudsync_network_reset_sync_version", cloudsync_network_reset_sync_version, 0, pzErrMsg, ctx, NULL);
     if (rc != SQLITE_OK) return rc;
 
-    #ifdef __ANDROID__
-    cacert_len = strlen(cacert_pem);
-    #endif
-    
     return rc;
 }
 #endif

test/unit.c

@@ -921,8 +921,8 @@ bool do_test_vtab(sqlite3 *db) {
 }
 
 bool do_test_functions (sqlite3 *db, bool print_results) {
-    int size = 0;
-    char *site_id = dbutils_blob_select(db, "SELECT cloudsync_siteid();", &size);
+    int size = 0, rc2;
+    char *site_id = dbutils_blob_select(db, "SELECT cloudsync_siteid();", &size, NULL, &rc2);
     if (site_id == NULL || size != 16) goto abort_test_functions;
     cloudsync_memory_free(site_id);
 
@@ -3042,8 +3042,8 @@ bool do_test_network_encode_decode (int nclients, bool print_result, bool cleanu
         for (int j=0; j<nclients; ++j) {
             if (target == j) continue;
 
-            int blob_size = 0;
-            char *blob = dbutils_blob_select (db[target], src_sql, &blob_size);
+            int blob_size = 0, rc;
+            char *blob = dbutils_blob_select (db[target], src_sql, &blob_size, NULL, &rc);
             if (!blob) goto finalize;
 
             const char *values[] = {blob};