chore: Merge branch 'release/v6.0.0'

Author: Manuthor

.classpath

@@ -57,6 +57,10 @@ jobs:
           KMS_SHARED_PATH: /tmp
         ports:
           - 9998:9998
+      findex_cloud:
+        image: ghcr.io/cosmian/findex_cloud:0.1.0
+        ports:
+          - 8080:8080
 
       redis:
         image: redis
@@ -97,27 +101,44 @@ jobs:
         run: mvn compile
         env:
           COSMIAN_SERVER_URL: http://kms:9998
+          COSMIAN_FINDEX_CLOUD_BASE_URL: http://findex_cloud:8080
           REDIS_HOSTNAME: redis
           REDIS_PORT: 6379
           LANG: en_US.UTF-8
           LANGUAGE: en_US:en
           LC_ALL: en_US.UTF-8
 
-      - name: Test with Maven
-        run: mvn test
+      - name: Package and test with Maven
+        run: |
+          mvn package
+          mvn dependency:copy-dependencies
         env:
           COSMIAN_SERVER_URL: http://kms:9998
+          COSMIAN_FINDEX_CLOUD_BASE_URL: http://findex_cloud:8080
           REDIS_HOSTNAME: redis
           REDIS_PORT: 6379
           LANG: en_US.UTF-8
           LANGUAGE: en_US:en
           LC_ALL: en_US.UTF-8
 
+      - name: Upload dependencies and source
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: actions/upload-artifact@v3
+        with:
+          name: cloudproof_java_${{ github.ref_name }}
+          path: |
+            .
+            !.git
+            !.mypy_cache
+          retention-days: 1
+          if-no-files-found: error
+
       - name: Bench with Maven
         if: startsWith(github.ref, 'refs/tags/')
         run: mvn test -Dtest='TestBenchesCoverCrypt'
         env:
           COSMIAN_SERVER_URL: http://kms:9998
+          COSMIAN_FINDEX_CLOUD_BASE_URL: http://findex_cloud:8080
           REDIS_HOSTNAME: redis
           REDIS_PORT: 6379
           LANG: en_US.UTF-8
@@ -162,7 +183,7 @@ jobs:
     needs: build_in_docker
     uses: Cosmian/reusable_workflows/.github/workflows/cloudproof_flutter.yml@develop
     with:
-      branch: develop
+      branch: v7.0.0
       target: x86_64-unknown-linux-gnu
       extension: so
       copy_fresh_build: false

.github/workflows/maven.yml

@@ -7,3 +7,5 @@ project/
 .settings/org.*
 .project
 cloudproof_java.code-workspace
+.classpath
+.settings/*.prefs

.gitignore

@@ -21,7 +21,6 @@ repos:
       - id: htmlhint
       - id: dockerfile_lint
       - id: markdown-toc
-        args: [--bullets="-"] # comment this to refresh TOC
 
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v3.0.0-alpha.4
@@ -36,7 +35,7 @@ repos:
     rev: v0.32.2
     hooks:
       - id: markdownlint-fix
-        args: [--disable=MD013, --disable=MD024, --disable=MD041]
+        args: [--disable=MD004, --disable=MD013, --disable=MD024, --disable=MD041]
 
   - repo: https://github.com/jumanjihouse/pre-commit-hook-yamlfmt
     rev: 0.2.2

.pre-commit-config.yaml

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file.
 
+## [6.0.0] - 2023-06-01
+
+### Features
+
+- upgrade Findex (v3.0.0 -> v4.0.0):
+  - change indexed values size (require a reset of the index database)
+  - change search interface
+    - remove `maxResultsPerKeyword`
+    - remove `maxDepth`
+    - remove `insecureFetchChainsBatchSize`
+    - searching for a non indexed keyword leads to an empty `Set` for this
+      keyword in the search results instead of this keyword being missing from
+      the results.
+  - change upsert interface:
+    - add deletions parameter
+  - change compact interface:
+    - change parameter order
+
 ---
 
 ## [5.0.0] - 2023-03-08

CHANGELOG.md

@@ -9,12 +9,13 @@ Cloudproof Encryption secures data repositories and applications in the cloud wi
 <!-- toc -->
 
 - [Licensing](#licensing)
+- [Cryptographic primitives](#cryptographic-primitives)
 - [Getting started](#getting-started)
 - [Benchmarks](#benchmarks)
 - [Versions Correspondence](#versions-correspondence)
 - [Using in Java projects](#using-in-java-projects)
-  - [Download required native libraries](#download-required-native-libraries)
-  - [Building the native libraries on your own](#building-the-native-libraries-on-your-own)
+  * [Download required native libraries](#download-required-native-libraries)
+  * [Building the native libraries on your own](#building-the-native-libraries-on-your-own)
 
 <!-- tocstop -->
 
@@ -103,6 +104,7 @@ From the version 5.0.0, `cloudproof_java` depends on [cloudproof_rust](https://g
 | This lib | KMS Server | Cloudproof Rust lib |
 |----------|------------|---------------------|
 | 5.0.0    | 4.3.3      | 1.0.0               |
+| 6.0.0    | 4.3.3      | 2.0.1               |
 
 ## Using in Java projects
 
@@ -112,7 +114,7 @@ This library is open-source software and is available on Maven Central.
 <dependency>
     <groupId>com.cosmian</groupId>
     <artifactId>cloudproof_java</artifactId>
-    <version>5.0.0</version>
+    <version>6.0.0</version>
 </dependency>
 ```
 

README.md

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.cosmian</groupId>
     <artifactId>cloudproof_java</artifactId>
-    <version>5.0.0</version>
+    <version>6.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>
@@ -40,7 +40,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <jna.version>5.12.1</jna.version>
-        <jackson.version>2.14.1</jackson.version>
+        <jackson.version>2.14.2</jackson.version>
     </properties>
     <dependencies>
         <dependency>
@@ -74,11 +74,6 @@
             <artifactId>jna</artifactId>
             <version>${jna.version}</version>
         </dependency>
-        <!-- <dependency>
-            <groupId>com.rover12421.android</groupId>
-        <artifactId>dx</artifactId>
-            <version>1.16</version>
-        </dependency> -->
         <!-- Scope test -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>

bump_version.sh

@@ -5,23 +5,21 @@
 from os import getenv, path, remove
 
 
-def files_to_be_copied(name: str):
+def files_to_be_copied():
     """
     Returns the list of files to be copied
     """
     destination = 'src/main/resources'
     return {
-        f'tmp/x86_64-apple-darwin/x86_64-apple-darwin/release/libcloudproof_{name}.dylib': f'{destination}/darwin-x86-64/libcloudproof_{name}.dylib',
-        f'tmp/x86_64-unknown-linux-gnu/x86_64-unknown-linux-gnu/release/libcloudproof_{name}.so': f'{destination}/linux-x86-64/libcloudproof_{name}.so',
-        f'tmp/x86_64-pc-windows-gnu/x86_64-pc-windows-gnu/release/cloudproof_{name}.dll': f'{destination}/win32-x86-64/cloudproof_{name}.dll',
+        'tmp/x86_64-apple-darwin/x86_64-apple-darwin/release/libcloudproof.dylib': f'{destination}/darwin-x86-64/libcloudproof.dylib',
+        'tmp/x86_64-unknown-linux-gnu/x86_64-unknown-linux-gnu/release/libcloudproof.so': f'{destination}/linux-x86-64/libcloudproof.so',
+        'tmp/x86_64-pc-windows-gnu/x86_64-pc-windows-gnu/release/cloudproof.dll': f'{destination}/win32-x86-64/cloudproof.dll',
     }
 
 
 def download_native_libraries(version: str) -> bool:
     """Download and extract native libraries"""
-    to_be_copied = files_to_be_copied('findex')
-    cover_crypt_files = files_to_be_copied('cover_crypt')
-    to_be_copied.update(cover_crypt_files)
+    to_be_copied = files_to_be_copied()
 
     missing_files = False
     for key, value in to_be_copied.items():
@@ -39,6 +37,7 @@ def download_native_libraries(version: str) -> bool:
                             (status code: {request.getcode()})'
                     )
                 else:
+                    print(f'Copying new files from cloudproof_rust {version}')
                     if path.exists('tmp'):
                         shutil.rmtree('tmp')
                     if path.exists('all.zip'):
@@ -63,6 +62,6 @@ def download_native_libraries(version: str) -> bool:
 
 
 if __name__ == '__main__':
-    ret = download_native_libraries('v1.0.0')
+    ret = download_native_libraries('v2.0.1')
     if ret is False and getenv('GITHUB_ACTIONS'):
-        download_native_libraries('last_build/feature/add_findex')
+        download_native_libraries('last_build/release/v2.0.1')

pom.xml

@@ -2,14 +2,15 @@
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-import com.sun.jna.ptr.IntByReference;
+
 import com.cosmian.jna.covercrypt.ffi.CoverCryptWrapper;
 import com.cosmian.utils.CloudproofException;
 import com.sun.jna.Native;
+import com.sun.jna.ptr.IntByReference;
 
 public class Ffi {
 
-    protected static final CoverCryptWrapper instance = (CoverCryptWrapper) Native.load("cloudproof_cover_crypt",
+    protected static final CoverCryptWrapper instance = (CoverCryptWrapper) Native.load("cloudproof",
         CoverCryptWrapper.class);
 
     /**