build: rebase with develop

Author: Manuthor

.github/workflows/ci.yml

@@ -49,7 +49,7 @@ jobs:
   build_in_docker:
     services:
       kms:
-        image: ghcr.io/cosmian/kms:4.9.1
+        image: ghcr.io/cosmian/kms:4.10.0
         ports:
           - 9998:9998
       findex_cloud:
@@ -161,7 +161,7 @@ jobs:
     with:
       branch: develop
       target: wasm32-unknown-unknown
-      kms-version: 4.9.1
+      kms-version: 4.10.0
       findex-cloud-version: 0.3.1
       copy_fresh_build: false
       copy_regression_files: |
@@ -174,7 +174,7 @@ jobs:
     with:
       branch: develop
       target: x86_64-unknown-linux-gnu
-      kms-version: 4.9.1
+      kms-version: 4.10.0
       findex-cloud-version: 0.3.1
       copy_fresh_build: false
       copy_regression_files: |

.pre-commit-config.yaml

@@ -37,6 +37,12 @@ repos:
       - id: markdownlint-fix
         args: [--disable=MD004, --disable=MD013, --disable=MD024, --disable=MD041]
 
+  - repo: https://github.com/tcort/markdown-link-check
+    rev: v3.11.2
+    hooks:
+      - id: markdown-link-check
+        args: [-q]
+
   - repo: https://github.com/jumanjihouse/pre-commit-hook-yamlfmt
     rev: 0.2.2
     hooks:

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
+## [7.0.0] - 2023-12-11
+
+### Features
+
+- Support of Findex v6
+- Use persistent instance in Findex without cloud
+- Overload Findex constructor to simplify instantiation
+- Covercrypt edit policy capability
+
 ## [6.0.0] - 2023-06-01
 
 ### Features

README.md

@@ -2,7 +2,7 @@
 
 ![workflow](https://github.com/Cosmian/cloudproof_java/actions/workflows/maven.yml/badge.svg)
 
-The Cloudproof Java library provides a Java-friendly API to [Cosmian's Cloudproof Encryption](https://docs.cosmian.com/cloudproof_encryption/use_cases_benefits/).
+The Cloudproof Java library provides a Java-friendly API to [Cosmian's Cloudproof Encryption](https://docs.cosmian.com/).
 
 Cloudproof Encryption secures data repositories and applications in the cloud with advanced application-level encryption and encrypted search.
 
@@ -37,7 +37,7 @@ securely be outsourced without compromising usability.
 
 ## Getting started
 
-Please [check the online documentation](https://docs.cosmian.com/cloudproof_encryption/use_cases_benefits/) for details on using the CloudProof APIs
+Please [check the online documentation](https://docs.cosmian.com/) for details on using the CloudProof APIs
 
 In addition, please have a look at the following tests for implementation examples:
 
@@ -105,6 +105,7 @@ From the version 5.0.0, `cloudproof_java` depends on [cloudproof_rust](https://g
 |----------|------------|---------------------|
 | 5.0.0    | 4.3.3      | 1.0.0               |
 | 6.0.0    | 4.3.3      | 2.0.1               |
+| 7.0.0    | 4.10.0     | 2.4.0               |
 
 ## Using in Java projects
 

docker-compose.yml

@@ -13,7 +13,7 @@ services:
       - PGDATA=/tmp/postgres2
   kms:
     container_name: kms
-    image: ghcr.io/cosmian/kms:4.9.1
+    image: ghcr.io/cosmian/kms:4.10.0
     ports:
       - 9998:9998
     depends_on:

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.cosmian</groupId>
     <artifactId>cloudproof_java</artifactId>
-    <version>6.0.0</version>
+    <version>7.0.0</version>
 
     <name>cloudproof_java</name>
     <description>The Cloudproof Java Lib secures data repositories in the cloud with attributes-based access control encryption and encrypted search</description>

scripts/get_native_libraries.py

@@ -64,4 +64,4 @@ def download_native_libraries(version: str) -> bool:
 if __name__ == '__main__':
     RET = download_native_libraries('v2.4.0')
     if RET is False and getenv('GITHUB_ACTIONS'):
-        download_native_libraries('last_build/fix/ffi_unwrap_return_code')
+        download_native_libraries('last_build/fix/rename_findex_traits')

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

@@ -38,8 +38,7 @@ public interface ChainTableDatabase {
      * @param uidsAndValues a {@link Map} of {@link Uid32} to {@link ChainTableValue}
      * @throws CloudproofException if anything goes wrong
      */
-    public void insert(Map<Uid32, ChainTableValue> uidsAndValues)
-        throws CloudproofException;
+    public void insert(Map<Uid32, ChainTableValue> uidsAndValues) throws CloudproofException;
 
     /**
      * Delete the lines indexed by the given UIDs {@link Uid32} from the Chain Table.
@@ -49,8 +48,7 @@ public void insert(Map<Uid32, ChainTableValue> uidsAndValues)
      * @param uids a {@link List} of {@link Uid32}
      * @throws CloudproofException if anything goes wrong
      */
-    public void delete(List<Uid32> uids)
-        throws CloudproofException;
+    public void delete(List<Uid32> uids) throws CloudproofException;
 
     /**
      * Return the appropriate fetch callback (with input/output serialization).

…/cosmian/jna/findex/FilterLocations.java …a/com/cosmian/jna/findex/DataFilter.javasrc/main/java/com/cosmian/jna/findex/FilterLocations.java renamed to src/main/java/com/cosmian/jna/findex/DataFilter.java src/main/java/com/cosmian/jna/findex/FilterLocations.java renamed to src/main/java/com/cosmian/jna/findex/DataFilter.java

@@ -2,15 +2,15 @@
 
 import java.util.List;
 
-import com.cosmian.jna.findex.ffi.FindexNativeWrapper.FilterLocationsCallback;
+import com.cosmian.jna.findex.ffi.FindexNativeWrapper.DataFilterCallback;
 import com.cosmian.jna.findex.serde.Leb128Reader;
 import com.cosmian.jna.findex.serde.Leb128Writer;
 import com.cosmian.jna.findex.structs.Location;
 import com.cosmian.utils.CloudproofException;
 import com.sun.jna.Pointer;
 import com.sun.jna.ptr.IntByReference;
 
-public interface FilterLocations extends FilterLocationsCallback {
+public interface DataFilter extends DataFilterCallback {
 
     /**
      * Filter the given locations.

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

@@ -9,6 +9,7 @@
 import com.cosmian.jna.findex.ffi.FindexNativeWrapper.DeleteCallback;
 import com.cosmian.jna.findex.ffi.FindexNativeWrapper.DumpTokensCallback;
 import com.cosmian.jna.findex.ffi.FindexNativeWrapper.FetchCallback;
+import com.cosmian.jna.findex.ffi.FindexNativeWrapper.InsertCallback;
 import com.cosmian.jna.findex.ffi.FindexNativeWrapper.UpsertCallback;
 import com.cosmian.jna.findex.serde.Leb128Reader;
 import com.cosmian.jna.findex.serde.Tuple;
@@ -63,6 +64,17 @@ public interface EntryTableDatabase {
     public Map<Uid32, EntryTableValue> upsert(Map<Uid32, EntryTableValues> uidsAndValues)
         throws CloudproofException;
 
+    /**
+     * Insert the given lines in the Chain Table.
+     * <p>
+     * Implementation of this method is only required to perform additions, deletions or compact operations on the
+     * index.
+     *
+     * @param uidsAndValues a {@link Map} of {@link Uid32} to {@link EntryTableValue}
+     * @throws CloudproofException if anything goes wrong
+     */
+    public void insert(Map<Uid32, EntryTableValue> uidsAndValues) throws CloudproofException;
+
     /**
      * Delete the lines with the given UIDs.
      *
@@ -156,6 +168,40 @@ public int callback(Pointer outputs,
         };
     }
 
+    /**
+     * Return the appropriate insert callback (with input/output serialization).
+     */
+    default InsertCallback insertCallback() {
+        return new InsertCallback() {
+            @Override
+            public int callback(Pointer items,
+                                int itemsLength) {
+                try {
+                    //
+                    // Read `items` until `itemsLength`
+                    //
+                    byte[] itemsBytes = new byte[itemsLength];
+                    items.read(0, itemsBytes, 0, itemsLength);
+
+                    //
+                    // Deserialize the chain table items
+                    //
+                    Map<Uid32, EntryTableValue> uidsAndValues =
+                        Leb128Reader.deserializeMap(Uid32.class, EntryTableValue.class, itemsBytes);
+
+                    //
+                    // Insert in database
+                    //
+                    insert(uidsAndValues);
+
+                    return 0;
+                } catch (CloudproofException e) {
+                    return FindexCallbackException.record(e);
+                }
+            }
+        };
+    }
+
     /**
      * Return the appropriate upsert callback (with input/output serialization).
      */