return error if our own site_id is passed

Signed-off-by: Somtochi Onyekwere <[email protected]>

Author: somtochiama

core/rs/core/src/db_version.rs

@@ -202,6 +202,7 @@ pub fn insert_db_version(
     insert_db_vrsn: i64,
 ) -> Result<(), ResultCode> {
     unsafe {
+        // we can get a more recent db_versio
         let mut last_db_versions: mem::ManuallyDrop<Box<BTreeMap<Vec<u8>, i64>>> =
             mem::ManuallyDrop::new(Box::from_raw(
                 (*ext_data).lastDbVersions as *mut BTreeMap<Vec<u8>, i64>,
@@ -215,7 +216,16 @@ pub fn insert_db_version(
         }
 
         // ensure the site_id exists in the crsql_site_id table
-        let _ = get_or_set_site_ordinal(ext_data, insert_site_id)?;
+        let ordinal = get_or_set_site_ordinal(ext_data, insert_site_id)?;
+        if ordinal == 0 {
+            // we manage our own db_version internally but only error if we get a bigger db_version
+            // cause we can get our own rows from other nodes but the version should never be greater than our own.
+            let db_version = (*ext_data).dbVersion;
+            if insert_db_vrsn > db_version {
+                return Err(ResultCode::ERROR);
+            }
+            return Ok(());
+        }
 
         let bind_result = (*ext_data)
             .pSetDbVersionStmt
@@ -248,11 +258,10 @@ pub unsafe fn get_or_set_site_ordinal(
     ext_data: *mut crsql_ExtData,
     site_id: &[u8],
 ) -> Result<i64, ResultCode> {
-    let bind_result = (*ext_data).pSelectSiteIdOrdinalStmt.bind_blob(
-        1,
-        site_id,
-        sqlite::Destructor::STATIC,
-    );
+    let bind_result =
+        (*ext_data)
+            .pSelectSiteIdOrdinalStmt
+            .bind_blob(1, site_id, sqlite::Destructor::STATIC);
 
     if let Err(rc) = bind_result {
         reset_cached_stmt((*ext_data).pSelectSiteIdOrdinalStmt)?;
@@ -269,11 +278,10 @@ pub unsafe fn get_or_set_site_ordinal(
             reset_cached_stmt((*ext_data).pSelectSiteIdOrdinalStmt)?;
             // site id had no ordinal yet.
             // set one and return the ordinal.
-            let bind_result = (*ext_data).pSetSiteIdOrdinalStmt.bind_blob(
-                1,
-                site_id,
-                sqlite::Destructor::STATIC,
-            );
+            let bind_result =
+                (*ext_data)
+                    .pSetSiteIdOrdinalStmt
+                    .bind_blob(1, site_id, sqlite::Destructor::STATIC);
 
             if let Err(rc) = bind_result {
                 reset_cached_stmt((*ext_data).pSetSiteIdOrdinalStmt)?;
@@ -301,4 +309,4 @@ pub unsafe fn get_or_set_site_ordinal(
             return Err(rc);
         }
     }
-}
+}

py/correctness/tests/test_cl_triggers.py

@@ -17,8 +17,10 @@
 from pprint import pprint
 import pytest
 
-def create_db():
-    c = connect(":memory:")
+def create_db(db_file=None):
+    if db_file is None:
+        db_file = ":memory:"
+    c = connect(db_file)
     c.execute("CREATE TABLE foo (a INTEGER PRIMARY KEY NOT NULL, b INTEGER) STRICT;")
     c.execute("SELECT crsql_as_crr('foo')")
     c.commit()

py/correctness/tests/test_dbversion.py

@@ -239,5 +239,9 @@ def test_site_id_ordinal_is_set_and_updated():
     c1.execute("SELECT crsql_set_db_version(?, ?)", (bytes(other_site_id), 2))
     assert c1.execute("SELECT db_version from crsql_db_versions where site_id = ?", (bytes(other_site_id),)).fetchone()[0] == 5
 
+    # setting our own site_id should error
+    with pytest.raises(sqlite3.Error):
+        c1.execute("SELECT crsql_set_db_version(?, ?)", (bytes(c1_site_id), 6))
+
     close(c1)
     close(c2)