FFI: fetch callbacks: send correct allocation size (#19)

* FFI: fetch callbacks: send correct allocation size in case of insufficient allocated size in order to retry in Rust code

Author: Manuthor

.gitlab-ci.yml

@@ -17,6 +17,7 @@ build:
   services:
     - name: gitlab.cosmian.com:5000/core/kms:2.2.0_ci
       alias: kms_ci
+    - redis:latest
   script:
     - mvn package
   artifacts:

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+---
+## [0.10.1]
+### Added
+- Add Findex callbacks implementations for indexes compaction usage
+### Changed
+- Test Findex with Redis callbacks
+### Fixed
+- FFI: fetch callbacks: send correct allocation size in case of insufficient allocated size in order to retry in Rust code
+### Removed
+
 ---
 ## [0.10.0]
 ### Added

README.md

@@ -31,7 +31,7 @@ This library free software and is available on Maven Central
 <dependency>
     <groupId>com.cosmian</groupId>
     <artifactId>cosmian_java_lib</artifactId>
-    <version>0.9.0</version>
+    <version>0.10.1</version>
 </dependency>
 ```
 
@@ -54,6 +54,7 @@ KMS Server | Java Lib  | GPSW lib  | CoverCrypt lib | Findex
 2.1.0      | 0.7.7     | 1.1.1     | 4.0.0          | 0.2.3
 2.2.0      | 0.8.0     | 2.0.1     | 6.0.1          | 0.4.1
 2.2.0      | 0.9.0     | 2.0.1     | 6.0.1          | 0.5.0
+2.2.0      | 0.10.1    | 2.0.1     | 6.0.1          | 0.6.1
 
 ## Update native libraries
 

docker-compose.yml

@@ -23,3 +23,8 @@ services:
       - "9998:9998"
     depends_on:
       - db
+
+  redis:
+    image: redis:latest
+    ports:
+      - "6379:6379"

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.cosmian</groupId>
     <artifactId>cosmian_java_lib</artifactId>
-    <version>0.10.0</version>
+    <version>0.10.1</version>
 
     <name>cosmian_java_lib</name>
     <description>The Cosmian Java Lib provides local encryption/decyption and access to the Cosmian public platform APIs</description>
@@ -100,6 +100,12 @@
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
             <version>3.8.7</version>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>4.1.1</version>
+            <type>jar</type>
             <scope>test</scope>
         </dependency>
 

src/main/java/com/cosmian/jna/findex/Callbacks/FetchChain.java

@@ -4,6 +4,7 @@
 import java.util.List;
 
 import com.cosmian.jna.FfiException;
+import com.cosmian.jna.findex.Ffi;
 import com.cosmian.jna.findex.FfiWrapper.FetchChainCallback;
 import com.cosmian.jna.findex.FfiWrapper.FetchChainInterface;
 import com.cosmian.jna.findex.Leb128Serializer;
@@ -33,23 +34,14 @@ public int apply(Pointer output, IntByReference outputSize, Pointer uidsPointer,
         List<byte[]> chainTableUids = Leb128Serializer.deserializeList(uids);
 
         //
-        // Select uid and value in EntryTable
+        // Select uid and value in ChainTable
         //
-        HashMap<byte[], byte[]> values = this.fetch.fetch(chainTableUids);
+        HashMap<byte[], byte[]> uidsAndValues = this.fetch.fetch(chainTableUids);
 
         //
         // Serialize results
         //
-        if (values.size() > 0) {
-            byte[] valuesBytes = Leb128Serializer.serializeHashMap(values);
-
-            output.write(0, valuesBytes, 0, valuesBytes.length);
-            outputSize.setValue(valuesBytes.length);
-        } else {
-            outputSize.setValue(0);
-        }
-
-        return 0;
+        return Ffi.writeOutputPointerAndSize(uidsAndValues, output, outputSize);
     }
 
 }

src/main/java/com/cosmian/jna/findex/Callbacks/FetchEntry.java

@@ -4,6 +4,7 @@
 import java.util.List;
 
 import com.cosmian.jna.FfiException;
+import com.cosmian.jna.findex.Ffi;
 import com.cosmian.jna.findex.FfiWrapper.FetchEntryCallback;
 import com.cosmian.jna.findex.FfiWrapper.FetchEntryInterface;
 import com.cosmian.jna.findex.Leb128Serializer;
@@ -39,15 +40,7 @@ public int apply(Pointer output, IntByReference outputSize, Pointer uidsPointer,
         //
         // Serialize results
         //
-        if (uidsAndValues.size() > 0) {
-            byte[] uidsAndValuesBytes = Leb128Serializer.serializeHashMap(uidsAndValues);
-            output.write(0, uidsAndValuesBytes, 0, uidsAndValuesBytes.length);
-            outputSize.setValue(uidsAndValuesBytes.length);
-        } else {
-            outputSize.setValue(0);
-        }
-
-        return 0;
+        return Ffi.writeOutputPointerAndSize(uidsAndValues, output, outputSize);
     }
 
 }

src/main/java/com/cosmian/jna/findex/Ffi.java

@@ -65,6 +65,22 @@ public static void set_error(String error_msg) throws FfiException {
         unwrap(Ffi.INSTANCE.set_error(error_msg));
     }
 
+    public static int writeOutputPointerAndSize(HashMap<byte[], byte[]> uidsAndValues, Pointer output,
+        IntByReference outputSize) {
+        if (uidsAndValues.size() > 0) {
+            byte[] uidsAndValuesBytes = Leb128Serializer.serializeHashMap(uidsAndValues);
+            if (outputSize.getValue() < uidsAndValuesBytes.length) {
+                outputSize.setValue(uidsAndValuesBytes.length);
+                return 1;
+            }
+            outputSize.setValue(uidsAndValuesBytes.length);
+            output.write(0, uidsAndValuesBytes, 0, uidsAndValuesBytes.length);
+        } else {
+            outputSize.setValue(0);
+        }
+        return 0;
+    }
+
     public static void upsert(MasterKeys masterKeys, byte[] label, HashMap<IndexedValue, Word[]> indexedValuesAndWords,
         FetchEntryCallback fetchEntry, UpsertEntryCallback upsertEntry, UpsertChainCallback upsertChain)
         throws FfiException, CosmianException {